Merge pull request #12018 from b3log/0.6.9

0.6.9

core/src/main/java/org/b3log/solo/service/PageMgmtService.java

@@ -15,7 +15,6 @@
  */
 package org.b3log.solo.service;
 
-
 import java.util.List;
 import javax.inject.Inject;
 import org.b3log.latke.Keys;
@@ -37,12 +36,11 @@ import org.b3log.solo.util.Comments;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-
 /**
  * Page management service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.0.7, Jun 8, 2012
+ * @version 1.1.0.7, May 30, 2015
  * @since 0.4.0
  */
 @Service
@@ -98,8 +96,7 @@ public class PageMgmtService {
     /**
      * Updates a page by the specified request json object.
      *
-     * @param requestJSONObject the specified request json object, for example,
-     * <pre>
+     * @param requestJSONObject the specified request json object, for example,      <pre>
      * {
      *     "page": {
      *         "oId": "",
@@ -110,10 +107,12 @@ public class PageMgmtService {
      *         "pagePermalink": "",
      *         "pageCommentable": boolean,
      *         "pageType": "",
-     *         "pageOpenTarget": ""
+     *         "pageOpenTarget": "",
+     *         "pageEditorType": "" // optional, preference specified if not exists this key
      *     }
      * }, see {@link Page} for more details
      * </pre>
+     *
      * @throws ServiceException service exception
      */
     public void updatePage(final JSONObject requestJSONObject) throws ServiceException {
@@ -167,10 +166,11 @@ public class PageMgmtService {
                 processCommentsForPageUpdate(newPage);
             }
 
-            // Editor type
+            // Set editor type
+            if (!newPage.has(Page.PAGE_EDITOR_TYPE)) {
                 final JSONObject preference = preferenceQueryService.getPreference();
-
                 newPage.put(Page.PAGE_EDITOR_TYPE, preference.optString(Preference.EDITOR_TYPE));
+            }
 
             pageRepository.update(pageId, newPage);
 
@@ -217,8 +217,7 @@ public class PageMgmtService {
     /**
      * Adds a page with the specified request json object.
      *
-     * @param requestJSONObject the specified request json object, for example,
-     * <pre>
+     * @param requestJSONObject the specified request json object, for example,      <pre>
      * {
      *     "page": {
      *         "pageTitle": "",
@@ -226,13 +225,14 @@ public class PageMgmtService {
      *         "pageOpenTarget": "",
      *         "pageCommentable": boolean,
      *         "pageType": "",
-     *         "pagePermalink": "" // optional
+     *         "pagePermalink": "", // optional
+     *         "pageEditorType": "" // optional, preference specified if not exists this key
      *     }
      * }, see {@link Page} for more details
      * </pre>
+     *
      * @return generated page id
-     * @throws ServiceException if permalink format checks failed or persists
-     * failed
+     * @throws ServiceException if permalink format checks failed or persists failed
      */
     public String addPage(final JSONObject requestJSONObject) throws ServiceException {
         final Transaction transaction = pageRepository.beginTransaction();
@@ -275,10 +275,11 @@ public class PageMgmtService {
 
             page.put(Page.PAGE_PERMALINK, permalink.replaceAll(" ", "-"));
 
-            // Editor type
+            // Set editor type
+            if (!page.has(Page.PAGE_EDITOR_TYPE)) {
                 final JSONObject preference = preferenceQueryService.getPreference();
-
                 page.put(Page.PAGE_EDITOR_TYPE, preference.optString(Preference.EDITOR_TYPE));
+            }
 
             final String ret = pageRepository.add(page);
 
@@ -303,8 +304,7 @@ public class PageMgmtService {
     }
 
     /**
-     * Changes the order of a page specified by the given page id with 
-     * the specified direction.
+     * Changes the order of a page specified by the given page id with the specified direction.
      *
      * @param pageId the given page id
      * @param direction the specified direction, "up"/"down"

core/src/test/resources/b3log.properties

@@ -16,11 +16,12 @@
 
 #
 # Description: B3log configurations for testing. 
-# Version: 1.1.0.0, Jan 13, 2015
+# Version: 1.2.0.0, May 25, 2015
 # Author: Liang Ding
 #
 
 rhythm.servePath=http://localhost:8081
 symphony.servePath=http://localhost:8084
 
+gravatar=http://gravatar.duoshuo.com/avatar/
 faviconAPI=http://api.byi.pw/favicon?url=
\ No newline at end of file

war/src/main/webapp/admin-index.ftl

@@ -6,9 +6,7 @@
         <title>${blogTitle} - ${adminConsoleLabel}</title>
         <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" />
         <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-admin${miniPostfix}.css?${staticResourceVersion}" />
-        <#if "CodeMirror-Markdown" == editorType>
         <link type="text/css" rel="stylesheet" href="${staticServePath}/js/lib/CodeMirror/codemirror.css?${staticResourceVersion}" />
-        </#if>
         <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
     </head>
     <body onhashchange="admin.setCurByHash();">
@@ -133,24 +131,16 @@
         </div>
         <script src="${staticServePath}/js/lib/jquery/jquery.min.js"></script>
         <script src="${staticServePath}/js/lib/jquery/jquery.bowknot.min.js?${staticResourceVersion}"></script>
-        <#if "tinyMCE" == editorType>
         <script src="${servePath}/js/lib/tiny_mce/tiny_mce.js"></script>
-        <#elseif "KindEditor" == editorType>
         <script src="${staticServePath}/js/lib/KindEditor/kindeditor-min.js"></script>
-        <#else>
         <script src="${staticServePath}/js/lib/CodeMirror/codemirror.js"></script>
-        </#if>
         <script src="${staticServePath}/js/common${miniPostfix}.js"></script>
         <#if "" == miniPostfix>
         <script src="${staticServePath}/js/admin/admin.js"></script>
         <script src="${staticServePath}/js/admin/editor.js"></script>
-        <#if "tinyMCE" == editorType>
         <script src="${staticServePath}/js/admin/editorTinyMCE.js"></script>
-        <#elseif "KindEditor" == editorType>
         <script src="${staticServePath}/js/admin/editorKindEditor.js"></script>
-        <#else>
         <script src="${staticServePath}/js/admin/editorCodeMirror.js"></script>
-        </#if>
         <script src="${staticServePath}/js/admin/tablePaginate.js"></script>
         <script src="${staticServePath}/js/admin/article.js"></script>
         <script src="${staticServePath}/js/admin/comment.js"></script>

war/src/main/webapp/css/default-admin.css

@@ -17,7 +17,7 @@
 * admin style
 *
 * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
-* @version 1.0.4.1, Dec 24, 2012
+* @version 1.0.5.1, May 30, 2015
 */
 
 /* start resset */
@@ -647,7 +647,7 @@ button#submitArticle {
     float: left;
     height: 16px;
     width: 16px;
-    background-position: -79px -32px;
+    background-position: -81px -32px;
 }
 .table-upIcon {
     background-position: -64px -32px;

war/src/main/webapp/js/admin/editor.js

@@ -17,7 +17,7 @@
  * @fileoverview editor
  *
  * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
- * @version 1.0.0.4, Jan 29, 2013
+ * @version 1.1.0.4, May 30, 2015
  */
 
 admin.editors = {};
@@ -52,21 +52,23 @@ $.extend(Editor.prototype, {
     _init: function () {
         this.init();
     },
-    
     /*
      * @description 初始化编辑器
      */
-    init: function () {
+    init: function (type) {
         var conf = this.conf;
+        if (type) {
+            conf.type = type;
+        }
         
         var types = conf.type.split("-");
         if (types.length === 2) {
             conf.codeMirrorLanguage = types[1];
             conf.type = types[0];
         }
+
         admin.editors[conf.type].init(conf);
     },
-    
     /*
      * @description 获取编辑器值
      * @returns {string} 编辑器值
@@ -75,7 +77,6 @@ $.extend(Editor.prototype, {
         var conf = this.conf;
         return admin.editors[conf.type].getContent(conf.id);
     },
-    
     /*
      * @description 设置编辑器值
      * @param {string} content 编辑器回填内容 
@@ -83,6 +84,13 @@ $.extend(Editor.prototype, {
     setContent: function (content) {
         var conf = this.conf;
         admin.editors[conf.type].setContent(conf.id, content);
+    },
+    /*
+     * @description 移除编辑器值
+     */
+    remove: function () {
+        var conf = this.conf;
+        admin.editors[conf.type].remove(conf.id);
     }
 });
 

war/src/main/webapp/js/admin/editorCodeMirror.js

@@ -17,7 +17,7 @@
  * @fileoverview markdowm CodeMirror editor 
  *
  * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
- * @version 1.0.0.4, May 30, 2013
+ * @version 1.1.0.4, May 30, 2015
  */
 admin.editors.CodeMirror = {
     /*
@@ -79,8 +79,8 @@ admin.editors.CodeMirror = {
                             url: latkeConfig.servePath + "/console/markdown/2html",
                             type: "POST",
                             cache: false,
-                            data: JSON.stringify({markdownText:it[conf.id].getValue()}),
-                            success: function(data, textStatus) {
+                            data: JSON.stringify({markdownText: it[conf.id].getValue()}),
+                            success: function (data, textStatus) {
                                 if (data.sc) {
                                     if (it[conf.id + "IsFirst"] && $help.hasClass("ico-close")) {
                                         $help.click();
@@ -111,11 +111,10 @@ admin.editors.CodeMirror = {
         }
 
         // after render, call back function
-        if (typeof(conf.fun) === "function") {
+        if (typeof (conf.fun) === "function") {
             conf.fun();
         }
     },
-    
     /*
      * @description 当有更新时每隔3秒 preview
      * @param {string} id 编辑器 id
@@ -128,7 +127,6 @@ admin.editors.CodeMirror = {
             admin.editors.CodeMirror[id + "Timers"] = [];
         }, 2000);
     },
-    
     /*
      * @description 绑定编辑器 preview 事件
      * @param {string} id 编辑器id
@@ -149,7 +147,6 @@ admin.editors.CodeMirror = {
             }
         });
     },
-    
     /*
      * @description 获取编辑器值
      * @param {string} id 编辑器id
@@ -158,7 +155,6 @@ admin.editors.CodeMirror = {
     getContent: function (id) {
         return this[id].getValue();
     },
-    
     /*
      * @description 设置编辑器值
      * @param {string} id 编辑器 id
@@ -166,5 +162,15 @@ admin.editors.CodeMirror = {
      */
     setContent: function (id, content) {
         this[id].setValue(content);
+        var $preview = $("#" + id).parent().find(".markdown-preivew");
+        $preview.find(".markdown-preview-main").html(content);
+    },
+    /*
+     * @description 销毁编辑器值
+     * @param {string} id 编辑器 id
+     */
+    remove: function (id) {
+        this[id].toTextArea();
+        $(".markdown-preivew").remove();
     }
 };
\ No newline at end of file

war/src/main/webapp/js/admin/editorKindEditor.js

@@ -19,7 +19,7 @@
  *                     plugins/media/media.js 注释 26 & 28
  *
  * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
- * @version 1.0.0.2, Jun 19, 2012
+ * @version 1.1.0.2, May 30, 2015
  */
 admin.editors.KindEditor = {
     /*
@@ -38,7 +38,7 @@ admin.editors.KindEditor = {
         if (conf.kind && conf.kind === "simple") {
             try {
                 this[conf.id] = KindEditor.create('#' + conf.id, {
-                    langType : language,
+                    langType: language,
                     resizeType: 0,
                     items: ["bold", "italic", "underline", "strikethrough", "|", "undo", "redo", "|",
                         "insertunorderedlist", "insertorderedlist", "|", "source"
@@ -50,7 +50,7 @@ admin.editors.KindEditor = {
         } else {
             try {
                 this[conf.id] = KindEditor.create('#' + conf.id, {
-                    langType : language,
+                    langType: language,
                     items: ["formatblock", "fontname", "fontsize", "|", "bold", "italic", "underline", "strikethrough", "forecolor", "|",
                         "link", "unlink", "image", "media", "|", "pagebreak", "emoticons", "code", "/",
                         "undo", "redo", "|", "insertunorderedlist", "insertorderedlist", "indent", "outdent", "|",
@@ -58,7 +58,7 @@ admin.editors.KindEditor = {
                         "clearhtml", "source", "preview"
                     ],
                     afterCreate: function () {
-                        if (typeof(conf.fun) === "function") {
+                        if (typeof (conf.fun) === "function") {
                             conf.fun();
                         }
                     }
@@ -68,7 +68,6 @@ admin.editors.KindEditor = {
             }
         }
     },
-    
     /*
      * @description 获取编辑器值
      * @param {string} id 编辑器id
@@ -83,7 +82,6 @@ admin.editors.KindEditor = {
         }
         return content;
     },
-    
     /*
      * @description 设置编辑器值
      * @param {string} id 编辑器 id
@@ -95,5 +93,12 @@ admin.editors.KindEditor = {
         } catch (e) {
             $("#" + id).val(content);
         }
+    },
+    /*
+     * @description 移除编辑器
+     * @param {string} id 编辑器 id
+     */
+    remove: function (id) {
+        this[id].remove();
     }
 };

war/src/main/webapp/js/admin/editorTinyMCE.js

@@ -17,7 +17,7 @@
  * @fileoverview tinyMCE editor
  *
  * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
- * @version 1.0.0.6, Sep 26, 2012
+ * @version 1.1.0.6, May 30, 2015
  */
 admin.editors.tinyMCE = {
     /*
@@ -38,19 +38,17 @@ admin.editors.tinyMCE = {
                 tinyMCE.init({
                     // General options
                     language: language,
-                    mode : "exact",
-                    elements : conf.id,
-                    theme : "advanced",
+                    mode: "exact",
+                    elements: conf.id,
+                    theme: "advanced",
                     plugins: "media",
-
                     // Theme options
-                    theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,undo,redo,|,bullist,numlist,|,code",
-                    theme_advanced_buttons2 : "",
-                    theme_advanced_buttons3 : "",
-                    theme_advanced_toolbar_location : "top",
-                    theme_advanced_toolbar_align : "left",
-                
-                    valid_children : "+body[style]"
+                    theme_advanced_buttons1: "bold,italic,underline,strikethrough,|,undo,redo,|,bullist,numlist,|,code",
+                    theme_advanced_buttons2: "",
+                    theme_advanced_buttons3: "",
+                    theme_advanced_toolbar_location: "top",
+                    theme_advanced_toolbar_align: "left",
+                    valid_children: "+body[style]"
                 });
             } catch (e) {
                 $("#tipMsg").text("TinyMCE load fail");
@@ -60,27 +58,24 @@ admin.editors.tinyMCE = {
                 tinyMCE.init({
                     // General options
                     language: language,
-                    mode : "exact",
-                    elements : conf.id,
-                    theme : "advanced",
-                    plugins : "autosave,style,advhr,advimage,advlink,preview,inlinepopups,media,paste,syntaxhl,wordcount",
-
+                    mode: "exact",
+                    elements: conf.id,
+                    theme: "advanced",
+                    plugins: "autosave,style,advhr,advimage,advlink,preview,inlinepopups,media,paste,syntaxhl,wordcount",
                     // Theme options
-                    theme_advanced_buttons1 : "formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,forecolor,|,advhr,blockquote,syntaxhl,",
-                    theme_advanced_buttons2 : "undo,redo,|,bullist,numlist,outdent,indent,|,justifyleft,justifycenter,justifyright,justifyfull,|,pastetext,pasteword,|,link,unlink,image,iespell,media,|,cleanup,code,preview,",
-                    theme_advanced_buttons3 : "",
-                    theme_advanced_toolbar_location : "top",
-                    theme_advanced_toolbar_align : "left",
-                    theme_advanced_resizing : true,
-                    theme_advanced_statusbar_location : "bottom",
-                
+                    theme_advanced_buttons1: "formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,forecolor,|,advhr,blockquote,syntaxhl,",
+                    theme_advanced_buttons2: "undo,redo,|,bullist,numlist,outdent,indent,|,justifyleft,justifycenter,justifyright,justifyfull,|,pastetext,pasteword,|,link,unlink,image,iespell,media,|,cleanup,code,preview,",
+                    theme_advanced_buttons3: "",
+                    theme_advanced_toolbar_location: "top",
+                    theme_advanced_toolbar_align: "left",
+                    theme_advanced_resizing: true,
+                    theme_advanced_statusbar_location: "bottom",
                     extended_valid_elements: "link[type|rel|href|charset],pre[name|class],iframe[src|width|height|name|align],+a[*]",
-
-                    valid_children : "+body[style]",
+                    valid_children: "+body[style]",
                     relative_urls: false,
                     remove_script_host: false,
-                    oninit : function () {
-                        if (typeof(conf.fun) === "function") {
+                    oninit: function () {
+                        if (typeof (conf.fun) === "function") {
                             conf.fun();
                         }
                     }
@@ -90,7 +85,6 @@ admin.editors.tinyMCE = {
             }
         }
     },
-    
     /*
      * @description 获取编辑器值
      * @param {string} id 编辑器id
@@ -105,7 +99,6 @@ admin.editors.tinyMCE = {
         }
         return content;
     },
-    
     /*
      * @description 设置编辑器值
      * @param {string} id 编辑器 id
@@ -121,5 +114,12 @@ admin.editors.tinyMCE = {
         } catch (e) {
             $("#" + id).val(content);
         }
+    },
+    /*
+     * @description 移除编辑器
+     * @param {string} id 编辑器 id
+     */
+    remove: function (id) {
+        tinyMCE.get(id).remove();
     }
 };

war/src/main/webapp/js/admin/pageList.js

@@ -18,11 +18,12 @@
  *
  * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.2.4, May 28, 2013
+ * @version 1.1.2.4, May 30, 2015
  */
 
 /* page-list 相关操作 */
 admin.pageList = {
+    currentEditorType: '',
     tablePagination: new TablePaginate("page"),
     pageInfo: {
         currentCount: 1,
@@ -31,7 +32,6 @@ admin.pageList = {
     },
     id: "",
     type: "link",
-    
     /* 
      * 初始化 table, pagination, comments dialog
      */
@@ -76,6 +76,7 @@ admin.pageList = {
             language = "zh-cn";
         }
 
+        admin.pageList.currentEditorType = Label.editorType;
         admin.editors.pageEditor = new Editor({
             language: language,
             kind: "all",
@@ -107,7 +108,6 @@ admin.pageList = {
             }
         });
     },
-
     /* 
      * 根据当前页码获取列表
      * @pagNum 当前页码
@@ -121,7 +121,7 @@ admin.pageList = {
             url: latkeConfig.servePath + "/console/pages/" + pageNum + "/" + Label.PAGE_SIZE + "/" + Label.WINDOW_SIZE,
             type: "GET",
             cache: false,
-            success: function(result, textStatus){
+            success: function (result, textStatus) {
                 $("#tipMsg").text(result.msg);
                 if (!result.sc) {
                     $("#loadMsg").text("");
@@ -158,7 +158,7 @@ admin.pageList = {
                     pageData[i].pagePermalink = "<a class='no-underline' href='" + pages[i].pagePermalink + "' target='_blank'>"
                             + pages[i].pagePermalink + "</a>";
                     pageData[i].pageTarget = pages[i].pageOpenTarget;
-                    pageData[i].pageType = pages[i].pageType ;
+                    pageData[i].pageType = pages[i].pageType;
                     pageData[i].comments = pages[i].pageCommentCount;
                     pageData[i].expendRow = "<span><a href='" + pages[i].pagePermalink + "' target='_blank'>" + Label.viewLabel + "</a>  \
                                 <a href='javascript:void(0)' onclick=\"admin.pageList.get('" + pages[i].oId + "')\">" + Label.updateLabel + "</a>\
@@ -172,7 +172,6 @@ admin.pageList = {
             }
         });
     },
-    
     /*
      * 获取自定义页面
      * @id 自定义页面 id
@@ -185,7 +184,7 @@ admin.pageList = {
             url: latkeConfig.servePath + "/console/page/" + id,
             type: "GET",
             cache: false,
-            success: function(result, textStatus){
+            success: function (result, textStatus) {
                 $("#tipMsg").text(result.msg);
                 if (!result.sc) {
                     $("#loadMsg").text("");
@@ -204,13 +203,19 @@ admin.pageList = {
                 }
                 $("#pageCommentable").prop("checked", result.page.pageCommentable);
 
+                if (admin.pageList.currentEditorType !== result.page.pageEditorType) {
+                    admin.editors.pageEditor.remove();
+
+                    admin.pageList.currentEditorType = result.page.pageEditorType;
+                    admin.editors.pageEditor.init(result.page.pageEditorType);
+                }
+
                 admin.editors.pageEditor.setContent(result.page.pageContent);
 
                 $("#loadMsg").text("");
             }
         });
     },
-
     /* 
      * 删除自定义页面
      * @id 自定义页面 id
@@ -226,7 +231,7 @@ admin.pageList = {
                 url: latkeConfig.servePath + "/console/page/" + id,
                 type: "DELETE",
                 cache: false,
-                success: function(result, textStatus){
+                success: function (result, textStatus) {
                     $("#tipMsg").text(result.msg);
                     if (!result.sc) {
                         $("#loadMsg").text("");
@@ -251,7 +256,6 @@ admin.pageList = {
             });
         }
     },
-    
     /*
      * 添加自定义页面
      */
@@ -283,7 +287,7 @@ admin.pageList = {
                 type: "POST",
                 cache: false,
                 data: JSON.stringify(requestJSONObject),
-                success: function(result, textStatus){
+                success: function (result, textStatus) {
                     $("#tipMsg").text(result.msg);
                     if (!result.sc) {
                         $("#loadMsg").text("");
@@ -315,7 +319,6 @@ admin.pageList = {
             });
         }
     },
-    
     /*
      * 更新自定义页面
      */
@@ -340,7 +343,8 @@ admin.pageList = {
                     "pagePermalink": pagePermalink,
                     "pageCommentable": $("#pageCommentable").prop("checked"),
                     "pageType": admin.pageList.type,
-                    "pageOpenTarget": $("#pageTarget").val()
+                    "pageOpenTarget": $("#pageTarget").val(),
+                    "pageEditorType": admin.pageList.currentEditorType
                 }
             };
 
@@ -349,7 +353,7 @@ admin.pageList = {
                 type: "PUT",
                 cache: false,
                 data: JSON.stringify(requestJSONObject),
-                success: function(result, textStatus){
+                success: function (result, textStatus) {
                     $("#tipMsg").text(result.msg);
 
                     if (!result.sc) {
@@ -372,7 +376,6 @@ admin.pageList = {
             });
         }
     },
-    
     /*
      * 验证字段
      */
@@ -388,7 +391,6 @@ admin.pageList = {
         }
         return false;
     },
-    
     /*
      * 提交自定义页面
      */
@@ -398,8 +400,14 @@ admin.pageList = {
         } else {
             this.add();
         }
-    },
 
+        if (admin.pageList.currentEditorType !== Label.editorType) {
+            admin.editors.pageEditor.remove();
+
+            admin.pageList.currentEditorType = Label.editorType;
+            admin.editors.pageEditor.init(Label.editorType);
+        }
+    },
     /*
      * 调换顺序
      */
@@ -417,7 +425,7 @@ admin.pageList = {
             type: "PUT",
             cache: false,
             data: JSON.stringify(requestJSONObject),
-            success: function(result, textStatus){
+            success: function (result, textStatus) {
                 $("#tipMsg").text(result.msg);
 
                 // Refershes the page list