Merge branch 'fixbug' into dev

ykxie
2 parents 8a50c4c6 6c38411c
Showing 6 changed files with 16 additions and 29 deletions
src/css/main.css
src/css/recording.css
src/index.html
src/js/gbreplayer.js
src/player.html
src/scss/recording.scss
 .real-program-content{
     padding: 0 16px;
-    padding-top: 16px;
 }
 .recording{
     background-color: #FFF;
@@ -31,10 +31,12 @@ button {
 .player .col-md-8 {
   padding-right: 0;
-  overflow: hidden; }
+  overflow: hidden;
+  padding-left: 0; }
 .player .col-md-4 {
-  padding-left: 0; }
+  padding-left: 0;
+  padding-right: 0; }
 .upload-tip {
   position: absolute;
@@ -16,7 +16,7 @@
     <link href="css/recording.css" rel="stylesheet">
     <script>
-        var gxb_api = "https://restful1.gaoxiaobang.com";
+        var gxb_api = "https://restful.gaoxiaobang.com";
         // var gxb_api = "https://restful.gaoxiaobang.cn"
     </script>
@@ -122,7 +122,7 @@
                         <div class="btn-group pull-right" id="comprunbtngrp"></div>
                     </div>
                     <div class="panel-body hidden" id="cmprun-output">
-                        <div id="resultoutput" style="overflow:auto;">
+                        <div id="resultoutput">
                             <!-- Nav tabs -->
                             <ul class="nav nav-tabs" role="tablist" id="cmprun-tabs">
                                 <li class="active"><a href="#stdin" role="tab" data-toggle="tab" class="text-warning">标准输入</a></li>
@@ -471,7 +471,6 @@ $(function(){
 				if(document.URL.indexOf('player.html')>=0){
 					if(playstatus){
 						GBCodePlayBack.pauseData = new Date().getTime();	// 暂停的时间
-						console.log(GBCodePlayBack.pauseData)
 						myAudio[0].pause();
 						$('#play').find('i').removeClass('icon-playcopy').addClass('icon-play').attr('data-original-title', '播放');
 					}else{
@@ -500,32 +499,21 @@ $(function(){
 									if (tag === 1) {
 										GBCodePlayBack.stopIntervalTime = playbackrecord[0].intervaltime - (GBCodePlayBack.pauseData - GBCodePlayBack.playRecordStart);
 										starttime =  GBCodePlayBack.stopIntervalTime
-										console.log(starttime)
 										tag++;
 									}else{
 										GBCodePlayBack.stopIntervalTime = GBCodePlayBack.stopIntervalTime - (GBCodePlayBack.pauseData - GBCodePlayBack.playRecordStart);
 										starttime = GBCodePlayBack.stopIntervalTime;
-										console.log('------------------------------')
-										console.log(tag)
-										console.log(starttime)
-										console.log('------------------------------')
 									}
-									console.log(starttime)
 								}
-								console.log(starttime)
 							}else{
 								starttime = parseInt(starttime) + parseInt(replayinterval);
 								if (GBCodePlayBack.pauseData && GBCodePlayBack.pauseData - playbackrecord[i-1].playTime > 0) {
-									console.log('+++++++++++++++++++++++++++++++++++++++')
 									GBCodePlayBack.stopIntervalTime = GBCodePlayBack.pauseData - playbackrecord[i-1].playTime;
 									starttime = GBCodePlayBack.stopIntervalTime + parseInt(replayinterval);
-									console.log(starttime)
 								}
-								
-								console.log(starttime)
 							}
 							timeoutcontroller = setTimeout( GBCodePlayBack.changeValueCallback(playbackrecord[i]), starttime/GBCodePlayBack.speed );
@@ -538,7 +526,6 @@ $(function(){
 					}
 					// 记录播放的时间
 					GBCodePlayBack.playRecordStart = new Date().getTime();
-					console.log(GBCodePlayBack.playRecordStart);
 				}else{
 					var recordtimeoutcontrolls = GBCodePlayBack.recordtimeoutcontrolls;
@@ -548,8 +535,6 @@ $(function(){
 					GBCodePlayBack.recordtimeouts = [];	
 					// GBCodePlayBack.playRecordStart = new Date().getTime();	// 再次开始播放的时间
-
-					console.log(GBCodePlayBack);
 				}
 				$(this).data('status', !playstatus);
 			});
@@ -653,7 +638,6 @@ $(function(){
 			//播放代码回放
 			$('#playrecord').click(function(){
 				// GBCodePlayBack.playRecordStart = new Date().getTime();	// 开始播放的时间
-				// console.log(GBCodePlayBack.playRecordStart);
 				if($(window).width()>992){
 					var $tutorial = $('#tutorialinfopanel'),
 						$editorpanel = $('#editorpanel'),
@@ -669,7 +653,7 @@ $(function(){
 				$sliderpropress.slider( "option", "disabled", false );
-				$(this).popover('destroy');
+				// $(this).popover('destroy');
 				$(this).find('span').toggleClass('glyphicon-cloud-download').toggleClass('glyphicon-play');
@@ -1027,7 +1011,6 @@ $(function(){
 					    dataType: "json",
 					    contentType: "application/json",
 					    success: function(data){
-					    	console.log(data)
 					        $(window).unbind('beforeunload');
 	                        var _data = {
 	                                "programId": data.codeReplayId,
@@ -1055,7 +1038,6 @@ $(function(){
 					    dataType: "json",
 					    contentType: "application/json",
 					    success: function(data) {
-					    	console.log(data)
 					        $(window).unbind('beforeunload');
 	                        var _data = {
 	                                "programId": data.studentReplayId,
@@ -1421,6 +1403,7 @@ $(function(){
 			var calcHeight = function() {
 				var $resultpanel = $("#resultpanel").offset();
 				var $recordpanel = $("#recordpanel").offset();
+				var $resultoutput = $('#resultoutput').offset();
 				if (document.URL.indexOf('index.htm') >= 0) {
 					$("#recordpanel").height($(window).height() - $recordpanel.top - 16 - 70); 
@@ -1431,6 +1414,8 @@ $(function(){
 					$("#resultpanel").height($(window).height() - $resultpanel.top - 16 - 34);
 					$(".CodeMirror").height($(window).height() - $recordpanel.top - 16 - 34);
 				}
+				$('#resultoutput').find('.tab-content').height($(window).height() - $resultoutput.top - 164).css({'overflow-y': "scroll"})
+				
 			   	/*保证编辑器都尺寸自动变化（包括滚动条）*/
 				if(typeof GBCodePlayBack.htmleditor !=='undefined'&&typeof GBCodePlayBack.csseditor!=='undefined'&&typeof GBCodePlayBack.jseditor!=='undefined'){
 					GBCodePlayBack.htmleditor.refresh();
@@ -1443,7 +1428,7 @@ $(function(){
 				// $('#editorwrapper').find('button').removeClass('btn-primary').find('#allbutton').addClass('btn-primary');
 		    	calcHeight();
 		    	//窗口变化则隐藏popover
-		    	$('#playrecord').popover('hide');
+		    	// $('#playrecord').popover('hide');
 		  	}).load(function() {
 		    	calcHeight();
 		  	});
@@ -1489,7 +1474,6 @@ $(function(){
 				record.trigger = 1; //标记已运行
 				record.playTime = new Date().getTime();	// 播放开始时间
-				console.log(record)
 				if(replay_type){
 					GBCodePlayBack.excercise_triggertotal += 1;
@@ -15,7 +15,7 @@
     <link href="css/recording.css" rel="stylesheet">
     <script>
-        var gxb_api = "https://restful1.gaoxiaobang.com";
+        var gxb_api = "https://restful.gaoxiaobang.com";
         // var gxb_api = "https://restful.gaoxiaobang.com"
     </script>
@@ -141,7 +141,7 @@
         </div>
         <div class="play-bar">
-            <button id="playrecord" data-status='0' title="播放">
+            <button id="playrecord" data-status='0' title="播adasdas放">
                 <i class="icon iconfont icon-play"></i>
             </button>
             <button id="play" class="" style="display: none;" data-status='0' title="暂停">
@@ -29,10 +29,12 @@ button{
 .player{
     .col-md-8{
         padding-right: 0;
-        overflow: hidden
+        overflow: hidden;
+        padding-left: 0;
     }
     .col-md-4{
         padding-left: 0;
+        padding-right: 0;
     }
 }