From ba358cc7d597bc8f5c8b27fe4c041c9c61426b4c Mon Sep 17 00:00:00 2001
From: hylom <hylom@users.osdn.me>
Date: Fri, 31 May 2019 11:27:22 +0000
Subject: [PATCH] fix article-editor to work

---
 .../lib/Newslash/Web/Controller/Journal.pm         | 13 +++++++++++
 src/newslash_web/public/js/article-editor.js       | 12 +++++------
 .../templates/common/article/editor.html.tt2       |  8 +++++--
 src/newslash_web/templates/common/single.html.tt2  |  2 +-
 src/newslash_web/templates/journal/create.html.tt2 | 25 +++++++++++-----------
 5 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/Journal.pm b/src/newslash_web/lib/Newslash/Web/Controller/Journal.pm
index 33464292..d5e25106 100644
--- a/src/newslash_web/lib/Newslash/Web/Controller/Journal.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/Journal.pm
@@ -55,6 +55,19 @@ sub single {
     $c->stats->add_event_counter("journal_view");
 }
 
+sub create {
+    my $c = shift;
+    my $page = { content_type => "journal",
+                 type => "single",
+                 id => 0,
+                 journal_id => 0,
+               };
+
+    $c->render(page => $page,
+	       use_captcha => 1,
+	);
+}
+
 sub user_journals {
     my $c = shift;
     my $users = $c->model('users');
diff --git a/src/newslash_web/public/js/article-editor.js b/src/newslash_web/public/js/article-editor.js
index 312d25ee..7726dd39 100644
--- a/src/newslash_web/public/js/article-editor.js
+++ b/src/newslash_web/public/js/article-editor.js
@@ -38,7 +38,7 @@ articleEditor.init = function init () {
       mode: "editing",
 
       primaryTopicIconURL: "",
-      cancelable: 0,
+      isUpdate: 0,
     };
     return data;
   }
@@ -48,10 +48,10 @@ articleEditor.init = function init () {
       type: Object,
       default: function () {return new Content();},
     },
-    contentType: { type: String },
-    contentId: { type: String },
+    contentType: { type: String, required: true },
+    contentId: { type: Number, dafault: 0 },
     sourceType: { type: String },
-    sourceId: { type: String },
+    sourceId: { type: Number, default: 0 },
     csrfToken: { type: String },
   };
 
@@ -110,7 +110,7 @@ articleEditor.init = function init () {
       this.item.title = _quoteTitle(this.editor.title);
     },
     startEdit: function startEdit() {
-      _startEdit(this);
+      _startEdit.call(this);
     },
     cancelEdit: function cancelEdit() {
       for (k in this.originalItem) {
@@ -387,7 +387,7 @@ articleEditor.init = function init () {
     newslash.getJournal(this.contentId).then(
       resp => { // succeed
         var item = resp.journal;
-        this.cancelable = 1;
+        this.isUpdate = 1;
         this.editor.title = item.title;
         this.editor.intro_text = item.article;
         this.editor.tags_string = item.tags_string || "";
diff --git a/src/newslash_web/templates/common/article/editor.html.tt2 b/src/newslash_web/templates/common/article/editor.html.tt2
index aea4e914..3340d806 100644
--- a/src/newslash_web/templates/common/article/editor.html.tt2
+++ b/src/newslash_web/templates/common/article/editor.html.tt2
@@ -1,5 +1,9 @@
 <div class="content-editor-wrap">
-  <div class="alert alert-info post-done" v-if="mode == 'posted'">
+  <div class="alert alert-info post-done" v-if="mode == 'posted' && isUpdate">
+    投稿を更新しました。
+    <span v-if="item.content_type == 'story'"><a href="#" @click="leavePreview">[再編集]</a></span>
+  </div>
+  <div class="alert alert-info post-done" v-else-if="mode == 'posted'">
     投稿を行いました。URL:<A :href="createdUrl" v-text="createdUrl"></a>
     <span v-if="item.content_type == 'story'"><a href="#" @click="leavePreview">[再編集]</a></span>
   </div>
@@ -162,7 +166,7 @@
 
     <div class="submit post-preview">
       <button type="submit" @click.prevent="showPreview">投稿確認</button>
-      <button type="button" v-if="cancelable"
+      <button type="button" v-if="isUpdate"
               @click.prevent="cancelEdit">キャンセル</button>
     </div>
   </form>
diff --git a/src/newslash_web/templates/common/single.html.tt2 b/src/newslash_web/templates/common/single.html.tt2
index 439b8f01..b5055856 100644
--- a/src/newslash_web/templates/common/single.html.tt2
+++ b/src/newslash_web/templates/common/single.html.tt2
@@ -28,7 +28,7 @@
       
       <div id="content-body">
         [%- INCLUDE common/article/article hide_more_link=1 -%]
-        <article-editor content-type="[% page.content_type %]" content-id="[% page.id %]"></article-editor>
+        <article-editor content-type="[% page.content_type %]" :content-id="[% page.id %]"></article-editor>
       </div>
       
       [%- IF page.type == "single" && page.content_type == "story" -%]
diff --git a/src/newslash_web/templates/journal/create.html.tt2 b/src/newslash_web/templates/journal/create.html.tt2
index f2d307b3..fa24393e 100644
--- a/src/newslash_web/templates/journal/create.html.tt2
+++ b/src/newslash_web/templates/journal/create.html.tt2
@@ -1,21 +1,22 @@
-[% WRAPPER common/layout enable_sidebar=1 enable_vuejs=1%]
-[% INCLUDE common/components/article_item type="journal" %]
+[% WRAPPER common/layout %]
 
-<div class="main-column">
-  <div class="post submission main-contents" id="journal-editor">
-    <h2>日記の編集</h2>
-    <div id="post-preview">
-      <article-item :item="item" :show-editor="true"></article-item>
-      [%#- INCLUDE common/journal/editor -%]
+<div class="article-wrapper">
+  <div class="content-wrapper">
+    <div class="post submission main-contents" id="journal-editor">
+      <h2>日記の編集</h2>
+      <div id="post-preview">
+	[%- INCLUDE common/article/article hide_more_link=1 -%]
+	<article-editor csrf-token="[% helpers.csrf_token('submission') %]" content-type="journal"></article-editor>
+      </div>
     </div>
   </div>
+  [%- INCLUDE common/sidebar -%]
 </div>
-[%- INCLUDE common/sidebar -%]
   
-[% helpers.load_js("editor.js") %]
-[%# <script src="/js/editor.js" ></script> %]
+[% INCLUDE common/components/article_editor %]
 <script>
-  editor.run({ type: 'journal', el: '#journal-editor', user: user, });
+  articleEditor.init();
+  articleEditor.instances.push(new articleEditor.ArticleEditor("#journal-editor"));
 </script>
 
 [% END %]
-- 
2.11.0