Commit a36341a24b3e29185de150700905481bef711641
1 parent
000c73ab
发布
Showing
10 changed files
with
97 additions
and
21 deletions
dist/css/ide.css
| @@ -277,6 +277,27 @@ html, body { | @@ -277,6 +277,27 @@ html, body { | ||
| 277 | height: 36px; | 277 | height: 36px; |
| 278 | padding-top: 5px; } | 278 | padding-top: 5px; } |
| 279 | 279 | ||
| 280 | +#console-wrap:-webkit-full-screen { | ||
| 281 | + width: 100%; | ||
| 282 | + height: 100%; | ||
| 283 | + top: 0; } | ||
| 284 | + | ||
| 285 | +#console-wrap:-moz-full-screen { | ||
| 286 | + width: 100%; | ||
| 287 | + height: 100%; | ||
| 288 | + top: 0; } | ||
| 289 | + | ||
| 290 | +#console-wrap:-ms-fullscreen { | ||
| 291 | + width: 100%; | ||
| 292 | + height: 100%; | ||
| 293 | + top: 0; } | ||
| 294 | + | ||
| 295 | +#console-wrapfullscreen { | ||
| 296 | + /* spec */ | ||
| 297 | + width: 100%; | ||
| 298 | + height: 100%; | ||
| 299 | + top: 0; } | ||
| 300 | + | ||
| 280 | .btn { | 301 | .btn { |
| 281 | padding: 3px 18px; } | 302 | padding: 3px 18px; } |
| 282 | 303 |
dist/css/main.css
| @@ -149,6 +149,27 @@ html, body { | @@ -149,6 +149,27 @@ html, body { | ||
| 149 | height: 36px; | 149 | height: 36px; |
| 150 | padding-top: 5px; } | 150 | padding-top: 5px; } |
| 151 | 151 | ||
| 152 | +#console-wrap:-webkit-full-screen { | ||
| 153 | + width: 100%; | ||
| 154 | + height: 100%; | ||
| 155 | + top: 0; } | ||
| 156 | + | ||
| 157 | +#console-wrap:-moz-full-screen { | ||
| 158 | + width: 100%; | ||
| 159 | + height: 100%; | ||
| 160 | + top: 0; } | ||
| 161 | + | ||
| 162 | +#console-wrap:-ms-fullscreen { | ||
| 163 | + width: 100%; | ||
| 164 | + height: 100%; | ||
| 165 | + top: 0; } | ||
| 166 | + | ||
| 167 | +#console-wrapfullscreen { | ||
| 168 | + /* spec */ | ||
| 169 | + width: 100%; | ||
| 170 | + height: 100%; | ||
| 171 | + top: 0; } | ||
| 172 | + | ||
| 152 | .btn { | 173 | .btn { |
| 153 | padding: 3px 18px; } | 174 | padding: 3px 18px; } |
| 154 | 175 |
dist/gxb-ide/CodingEditer.js
| @@ -129,14 +129,9 @@ | @@ -129,14 +129,9 @@ | ||
| 129 | Dir.showEdite({'treeNode': CodingEditer.treeSelectNode}); | 129 | Dir.showEdite({'treeNode': CodingEditer.treeSelectNode}); |
| 130 | }else{ | 130 | }else{ |
| 131 | CodingEditer.resetCodeMirrorValue(1); | 131 | CodingEditer.resetCodeMirrorValue(1); |
| 132 | - // alert('new Iterm()------' + CodingEditer.firstPlay) | ||
| 133 | - // var iterm = new Iterm(); | ||
| 134 | - // alert('iterm ============' + CodingEditer.firstPlay) | ||
| 135 | - // iterm.compileResult() | ||
| 136 | } | 132 | } |
| 137 | 133 | ||
| 138 | if (CodingEditer.isWeb) { | 134 | if (CodingEditer.isWeb) { |
| 139 | - console.log('CodingEditer.isWeb=============') | ||
| 140 | CodingEditer.webResult('', '', '') | 135 | CodingEditer.webResult('', '', '') |
| 141 | } | 136 | } |
| 142 | 137 | ||
| @@ -365,7 +360,7 @@ | @@ -365,7 +360,7 @@ | ||
| 365 | smartIndent: false, | 360 | smartIndent: false, |
| 366 | onChange: function(em, changeobj) { | 361 | onChange: function(em, changeobj) { |
| 367 | var _pauseValue = CodingEditer.getPlayerActionValue(); | 362 | var _pauseValue = CodingEditer.getPlayerActionValue(); |
| 368 | - console.log('CodeMirrorReplay-----------------', _pauseValue) | 363 | + console.log('CodingEditer.isWeb-----------------', CodingEditer.isWeb) |
| 369 | 364 | ||
| 370 | if (CodingEditer.isWeb) { | 365 | if (CodingEditer.isWeb) { |
| 371 | CodingEditer.webResult(_pauseValue[0], _pauseValue[1], _pauseValue[2]) | 366 | CodingEditer.webResult(_pauseValue[0], _pauseValue[1], _pauseValue[2]) |
dist/gxb-ide/Dir.js
| @@ -76,6 +76,7 @@ | @@ -76,6 +76,7 @@ | ||
| 76 | dataType: "json", | 76 | dataType: "json", |
| 77 | contentType: "application/json", | 77 | contentType: "application/json", |
| 78 | success: function(res) { | 78 | success: function(res) { |
| 79 | + console.log('res*****************************'); | ||
| 79 | console.log(res); //目录包含文件 | 80 | console.log(res); //目录包含文件 |
| 80 | console.log(_lang); | 81 | console.log(_lang); |
| 81 | $("title").html(_lang); | 82 | $("title").html(_lang); |
| @@ -612,6 +613,19 @@ | @@ -612,6 +613,19 @@ | ||
| 612 | 613 | ||
| 613 | setTitle(res.languageid); | 614 | setTitle(res.languageid); |
| 614 | Dir.languageid = res.languageid; | 615 | Dir.languageid = res.languageid; |
| 616 | + | ||
| 617 | + if (Dir.languageid == 35) { | ||
| 618 | + CodingEditer.isWeb = 1; | ||
| 619 | + $('#cmprun-tabs').hide() | ||
| 620 | + $('#CompileBtn').hide() | ||
| 621 | + $('#resultoutput').hide() | ||
| 622 | + $('#ifrcontainer').show() | ||
| 623 | + }else{ | ||
| 624 | + $('#cmprun-tabs').show() | ||
| 625 | + $('#CompileBtn').show() | ||
| 626 | + $('#resultoutput').show() | ||
| 627 | + $('#ifrcontainer').hide() | ||
| 628 | + } | ||
| 615 | var coderecords = res.codeRecordList || res.studentRecordList; | 629 | var coderecords = res.codeRecordList || res.studentRecordList; |
| 616 | var audioUrl = res.audioUrl; | 630 | var audioUrl = res.audioUrl; |
| 617 | 631 |
dist/gxb-ide/Iterm.js
| @@ -110,7 +110,7 @@ | @@ -110,7 +110,7 @@ | ||
| 110 | }, | 110 | }, |
| 111 | fullScreen: function(){ | 111 | fullScreen: function(){ |
| 112 | 112 | ||
| 113 | - launchFullScreen(document.body); | 113 | + launchFullScreen(document.getElementById('console-wrap')); |
| 114 | $('#back-screen').show(); | 114 | $('#back-screen').show(); |
| 115 | $('#full-screen').hide(); | 115 | $('#full-screen').hide(); |
| 116 | }, | 116 | }, |
| @@ -235,6 +235,8 @@ | @@ -235,6 +235,8 @@ | ||
| 235 | element.msRequestFullscreen(); | 235 | element.msRequestFullscreen(); |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | + $('.CodeMirror-gutter').css('display','none'); | ||
| 239 | + $('.console-wrap').css('paddingLeft','0'); | ||
| 238 | 240 | ||
| 239 | } | 241 | } |
| 240 | function exitFullscreen() { | 242 | function exitFullscreen() { |
dist/js/player.js
| @@ -19,15 +19,11 @@ $(function(){ | @@ -19,15 +19,11 @@ $(function(){ | ||
| 19 | // languageId: _languageid | 19 | // languageId: _languageid |
| 20 | // }); | 20 | // }); |
| 21 | 21 | ||
| 22 | - // alert('============== iterm') | ||
| 23 | 22 | ||
| 24 | var title = decodeURIComponent(getQuery('title')); | 23 | var title = decodeURIComponent(getQuery('title')); |
| 25 | 24 | ||
| 26 | $('.m-title').html(title); | 25 | $('.m-title').html(title); |
| 27 | - // alert('=============='+title) | ||
| 28 | - | ||
| 29 | - | ||
| 30 | - // $('#resultoutput').append(title) | 26 | + |
| 31 | 27 | ||
| 32 | console.log(_role) | 28 | console.log(_role) |
| 33 | 29 |
dist/scss/main.scss
| @@ -200,6 +200,29 @@ html, body{ | @@ -200,6 +200,29 @@ html, body{ | ||
| 200 | } | 200 | } |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | + #console-wrap:-webkit-full-screen{ | ||
| 204 | + width: 100%; | ||
| 205 | + height: 100%; | ||
| 206 | + top: 0; | ||
| 207 | +} | ||
| 208 | + #console-wrap:-moz-full-screen { | ||
| 209 | + width: 100%; | ||
| 210 | + height: 100%; | ||
| 211 | + top: 0; | ||
| 212 | +} | ||
| 213 | + | ||
| 214 | + #console-wrap:-ms-fullscreen { | ||
| 215 | + width: 100%; | ||
| 216 | + height: 100%; | ||
| 217 | + top: 0; | ||
| 218 | +} | ||
| 219 | + | ||
| 220 | + #console-wrapfullscreen { /* spec */ | ||
| 221 | + width: 100%; | ||
| 222 | + height: 100%; | ||
| 223 | + top: 0; | ||
| 224 | +} | ||
| 225 | + | ||
| 203 | .btn{ | 226 | .btn{ |
| 204 | padding: 3px 18px; | 227 | padding: 3px 18px; |
| 205 | } | 228 | } |
dist/v1.1/index.html
| @@ -48,10 +48,7 @@ | @@ -48,10 +48,7 @@ | ||
| 48 | vertical-align: middle; | 48 | vertical-align: middle; |
| 49 | padding-right: 2px; | 49 | padding-right: 2px; |
| 50 | } | 50 | } |
| 51 | - :-webkit-full-screen{ | ||
| 52 | - width: 100%; | ||
| 53 | - height: 100% | ||
| 54 | - } | 51 | + |
| 55 | </style> | 52 | </style> |
| 56 | 53 | ||
| 57 | 54 | ||
| @@ -81,8 +78,7 @@ | @@ -81,8 +78,7 @@ | ||
| 81 | <li><a href="#">图片</a></li> | 78 | <li><a href="#">图片</a></li> |
| 82 | <li><a href="#">bootstrap.css</a></li> | 79 | <li><a href="#">bootstrap.css</a></li> |
| 83 | <li><a href="#">bootstrap.js</a></li> | 80 | <li><a href="#">bootstrap.js</a></li> |
| 84 | - <li><a href="#">jQuery</a></li> | ||
| 85 | - | 81 | + <li><a href="#">jQuery</a></li> |
| 86 | </ul> | 82 | </ul> |
| 87 | </div> | 83 | </div> |
| 88 | </li> | 84 | </li> |
| @@ -147,7 +143,7 @@ | @@ -147,7 +143,7 @@ | ||
| 147 | </div> | 143 | </div> |
| 148 | 144 | ||
| 149 | <div class="panel-body no-compile" id="ifrcontainer" > | 145 | <div class="panel-body no-compile" id="ifrcontainer" > |
| 150 | - <iframe id="resultiframe" frameBorder="0" width="100%" allowfullscreen></iframe> | 146 | + <iframe id="resultiframe" frameBorder="0" width="100%" ></iframe> |
| 151 | </div> | 147 | </div> |
| 152 | 148 | ||
| 153 | </div> | 149 | </div> |
dist/v1.1/player.html
| @@ -124,9 +124,12 @@ | @@ -124,9 +124,12 @@ | ||
| 124 | <div class="tab-pane padall15" id="stderr"></div> | 124 | <div class="tab-pane padall15" id="stderr"></div> |
| 125 | <div class="tab-pane padall15" id="output"></div> | 125 | <div class="tab-pane padall15" id="output"></div> |
| 126 | </div> | 126 | </div> |
| 127 | - <div class="panel-body no-compile" id="ifrcontainer"> | ||
| 128 | - <iframe id="resultiframe" frameBorder="0" width="100%"></iframe> | 127 | + <div class="panel-body no-compile" id="ifrcontainer" > |
| 128 | + <iframe id="resultiframe" frameBorder="0" width="100%" allowfullscreen></iframe> | ||
| 129 | </div> | 129 | </div> |
| 130 | + <!-- <div class="panel-body no-compile" id="ifrcontainer"> | ||
| 131 | + <iframe id="resultiframe" frameBorder="0" width="100%"></iframe> | ||
| 132 | + </div> --> | ||
| 130 | </div> | 133 | </div> |
| 131 | </div> | 134 | </div> |
| 132 | <div class="pause-shodow" style="display: none;"> | 135 | <div class="pause-shodow" style="display: none;"> |
src/gxb-ide/Dir.js
| @@ -620,6 +620,11 @@ | @@ -620,6 +620,11 @@ | ||
| 620 | $('#CompileBtn').hide() | 620 | $('#CompileBtn').hide() |
| 621 | $('#resultoutput').hide() | 621 | $('#resultoutput').hide() |
| 622 | $('#ifrcontainer').show() | 622 | $('#ifrcontainer').show() |
| 623 | + }else{ | ||
| 624 | + $('#cmprun-tabs').show() | ||
| 625 | + $('#CompileBtn').show() | ||
| 626 | + $('#resultoutput').show() | ||
| 627 | + $('#ifrcontainer').hide() | ||
| 623 | } | 628 | } |
| 624 | var coderecords = res.codeRecordList || res.studentRecordList; | 629 | var coderecords = res.codeRecordList || res.studentRecordList; |
| 625 | var audioUrl = res.audioUrl; | 630 | var audioUrl = res.audioUrl; |