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