Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
c07a1950
Unverified
Commit
c07a1950
authored
Jan 18, 2020
by
Van
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
dd138084
41306630
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
34 deletions
+3
-34
pom.xml
pom.xml
+1
-1
src/main/java/org/b3log/solo/model/Common.java
src/main/java/org/b3log/solo/model/Common.java
+1
-11
src/main/java/org/b3log/solo/service/DataModelService.java
src/main/java/org/b3log/solo/service/DataModelService.java
+1
-22
No files found.
pom.xml
View file @
c07a1950
...
...
@@ -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>
...
...
src/main/java/org/b3log/solo/model/Common.java
View file @
c07a1950
...
...
@@ -22,7 +22,7 @@ package org.b3log.solo.model;
*
* @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.
*/
...
...
src/main/java/org/b3log/solo/service/DataModelService.java
View file @
c07a1950
...
...
@@ -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://vanessa.b3log.org">Liyuan Li</a>
* @version 1.7.0.1
4, Jan 16
, 2020
* @version 1.7.0.1
5, Jan 18
, 2020
* @since 0.3.1
*/
@Service
...
...
@@ -632,7 +632,6 @@ public class DataModelService {
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 @@ 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.
*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment