Yuki Takei пре 9 година
родитељ
комит
dfd76f205f
4 измењених фајлова са 14 додато и 3 уклоњено
  1. 5 2
      lib/models/config.js
  2. 4 1
      lib/views/admin/customize.html
  3. 1 0
      package.json
  4. 4 0
      yarn.lock

+ 5 - 2
lib/models/config.js

@@ -1,6 +1,7 @@
 module.exports = function(crowi) {
   var mongoose = require('mongoose')
     , debug = require('debug')('crowi:models:config')
+    , uglifycss = require('uglifycss')
     , ObjectId = mongoose.Schema.Types.ObjectId
     , configSchema
     , Config
@@ -77,6 +78,9 @@ module.exports = function(crowi) {
 
     originalConfig[ns] = newNSConfig;
     crowi.setConfig(originalConfig);
+
+    // uglify and store
+    Config.generateUglifiedCustomCss(originalConfig);
   };
 
   // Execute only once for installing application
@@ -241,8 +245,7 @@ module.exports = function(crowi) {
   configSchema.statics.generateUglifiedCustomCss = function(config)
   {
     var rawCss = config.crowi['customize:css'] || getArrayForInstalling()['customize:css'];
-    // TODO uglify
-    this.uglifiedCustomCss = rawCss;
+    this.uglifiedCustomCss = uglifycss.processString(rawCss);
   }
 
   configSchema.statics.customCss = function(config)

+ 4 - 1
lib/views/admin/customize.html

@@ -36,7 +36,10 @@
       <fieldset>
         <legend>カスタムCSS</legend>
 
-        <p class="help-block">システム全体に適用されるCSSを記述できます。</p>
+        <p class="help-block">
+          システム全体に適用されるCSSを記述できます。<br>
+          変更の反映はページの更新が必要です。
+        </p>
 
         <div class="form-group">
           <div class="col-xs-12">

+ 1 - 0
package.json

@@ -109,6 +109,7 @@
     "sprintf": "~0.1.5",
     "style-loader": "^0.16.1",
     "swig": "~1.4.0",
+    "uglifycss": "^0.0.25",
     "webpack": "~2.3.1",
     "webpack-dll-bundles-plugin": "^1.0.0-beta.5",
     "webpack-merge": "~3.0.0"

+ 4 - 0
yarn.lock

@@ -5575,6 +5575,10 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
+uglifycss@^0.0.25:
+  version "0.0.25"
+  resolved "https://registry.yarnpkg.com/uglifycss/-/uglifycss-0.0.25.tgz#bea72bf4979eacef13a302cf47b2d1af3f344197"
+
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"