Merge branch 'feature/20170315_C' into feature/20170418_webIDE

ykxie
2 parents 78a50ed1 4c82f99a
Showing 4 changed files with 22 additions and 16 deletions
.gitignore
src/css/cm-theme/erlang-dark.css
src/gxb-ide/CodingEditer.js
src/v1.1/index.html
+example
 node_modules
 example
 dist
-.cm-s-erlang-dark { background: #002240; color: white; }
+.cm-s-erlang-dark { background: #23383f; color: white; }
 .cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; }
-.cm-s-erlang-dark .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-erlang-dark .CodeMirror-gutter { background: #23383f; border-right: 1px solid #aaa; }
 .cm-s-erlang-dark .CodeMirror-gutter-text { color: #d0d0d0; }
 .cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
@@ -285,17 +285,22 @@
     // 初始化编程页面
     function initProgramPage(treeLinkEditor, langid){
-        // alert(getMode(langid))
-        var modeName = getMode(langid) || 'text/x-java';
+        console.log(treeLinkEditor)
+
+        var modeName = getMode(langid);
+        console.log(modeName)
         // 生成 CodeMirror
         for (var i = 0; i < treeLinkEditor.length; i++) {
+            var modeNameItem = modeName[i] ||  modeName[0];
+            console.log(modeNameItem)
             // 判断是否是播放页面，如果是则不显示录制区相关dom
             if(!Dir.isReplayPage){
                 treeLinkEditor[i].CodeMirrorRecord = CodeMirror.fromTextArea($('#' + treeLinkEditor[i].record)[0], {
                     value: '',
-                    mode: modeName,
+                    mode: modeNameItem,
                     lineNumbers: true,
                     smartIndent: false,
+                    theme: "erlang-dark",
                     onChange: function(em, changeobj) {
                         console.log(Dir.getCurrentEditor(em.getWrapperElement().getAttribute('id')))
                         var _pauseValue = CodingEditer.getCodeMirrorValue();
@@ -337,35 +342,35 @@
     function getMode(langid){
         var langid = parseInt(langid);
-        var mode = null;
+        var mode = [];
         switch (langid) {
             case 4:
-                mode = "text/x-python";
+                mode = ["text/x-python"];
                 break;
             case 10:
-                mode = "text/x-java";
+                mode = ["text/x-java"];
                 break;
             case 11:
-                mode = "text/x-csrc";
+                mode = ["text/x-csrc"];
                 break;
             case 29:
-                mode = "application/x-httpd-php";
+                mode = ["application/x-httpd-php"];
                 break;
             case 35:
-                mode = "text/javascript";
+                mode = ["text/html", "text/css", "text/javascript"];
                 break;
             case 40:
-                mode = "text/x-sql";
+                mode = ["text/x-sql"];
                 break;
             case 43:
-                mode = "text/x-objectivec";
+                mode = ["text/x-objectivec"];
                 break;
             case 82:
-                mode = "text/x-c++src";
+                mode = ["text/x-c++src"];
                 break;
             case 117:
-                mode = "text/x-rsrc";
+                mode = ["text/x-rsrc"];
                 break;
             default:
                 break;
@@ -11,7 +11,7 @@
     <link href="../css/codemirror.css" rel="stylesheet">
     <link href="../css/cm-theme/gbtags.css" rel="stylesheet">
-    <link href="../css/cm-theme/eclipse.css" rel="stylesheet">
+    <link href="../css/cm-theme/erlang-dark.css" rel="stylesheet">
     <link href="../css/cm-theme/gbtags-dark.css" rel="stylesheet">
     <link rel="stylesheet" href="../gxb-ide/toolBox.css">