梁美英 / programming · Commits

Commit d971b569b9560bb7edd0ca3433cdcdec852ee7fb

Authored by ykxie
2 parents 8a50c4c6 6c38411c

Merge branch 'fixbug' into dev

Inline Side-by-side
Showing 6 changed files with 16 additions and 29 deletions
src/css/main.css
  View file @d971b56
1 1  
2 2 .real-program-content{
3 3 padding: 0 16px;
4   - padding-top: 16px;
5 4 }
6 5 .recording{
7 6 background-color: #FFF;
... ...
src/css/recording.css
  View file @d971b56
... ... @@ -31,10 +31,12 @@ button {
31 31  
32 32 .player .col-md-8 {
33 33 padding-right: 0;
34   - overflow: hidden; }
  34 + overflow: hidden;
  35 + padding-left: 0; }
35 36  
36 37 .player .col-md-4 {
37   - padding-left: 0; }
  38 + padding-left: 0;
  39 + padding-right: 0; }
38 40  
39 41 .upload-tip {
40 42 position: absolute;
... ...
src/index.html
  View file @d971b56
... ... @@ -16,7 +16,7 @@
16 16 <link href="css/recording.css" rel="stylesheet">
17 17  
18 18 <script>
19   - var gxb_api = "https://restful1.gaoxiaobang.com";
  19 + var gxb_api = "https://restful.gaoxiaobang.com";
20 20 // var gxb_api = "https://restful.gaoxiaobang.cn"
21 21  
22 22 </script>
... ... @@ -122,7 +122,7 @@
122 122 <div class="btn-group pull-right" id="comprunbtngrp"></div>
123 123 </div>
124 124 <div class="panel-body hidden" id="cmprun-output">
125   - <div id="resultoutput" style="overflow:auto;">
  125 + <div id="resultoutput">
126 126 <!-- Nav tabs -->
127 127 <ul class="nav nav-tabs" role="tablist" id="cmprun-tabs">
128 128 <li class="active"><a href="#stdin" role="tab" data-toggle="tab" class="text-warning">标准输入</a></li>
... ...
src/js/gbreplayer.js
  View file @d971b56
... ... @@ -471,7 +471,6 @@ $(function(){
471 471 if(document.URL.indexOf('player.html')>=0){
472 472 if(playstatus){
473 473 GBCodePlayBack.pauseData = new Date().getTime(); // 暂停的时间
474   - console.log(GBCodePlayBack.pauseData)
475 474 myAudio[0].pause();
476 475 $('#play').find('i').removeClass('icon-playcopy').addClass('icon-play').attr('data-original-title', '播放');
477 476 }else{
... ... @@ -500,32 +499,21 @@ $(function(){
500 499 if (tag === 1) {
501 500 GBCodePlayBack.stopIntervalTime = playbackrecord[0].intervaltime - (GBCodePlayBack.pauseData - GBCodePlayBack.playRecordStart);
502 501 starttime = GBCodePlayBack.stopIntervalTime
503   - console.log(starttime)
504 502 tag++;
505 503 }else{
506 504 GBCodePlayBack.stopIntervalTime = GBCodePlayBack.stopIntervalTime - (GBCodePlayBack.pauseData - GBCodePlayBack.playRecordStart);
507 505 starttime = GBCodePlayBack.stopIntervalTime;
508   - console.log('------------------------------')
509   - console.log(tag)
510   - console.log(starttime)
511   - console.log('------------------------------')
512 506 }
513   - console.log(starttime)
514 507 }
515 508  
516   - console.log(starttime)
517 509  
518 510 }else{
519 511 starttime = parseInt(starttime) + parseInt(replayinterval);
520 512  
521 513 if (GBCodePlayBack.pauseData && GBCodePlayBack.pauseData - playbackrecord[i-1].playTime > 0) {
522   - console.log('+++++++++++++++++++++++++++++++++++++++')
523 514 GBCodePlayBack.stopIntervalTime = GBCodePlayBack.pauseData - playbackrecord[i-1].playTime;
524 515 starttime = GBCodePlayBack.stopIntervalTime + parseInt(replayinterval);
525   - console.log(starttime)
526 516 }
527   -
528   - console.log(starttime)
529 517 }
530 518  
531 519 timeoutcontroller = setTimeout( GBCodePlayBack.changeValueCallback(playbackrecord[i]), starttime/GBCodePlayBack.speed );
... ... @@ -538,7 +526,6 @@ $(function(){
538 526 }
539 527 // 记录播放的时间
540 528 GBCodePlayBack.playRecordStart = new Date().getTime();
541   - console.log(GBCodePlayBack.playRecordStart);
542 529 }else{
543 530 var recordtimeoutcontrolls = GBCodePlayBack.recordtimeoutcontrolls;
544 531  
... ... @@ -548,8 +535,6 @@ $(function(){
548 535  
549 536 GBCodePlayBack.recordtimeouts = [];
550 537 // GBCodePlayBack.playRecordStart = new Date().getTime(); // 再次开始播放的时间
551   -
552   - console.log(GBCodePlayBack);
553 538 }
554 539 $(this).data('status', !playstatus);
555 540 });
... ... @@ -653,7 +638,6 @@ $(function(){
653 638 //播放代码回放
654 639 $('#playrecord').click(function(){
655 640 // GBCodePlayBack.playRecordStart = new Date().getTime(); // 开始播放的时间
656   - // console.log(GBCodePlayBack.playRecordStart);
657 641 if($(window).width()>992){
658 642 var $tutorial = $('#tutorialinfopanel'),
659 643 $editorpanel = $('#editorpanel'),
... ... @@ -669,7 +653,7 @@ $(function(){
669 653  
670 654 $sliderpropress.slider( "option", "disabled", false );
671 655  
672   - $(this).popover('destroy');
  656 + // $(this).popover('destroy');
673 657  
674 658 $(this).find('span').toggleClass('glyphicon-cloud-download').toggleClass('glyphicon-play');
675 659  
... ... @@ -1027,7 +1011,6 @@ $(function(){
1027 1011 dataType: "json",
1028 1012 contentType: "application/json",
1029 1013 success: function(data){
1030   - console.log(data)
1031 1014 $(window).unbind('beforeunload');
1032 1015 var _data = {
1033 1016 "programId": data.codeReplayId,
... ... @@ -1055,7 +1038,6 @@ $(function(){
1055 1038 dataType: "json",
1056 1039 contentType: "application/json",
1057 1040 success: function(data) {
1058   - console.log(data)
1059 1041 $(window).unbind('beforeunload');
1060 1042 var _data = {
1061 1043 "programId": data.studentReplayId,
... ... @@ -1421,6 +1403,7 @@ $(function(){
1421 1403 var calcHeight = function() {
1422 1404 var $resultpanel = $("#resultpanel").offset();
1423 1405 var $recordpanel = $("#recordpanel").offset();
  1406 + var $resultoutput = $('#resultoutput').offset();
1424 1407  
1425 1408 if (document.URL.indexOf('index.htm') >= 0) {
1426 1409 $("#recordpanel").height($(window).height() - $recordpanel.top - 16 - 70);
... ... @@ -1431,6 +1414,8 @@ $(function(){
1431 1414 $("#resultpanel").height($(window).height() - $resultpanel.top - 16 - 34);
1432 1415 $(".CodeMirror").height($(window).height() - $recordpanel.top - 16 - 34);
1433 1416 }
  1417 + $('#resultoutput').find('.tab-content').height($(window).height() - $resultoutput.top - 164).css({'overflow-y': "scroll"})
  1418 +
1434 1419 /*保证编辑器都尺寸自动变化（包括滚动条）*/
1435 1420 if(typeof GBCodePlayBack.htmleditor !=='undefined'&&typeof GBCodePlayBack.csseditor!=='undefined'&&typeof GBCodePlayBack.jseditor!=='undefined'){
1436 1421 GBCodePlayBack.htmleditor.refresh();
... ... @@ -1443,7 +1428,7 @@ $(function(){
1443 1428 // $('#editorwrapper').find('button').removeClass('btn-primary').find('#allbutton').addClass('btn-primary');
1444 1429 calcHeight();
1445 1430 //窗口变化则隐藏popover
1446   - $('#playrecord').popover('hide');
  1431 + // $('#playrecord').popover('hide');
1447 1432 }).load(function() {
1448 1433 calcHeight();
1449 1434 });
... ... @@ -1489,7 +1474,6 @@ $(function(){
1489 1474  
1490 1475 record.trigger = 1; //标记已运行
1491 1476 record.playTime = new Date().getTime(); // 播放开始时间
1492   - console.log(record)
1493 1477  
1494 1478 if(replay_type){
1495 1479 GBCodePlayBack.excercise_triggertotal += 1;
... ...
src/player.html
  View file @d971b56
... ... @@ -15,7 +15,7 @@
15 15 <link href="css/recording.css" rel="stylesheet">
16 16  
17 17 <script>
18   - var gxb_api = "https://restful1.gaoxiaobang.com";
  18 + var gxb_api = "https://restful.gaoxiaobang.com";
19 19 // var gxb_api = "https://restful.gaoxiaobang.com"
20 20 </script>
21 21  
... ... @@ -141,7 +141,7 @@
141 141 </div>
142 142  
143 143 <div class="play-bar">
144   - <button id="playrecord" data-status='0' title="播放">
  144 + <button id="playrecord" data-status='0' title="播adasdas放">
145 145 <i class="icon iconfont icon-play"></i>
146 146 </button>
147 147 <button id="play" class="" style="display: none;" data-status='0' title="暂停">
... ...
src/scss/recording.scss
  View file @d971b56
... ... @@ -29,10 +29,12 @@ button{
29 29 .player{
30 30 .col-md-8{
31 31 padding-right: 0;
32   - overflow: hidden
  32 + overflow: hidden;
  33 + padding-left: 0;
33 34 }
34 35 .col-md-4{
35 36 padding-left: 0;
  37 + padding-right: 0;
36 38 }
37 39 }
38 40  
... ...