Merge remote-tracking branch 'origin/dev' into dev

88250 · Jan 18, 2020 · c07a195 · c07a195
2 parents dd13808 + 4130663
commit c07a195
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 34 deletions.
diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
     </scm>
 
     <properties>
-        <org.b3log.latke.version>3.2.0</org.b3log.latke.version>
+        <org.b3log.latke.version>3.2.1</org.b3log.latke.version>
 
         <jsoup.version>1.12.1</jsoup.version>
         <flexmark.version>0.50.40</flexmark.version>

diff --git a/src/main/java/org/b3log/solo/model/Common.java b/src/main/java/org/b3log/solo/model/Common.java
@@ -22,7 +22,7 @@
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="https://hacpai.com/member/e">Dongxu Wang</a>
- * @version 1.7.0.7, Jan 16, 2020
+ * @version 1.7.0.8, Jan 18, 2020
  * @since 0.3.1
  */
 public final class Common {
@@ -257,16 +257,6 @@ public final class Common {
      */
     public static final String POST_TO_COMMUNITY = "postToCommunity";
 
-    /**
-     * Key of mini postfix.
-     */
-    public static final String MINI_POSTFIX = "miniPostfix";
-
-    /**
-     * Value of mini postfix.
-     */
-    public static final String MINI_POSTFIX_VALUE = ".min";
-
     /**
      * Key of month name.
      */

diff --git a/src/main/java/org/b3log/solo/service/DataModelService.java b/src/main/java/org/b3log/solo/service/DataModelService.java
@@ -58,7 +58,7 @@
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 1.7.0.14, Jan 16, 2020
+ * @version 1.7.0.15, Jan 18, 2020
  * @since 0.3.1
  */
 @Service
@@ -632,7 +632,6 @@ private void fillBlogHeader(final RequestContext context, final Map<String, Obje
             final String skinDirName = (String) context.attr(Keys.TEMAPLTE_DIR_NAME);
             dataModel.put(Option.ID_C_SKIN_DIR_NAME, skinDirName);
             Keys.fillRuntime(dataModel);
-            fillMinified(dataModel);
             fillPageNavigations(dataModel);
             fillStatistic(dataModel);
             fillMostUsedTags(dataModel, preference);
@@ -647,26 +646,6 @@ private void fillBlogHeader(final RequestContext context, final Map<String, Obje
         }
     }
 
-    /**
-     * Fills minified directory and file postfix for static JavaScript, CSS.
-     *
-     * @param dataModel the specified data model
-     */
-    public void fillMinified(final Map<String, Object> dataModel) {
-        switch (Latkes.getRuntimeMode()) {
-            case DEVELOPMENT:
-                dataModel.put(Common.MINI_POSTFIX, "");
-                break;
-
-            case PRODUCTION:
-                dataModel.put(Common.MINI_POSTFIX, Common.MINI_POSTFIX_VALUE);
-                break;
-
-            default:
-                throw new AssertionError();
-        }
-    }
-
     /**
      * Fills side.ftl.
      *