From a560752eb8c4eddf2dfe3a8d979f8170db094a12 Mon Sep 17 00:00:00 2001
From: Gisle Aune <dev@gisle.me>
Date: Sat, 22 Sep 2018 11:48:04 +0200
Subject: [PATCH] story-content: Fixed update weirdness, moved edit/remove
 modals up

---
 marko/page/story-content/components/chapter/index.marko  | 2 +-
 .../components => }/edit-chapter-modal/component.js      | 2 +-
 .../components => }/edit-chapter-modal/index.marko       | 0
 marko/page/story-content/components/page/component.js    | 9 +++++++++
 .../components => }/remove-chapter-modal/component.js    | 2 +-
 .../components => }/remove-chapter-modal/index.marko     | 0
 .../components/story-content-menu/component.js           | 9 ---------
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename marko/page/story-content/components/{chapter/components => }/edit-chapter-modal/component.js (95%)
 rename marko/page/story-content/components/{chapter/components => }/edit-chapter-modal/index.marko (100%)
 rename marko/page/story-content/components/{chapter/components => }/remove-chapter-modal/component.js (93%)
 rename marko/page/story-content/components/{chapter/components => }/remove-chapter-modal/index.marko (100%)

diff --git a/marko/page/story-content/components/chapter/index.marko b/marko/page/story-content/components/chapter/index.marko
index 572be35..f167b14 100644
--- a/marko/page/story-content/components/chapter/index.marko
+++ b/marko/page/story-content/components/chapter/index.marko
@@ -1,6 +1,6 @@
 import moment from "moment"
 
-<div class="story-chapter" if(!state.removed)>
+<div class="story-chapter">
   <a class="anchor" id=input.chapter.id />
   <div class="metadata">
     <div class="options color-menu">
diff --git a/marko/page/story-content/components/chapter/components/edit-chapter-modal/component.js b/marko/page/story-content/components/edit-chapter-modal/component.js
similarity index 95%
rename from marko/page/story-content/components/chapter/components/edit-chapter-modal/component.js
rename to marko/page/story-content/components/edit-chapter-modal/component.js
index 284f398..c551084 100644
--- a/marko/page/story-content/components/chapter/components/edit-chapter-modal/component.js
+++ b/marko/page/story-content/components/edit-chapter-modal/component.js
@@ -1,6 +1,6 @@
 const moment = require("moment")
 
-const {chapterApi} = require("../../../../../../../rpdata/api/Chapter")
+const {chapterApi} = require("../../../../../rpdata/api/Chapter")
 
 module.exports = class {
   onCreate(input) {
diff --git a/marko/page/story-content/components/chapter/components/edit-chapter-modal/index.marko b/marko/page/story-content/components/edit-chapter-modal/index.marko
similarity index 100%
rename from marko/page/story-content/components/chapter/components/edit-chapter-modal/index.marko
rename to marko/page/story-content/components/edit-chapter-modal/index.marko
diff --git a/marko/page/story-content/components/page/component.js b/marko/page/story-content/components/page/component.js
index 16c3b4c..89b7ec6 100644
--- a/marko/page/story-content/components/page/component.js
+++ b/marko/page/story-content/components/page/component.js
@@ -16,6 +16,7 @@ module.exports = class {
 
   addChapter(chapter) {
     this.state.story.chapters.push(chapter)
+    this.refreshStory()
   }
 
   updateChapter(id, data) {
@@ -31,6 +32,8 @@ module.exports = class {
 
       this.state.story.chapters[index][key] = data[key]
     }
+
+    this.refreshStory()
   }
 
   removeChapter(id) {
@@ -40,6 +43,8 @@ module.exports = class {
     }
 
     this.state.story.chapters.splice(index, 1)
+
+    this.refreshStory()
   }
 
   menuSelect(kind, id) {
@@ -51,4 +56,8 @@ module.exports = class {
         break
     }
   }
+
+  refreshStory() {
+    this.state.story = Object.assign({}, this.state.story)
+  }
 }
\ No newline at end of file
diff --git a/marko/page/story-content/components/chapter/components/remove-chapter-modal/component.js b/marko/page/story-content/components/remove-chapter-modal/component.js
similarity index 93%
rename from marko/page/story-content/components/chapter/components/remove-chapter-modal/component.js
rename to marko/page/story-content/components/remove-chapter-modal/component.js
index 7ffb4ee..4536af9 100644
--- a/marko/page/story-content/components/chapter/components/remove-chapter-modal/component.js
+++ b/marko/page/story-content/components/remove-chapter-modal/component.js
@@ -1,6 +1,6 @@
 const moment = require("moment")
 
-const {chapterApi} = require("../../../../../../../rpdata/api/Chapter")
+const {chapterApi} = require("../../../../../rpdata/api/Chapter")
 
 module.exports = class {
   onCreate(input) {
diff --git a/marko/page/story-content/components/chapter/components/remove-chapter-modal/index.marko b/marko/page/story-content/components/remove-chapter-modal/index.marko
similarity index 100%
rename from marko/page/story-content/components/chapter/components/remove-chapter-modal/index.marko
rename to marko/page/story-content/components/remove-chapter-modal/index.marko
diff --git a/marko/page/story-content/components/story-content-menu/component.js b/marko/page/story-content/components/story-content-menu/component.js
index cd1b8e8..6f81c47 100644
--- a/marko/page/story-content/components/story-content-menu/component.js
+++ b/marko/page/story-content/components/story-content-menu/component.js
@@ -4,20 +4,11 @@ module.exports = class {
   onCreate(input) {
     this.state = {
       selectedChapter: "",
-      bullshit: 0,
     }
   }
 
   onMount() {
     this.state.selectedChapter = (window.location.hash||"#").slice(1)
-
-    // Marko is being silly and needs a state change to re-render
-    setInterval(() => {
-      this.state.bullshit++  
-      if (this.state.bullshit > 10000) {
-        this.state.bullshit = 0
-      }
-    }, 250)
   }
 
   chapterTitle(chapter) {