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

refs #259: Feature: Custom Header
WIP
setting htmlmixed mode to custom header editor

大谷 東彦 8 лет назад
Родитель
Сommit
24b4c70c01
2 измененных файлов с 2 добавлено и 16 удалено
  1. 0 14
      lib/views/admin/customize.html
  2. 2 2
      resource/js/components/Admin/CustomHeaderEditor.js

+ 0 - 14
lib/views/admin/customize.html

@@ -293,20 +293,6 @@
           変更の反映はページの更新が必要です。
           変更の反映はページの更新が必要です。
         </p>
         </p>
 
 
-        <p class="help-block">
-          Available Placeholders:
-          <dl class="dl-horizontal">
-            <dt><code>crowi</code></dt>
-            <dd>Crowi context instance</dd>
-            <dt><code>Crowi</code></dt>
-            <dd>Crowi legacy instance (jQuery based)</dd>
-            <dt><code>crowiRenderer</code></dt>
-            <dd>Crowi Renderer instance</dd>
-            <dt><code>crowiPlugin</code></dt>
-            <dd>crowi-plus plugin manager instance</dd>
-          </dl>
-        </p>
-
         <div class="form-group">
         <div class="form-group">
           <div class="col-xs-12">
           <div class="col-xs-12">
             <div id="custom-header-editor"></div>
             <div id="custom-header-editor"></div>

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

@@ -9,7 +9,7 @@ require('codemirror/addon/hint/javascript-hint');
 require('codemirror/addon/hint/show-hint');
 require('codemirror/addon/hint/show-hint');
 require('codemirror/addon/edit/matchbrackets');
 require('codemirror/addon/edit/matchbrackets');
 require('codemirror/addon/edit/closebrackets');
 require('codemirror/addon/edit/closebrackets');
-require('codemirror/mode/javascript/javascript');
+require('codemirror/mode/htmlmixed/htmlmixed');
 require('codemirror/theme/eclipse.css');
 require('codemirror/theme/eclipse.css');
 
 
 require('jquery-ui/ui/widgets/resizable');
 require('jquery-ui/ui/widgets/resizable');
@@ -29,7 +29,7 @@ export default class CustomHeaderEditor extends React.Component {
         value={value}
         value={value}
         autoFocus={true}
         autoFocus={true}
         options={{
         options={{
-          mode: 'javascript',
+          mode: 'htmlmixed',
           lineNumbers: true,
           lineNumbers: true,
           tabSize: 2,
           tabSize: 2,
           indentUnit: 2,
           indentUnit: 2,