Просмотр исходного кода

refs #259: Feature: Custom Header
refact feedback
*delete javascript addon to cusutom header editor
*delete init cusutm header function

大谷 東彦 8 лет назад
Родитель
Сommit
00223a3b44

+ 4 - 13
lib/models/config.js

@@ -140,10 +140,9 @@ module.exports = function(crowi) {
     originalConfig[ns] = newNSConfig;
     crowi.setConfig(originalConfig);
 
-    // initialize custom css/script/header
+    // initialize custom css/script
     Config.initCustomCss(originalConfig);
     Config.initCustomScript(originalConfig);
-    Config.initCustomHeader(originalConfig);
   };
 
   // Execute only once for installing application
@@ -244,10 +243,9 @@ module.exports = function(crowi) {
 
         debug('Config loaded', config);
 
-        // initialize custom css/script/header
+        // initialize custom css/script
         Config.initCustomCss(config);
         Config.initCustomScript(config);
-        Config.initCustomHeader(config);
 
         return callback(null, config);
       });
@@ -354,17 +352,10 @@ module.exports = function(crowi) {
     return this._customScript;
   }
 
-  configSchema.statics.initCustomHeader = function(config)
-  {
-    const key = 'customize:header';
-    const rawHeader = getValueForCrowiNS(config, key);
-    // store as is
-    this._customHeader = rawHeader;
-  }
-
   configSchema.statics.customHeader = function(config)
   {
-    return this._customHeader;
+    const key = 'customize:header';
+    return getValueForCrowiNS(config, key);
   }
 
   configSchema.statics.behaviorType = function(config)

+ 2 - 1
lib/util/swigFunctions.js

@@ -93,7 +93,8 @@ module.exports = function(crowi, app, req, locals) {
   }
 
   locals.customHeader = function() {
-    return Config.customHeader();
+    var config = crowi.getConfig()
+    return Config.customHeader(config);
   }
 
   locals.behaviorType = function() {

+ 0 - 2
resource/js/components/Admin/CustomHeaderEditor.js

@@ -4,8 +4,6 @@ import PropTypes from 'prop-types';
 import { UnControlled as CodeMirror } from 'react-codemirror2';
 require('codemirror/lib/codemirror.css');
 require('codemirror/addon/display/autorefresh');
-require('codemirror/addon/lint/javascript-lint');
-require('codemirror/addon/hint/javascript-hint');
 require('codemirror/addon/hint/show-hint');
 require('codemirror/addon/edit/matchbrackets');
 require('codemirror/addon/edit/closebrackets');