Merge branch 'master' into frontend-next

2017-01-02 15:09:19 +08:00
parent 1e276fb37a ac2b100d35
commit 65acaea8cf
26 changed files with 307 additions and 111 deletions
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -172,12 +172,12 @@ module.exports = {
            "script!listPagnation",
            "expose?select2!select2",
            "expose?moment!moment",
-            "js-url",
+            "script!js-url",
            path.join(__dirname, 'public/js/cover.js')
        ],
        index: [
            "script!jquery-ui-resizable",
-            "js-url",
+            "script!js-url",
            "expose?filterXSS!xss",
            "script!Idle.Js",
            "expose?LZString!lz-string",
@@ -227,7 +227,7 @@ module.exports = {
            "expose?jsyaml!js-yaml",
            "script!mermaid",
            "expose?moment!moment",
-            "js-url",
+            "script!js-url",
            "script!handlebars",
            "expose?hljs!highlight.js",
            "expose?emojify!emojify.js",