Merge remote-tracking branch 'refs/remotes/origin/1.8.0-dev'

src/main/java/org/b3log/solo/api/symphony/ArticleReceiver.java

@@ -15,9 +15,6 @@
  */
 package org.b3log.solo.api.symphony;
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.b3log.latke.Keys;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
@@ -42,11 +39,15 @@ import org.json.JSONObject;
 import org.jsoup.Jsoup;
 import org.jsoup.safety.Whitelist;
 
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * Article receiver (from B3log Symphony).
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.2.7, Nov 8, 2016
+ * @version 1.0.3.7, Jan 15, 2017
  * @since 0.5.5
  */
 @RequestProcessor
@@ -56,39 +57,33 @@ public class ArticleReceiver {
      * Logger.
      */
     private static final Logger LOGGER = Logger.getLogger(ArticleReceiver.class.getName());
-
+    /**
+     * Article abstract length.
+     */
+    private static final int ARTICLE_ABSTRACT_LENGTH = 500;
     /**
      * Preference query service.
      */
     @Inject
     private PreferenceQueryService preferenceQueryService;
-
     /**
      * Article management service.
      */
     @Inject
     private ArticleMgmtService articleMgmtService;
-
     /**
      * Article query service.
      */
     @Inject
     private ArticleQueryService articleQueryService;
-
     /**
      * User query service.
      */
     @Inject
     private UserQueryService userQueryService;
 
-    /**
-     * Article abstract length.
-     */
-    private static final int ARTICLE_ABSTRACT_LENGTH = 500;
-
     /**
      * Adds an article with the specified request.
-     *
      * <p>
      * Renders the response with a json object, for example,
      * <pre>
@@ -100,21 +95,17 @@ public class ArticleReceiver {
      * </pre>
      * </p>
      *
-     * @param request the specified http servlet request, for example,      <pre>
-     * {
-     *     "article": {
-     *         "oId": "",
-     *         "articleTitle": "",
-     *         "articleContent": "",
-     *         "articleTags": "tag1,tag2,tag3",
-     *         "userB3Key": "",
-     *         "articleEditorType": ""
-     *     }
-     * }
-     * </pre>
-     *
+     * @param request  the specified http servlet request, for example,
+     *                 "article": {
+     *                 "oId": "",
+     *                 "articleTitle": "",
+     *                 "articleContent": "",
+     *                 "articleTags": "tag1,tag2,tag3",
+     *                 "userB3Key": "",
+     *                 "articleEditorType": ""
+     *                 }
      * @param response the specified http servlet response
-     * @param context the specified http request context
+     * @param context  the specified http request context
      * @throws Exception exception
      */
     @RequestProcessing(value = "/apis/symphony/article", method = HTTPRequestMethod.POST)
@@ -179,7 +170,6 @@ public class ArticleReceiver {
 
     /**
      * Updates an article with the specified request.
-     *
      * <p>
      * Renders the response with a json object, for example,
      * <pre>
@@ -190,21 +180,17 @@ public class ArticleReceiver {
      * </pre>
      * </p>
      *
-     * @param request the specified http servlet request, for example,      <pre>
-     * {
-     *     "article": {
-     *         "oId": "", // Symphony Article#clientArticleId
-     *         "articleTitle": "",
-     *         "articleContent": "",
-     *         "articleTags": "tag1,tag2,tag3",
-     *         "userB3Key": "",
-     *         "articleEditorType": ""
-     *     }
-     * }
-     * </pre>
-     *
+     * @param request  the specified http servlet request, for example,
+     *                 "article": {
+     *                 "oId": "", // Symphony Article#clientArticleId
+     *                 "articleTitle": "",
+     *                 "articleContent": "",
+     *                 "articleTags": "tag1,tag2,tag3",
+     *                 "userB3Key": "",
+     *                 "articleEditorType": ""
+     *                 }
      * @param response the specified http servlet response
-     * @param context the specified http request context
+     * @param context  the specified http request context
      * @throws Exception exception
      */
     @RequestProcessing(value = "/apis/symphony/article", method = HTTPRequestMethod.PUT)
@@ -240,8 +226,8 @@ public class ArticleReceiver {
                 return;
             }
 
-            final String plainTextContent = Jsoup.parse(article.optString(Article.ARTICLE_CONTENT)).text();
-
+            final String articleContent = article.optString(Article.ARTICLE_CONTENT);
+            final String plainTextContent = Jsoup.clean(Markdowns.toHTML(articleContent), Whitelist.none());
             if (plainTextContent.length() > ARTICLE_ABSTRACT_LENGTH) {
                 article.put(Article.ARTICLE_ABSTRACT, plainTextContent.substring(0, ARTICLE_ABSTRACT_LENGTH) + "....");
             } else {

src/main/webapp/js/admin/about.js

@@ -25,7 +25,7 @@
 admin.about = {
     init: function() {
         $.ajax({
-            url: "http://rhythm.b3log.org/version/solo/latest/" + Label.version,
+            url: window.location.protocol + '://' + "rhythm.b3log.org/version/solo/latest/" + Label.version,
             type: "GET",
             cache: false,
             dataType: "jsonp",

src/main/webapp/js/admin/latkeAdmin.js

@@ -4105,7 +4105,7 @@ admin.register.main =  {
 admin.about = {
     init: function() {
         $.ajax({
-            url: "http://rhythm.b3log.org/version/solo/latest/" + Label.version,
+            url: window.location.protocol + '://' + "rhythm.b3log.org/version/solo/latest/" + Label.version,
             type: "GET",
             cache: false,
             dataType: "jsonp",

src/main/webapp/skins/next/css/next.css

@@ -579,6 +579,7 @@ img {
 .sidebar section {
     opacity: 0;
     position: relative;
+    overflow: auto;
 }
 
 .sidebar > ul > li {

src/main/webapp/skins/next/js/next.js

@@ -99,7 +99,7 @@ var NexT = {
             $('.sidebar').prepend(articleTocHTML);
             var $sectionF = $('.sidebar section:first').html($('.b3-solo-list')),
                     $sectionL = $('.sidebar section:last');
-
+            $sectionF.height($(window).height() - 90);
             // 切换 tab
             $('.sidebar > ul > li').click(function () {
                 if ($(this).data('tab') === 'toc') {

src/main/webapp/skins/next/js/next.min.js

@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var NexT={init:function(){$(".sidebar-toggle").click(function(){var i=$(".sidebar");$(this).hasClass("sidebar-active")?($(this).removeClass("sidebar-active"),$("body").animate({"padding-right":0}),i.animate({right:-320}),i.find("section").css("opacity",0)):($(this).addClass("sidebar-active"),$("body").animate({"padding-right":320}),i.animate({right:0},function(){i.find("section:first").animate({opacity:1})}))}),$(".site-nav-toggle").click(function(){$(".site-nav").slideToggle()}),$(document).ready(function(){setTimeout(function(){$(".logo-wrap").css("opacity",1),$(".logo-line-before i").animate({left:"0"},function(){$(".site-title").css("opacity",1).animate({top:0},function(){$(".menu").css("opacity",1).animate({"margin-top":"15px"}),$(".main").css("opacity",1).animate({top:"0"},function(){$(".b3-solo-list li").length>0&&$(window).width()>1e3&&$(".sidebar-toggle").click()})})}),$(".logo-line-after i").animate({right:"0"})},500)})},initArticle:function(){if($(".b3-solo-list li").length>0&&$(window).width()>1e3){$(".sidebar-toggle").addClass("has-toc");var i='<ul><li class="current" data-tab="toc">'+Label.tocLabel+'</li><li data-tab="site">'+Label.siteViewLabel+"</li></ul><section></section>";$(".sidebar").prepend(i);var t=$(".sidebar section:first").html($(".b3-solo-list")),a=$(".sidebar section:last");$(".sidebar > ul > li").click(function(){"toc"===$(this).data("tab")?a.animate({opacity:"0",top:"-50px"},300,function(){t.show().css("top","-50px"),t.animate({opacity:"1",top:"0"},300)}):t.animate({opacity:"0",top:"-50px"},300,function(){t.hide().css("top","-50px"),a.animate({opacity:"1",top:"0"},300)}),$(".sidebar > ul > li").removeClass("current"),$(this).addClass("current")})}}};NexT.init();
+var NexT={init:function(){$(".sidebar-toggle").click(function(){var i=$(".sidebar");$(this).hasClass("sidebar-active")?($(this).removeClass("sidebar-active"),$("body").animate({"padding-right":0}),i.animate({right:-320}),i.find("section").css("opacity",0)):($(this).addClass("sidebar-active"),$("body").animate({"padding-right":320}),i.animate({right:0},function(){i.find("section:first").animate({opacity:1})}))}),$(".site-nav-toggle").click(function(){$(".site-nav").slideToggle()}),$(document).ready(function(){setTimeout(function(){$(".logo-wrap").css("opacity",1),$(".logo-line-before i").animate({left:"0"},function(){$(".site-title").css("opacity",1).animate({top:0},function(){$(".menu").css("opacity",1).animate({"margin-top":"15px"}),$(".main").css("opacity",1).animate({top:"0"},function(){$(".b3-solo-list li").length>0&&$(window).width()>1e3&&$(".sidebar-toggle").click()})})}),$(".logo-line-after i").animate({right:"0"})},500)})},initArticle:function(){if($(".b3-solo-list li").length>0&&$(window).width()>1e3){$(".sidebar-toggle").addClass("has-toc");var i='<ul><li class="current" data-tab="toc">'+Label.tocLabel+'</li><li data-tab="site">'+Label.siteViewLabel+"</li></ul><section></section>";$(".sidebar").prepend(i);var t=$(".sidebar section:first").html($(".b3-solo-list")),a=$(".sidebar section:last");t.height($(window).height()-90),$(".sidebar > ul > li").click(function(){"toc"===$(this).data("tab")?a.animate({opacity:"0",top:"-50px"},300,function(){t.show().css("top","-50px"),t.animate({opacity:"1",top:"0"},300)}):t.animate({opacity:"0",top:"-50px"},300,function(){t.hide().css("top","-50px"),a.animate({opacity:"1",top:"0"},300)}),$(".sidebar > ul > li").removeClass("current"),$(this).addClass("current")})}}};NexT.init();
\ No newline at end of file