Commit 4c82f99adfc95eb8522394dbdae1a69b6258faf0

Authored by ykxie
1 parent ce5502a3

add codermirror theme

.gitignore
  1 +example
1 node_modules 2 node_modules
2 dist 3 dist
3 *.zip 4 *.zip
src/css/cm-theme/erlang-dark.css
1 -.cm-s-erlang-dark { background: #002240; color: white; } 1 +.cm-s-erlang-dark { background: #23383f; color: white; }
2 .cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; } 2 .cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; }
3 -.cm-s-erlang-dark .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; } 3 +.cm-s-erlang-dark .CodeMirror-gutter { background: #23383f; border-right: 1px solid #aaa; }
4 .cm-s-erlang-dark .CodeMirror-gutter-text { color: #d0d0d0; } 4 .cm-s-erlang-dark .CodeMirror-gutter-text { color: #d0d0d0; }
5 .cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; } 5 .cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
6 6
src/gxb-ide/CodingEditer.js
@@ -285,17 +285,22 @@ @@ -285,17 +285,22 @@
285 285
286 // 初始化编程页面 286 // 初始化编程页面
287 function initProgramPage(treeLinkEditor, langid){ 287 function initProgramPage(treeLinkEditor, langid){
288 - // alert(getMode(langid))  
289 - var modeName = getMode(langid) || 'text/x-java'; 288 + console.log(treeLinkEditor)
  289 +
  290 + var modeName = getMode(langid);
  291 + console.log(modeName)
290 // 生成 CodeMirror 292 // 生成 CodeMirror
291 for (var i = 0; i < treeLinkEditor.length; i++) { 293 for (var i = 0; i < treeLinkEditor.length; i++) {
  294 + var modeNameItem = modeName[i] || modeName[0];
  295 + console.log(modeNameItem)
292 // 判断是否是播放页面,如果是则不显示录制区相关dom 296 // 判断是否是播放页面,如果是则不显示录制区相关dom
293 if(!Dir.isReplayPage){ 297 if(!Dir.isReplayPage){
294 treeLinkEditor[i].CodeMirrorRecord = CodeMirror.fromTextArea($('#' + treeLinkEditor[i].record)[0], { 298 treeLinkEditor[i].CodeMirrorRecord = CodeMirror.fromTextArea($('#' + treeLinkEditor[i].record)[0], {
295 value: '', 299 value: '',
296 - mode: modeName, 300 + mode: modeNameItem,
297 lineNumbers: true, 301 lineNumbers: true,
298 smartIndent: false, 302 smartIndent: false,
  303 + theme: "erlang-dark",
299 onChange: function(em, changeobj) { 304 onChange: function(em, changeobj) {
300 console.log(Dir.getCurrentEditor(em.getWrapperElement().getAttribute('id'))) 305 console.log(Dir.getCurrentEditor(em.getWrapperElement().getAttribute('id')))
301 var _pauseValue = CodingEditer.getCodeMirrorValue(); 306 var _pauseValue = CodingEditer.getCodeMirrorValue();
@@ -337,35 +342,35 @@ @@ -337,35 +342,35 @@
337 342
338 function getMode(langid){ 343 function getMode(langid){
339 var langid = parseInt(langid); 344 var langid = parseInt(langid);
340 - var mode = null; 345 + var mode = [];
341 switch (langid) { 346 switch (langid) {
342 case 4: 347 case 4:
343 - mode = "text/x-python"; 348 + mode = ["text/x-python"];
344 break; 349 break;
345 case 10: 350 case 10:
346 - mode = "text/x-java"; 351 + mode = ["text/x-java"];
347 break; 352 break;
348 case 11: 353 case 11:
349 - mode = "text/x-csrc"; 354 + mode = ["text/x-csrc"];
350 break; 355 break;
351 case 29: 356 case 29:
352 - mode = "application/x-httpd-php"; 357 + mode = ["application/x-httpd-php"];
353 break; 358 break;
354 case 35: 359 case 35:
355 - mode = "text/javascript"; 360 + mode = ["text/html", "text/css", "text/javascript"];
356 break; 361 break;
357 case 40: 362 case 40:
358 - mode = "text/x-sql"; 363 + mode = ["text/x-sql"];
359 break; 364 break;
360 case 43: 365 case 43:
361 - mode = "text/x-objectivec"; 366 + mode = ["text/x-objectivec"];
362 break; 367 break;
363 case 82: 368 case 82:
364 - mode = "text/x-c++src"; 369 + mode = ["text/x-c++src"];
365 break; 370 break;
366 371
367 case 117: 372 case 117:
368 - mode = "text/x-rsrc"; 373 + mode = ["text/x-rsrc"];
369 break; 374 break;
370 default: 375 default:
371 break; 376 break;
src/v1.1/index.html
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 11
12 <link href="../css/codemirror.css" rel="stylesheet"> 12 <link href="../css/codemirror.css" rel="stylesheet">
13 <link href="../css/cm-theme/gbtags.css" rel="stylesheet"> 13 <link href="../css/cm-theme/gbtags.css" rel="stylesheet">
14 - <link href="../css/cm-theme/eclipse.css" rel="stylesheet"> 14 + <link href="../css/cm-theme/erlang-dark.css" rel="stylesheet">
15 <link href="../css/cm-theme/gbtags-dark.css" rel="stylesheet"> 15 <link href="../css/cm-theme/gbtags-dark.css" rel="stylesheet">
16 16
17 <link rel="stylesheet" href="../gxb-ide/toolBox.css"> 17 <link rel="stylesheet" href="../gxb-ide/toolBox.css">