Commit c07a1950 authored by Van's avatar Van

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

parents dd138084 41306630
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</scm> </scm>
<properties> <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> <jsoup.version>1.12.1</jsoup.version>
<flexmark.version>0.50.40</flexmark.version> <flexmark.version>0.50.40</flexmark.version>
......
...@@ -22,7 +22,7 @@ package org.b3log.solo.model; ...@@ -22,7 +22,7 @@ package org.b3log.solo.model;
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="https://hacpai.com/member/e">Dongxu Wang</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 * @since 0.3.1
*/ */
public final class Common { public final class Common {
...@@ -257,16 +257,6 @@ public final class Common { ...@@ -257,16 +257,6 @@ public final class Common {
*/ */
public static final String POST_TO_COMMUNITY = "postToCommunity"; 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. * Key of month name.
*/ */
......
...@@ -58,7 +58,7 @@ import static org.b3log.solo.model.Article.ARTICLE_CONTENT; ...@@ -58,7 +58,7 @@ import static org.b3log.solo.model.Article.ARTICLE_CONTENT;
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://vanessa.b3log.org">Liyuan Li</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 * @since 0.3.1
*/ */
@Service @Service
...@@ -632,7 +632,6 @@ public class DataModelService { ...@@ -632,7 +632,6 @@ public class DataModelService {
final String skinDirName = (String) context.attr(Keys.TEMAPLTE_DIR_NAME); final String skinDirName = (String) context.attr(Keys.TEMAPLTE_DIR_NAME);
dataModel.put(Option.ID_C_SKIN_DIR_NAME, skinDirName); dataModel.put(Option.ID_C_SKIN_DIR_NAME, skinDirName);
Keys.fillRuntime(dataModel); Keys.fillRuntime(dataModel);
fillMinified(dataModel);
fillPageNavigations(dataModel); fillPageNavigations(dataModel);
fillStatistic(dataModel); fillStatistic(dataModel);
fillMostUsedTags(dataModel, preference); fillMostUsedTags(dataModel, preference);
...@@ -647,26 +646,6 @@ public class DataModelService { ...@@ -647,26 +646,6 @@ public class DataModelService {
} }
} }
/**
* 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. * Fills side.ftl.
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment