Merge branch 'dev' into kira

ykxie
2 parents 7ee30be4 16b43d0c
Showing 6 changed files with 57 additions and 56 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,16 +30,7 @@
     border: none;
     border-bottom: 1px solid #ddd;
 }
-// input[type="button"]{
-//     min-width: 6em;
-//     background-image: none;
-//     background-color: #1FB6FF;
-//     border: none;
-//     padding: 1em .8em;
-//     color: #fff;
-//     outline: none;
-//     line-height: 1.428571429;
-// }
+
 input[disabled]{
     color: rgb(84, 84, 84);
     background-color: #a8b8bf;
@@ -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;
@@ -299,8 +301,8 @@ button {
   margin-right: 0;
   line-height: 1.428571429;
   border: none !important;
-  height: 42px;
-  line-height: 42px;
+  height: 34px;
+  line-height: 34px;
   padding: 0;
   border-radius: 21px; }
  
@@ -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>
@@ -106,13 +106,13 @@
                         <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>
-                                <li><a href="#cmpinfo" role="tab" data-toggle="tab" class="text-warning">编译信息</a></li>
-                                <li><a href="#stderr" role="tab" data-toggle="tab" class="text-danger">错误输出</a></li>
-                                <li><a href="#output" role="tab" data-toggle="tab" class="text-success">运行结果</a></li>
+                                <li class="active"><a href="#stdin" role="tab" data-toggle="tab" class="text-warning">标准</a></li>
+                                <li><a href="#cmpinfo" role="tab" data-toggle="tab" class="text-warning">编译</a></li>
+                                <li><a href="#stderr" role="tab" data-toggle="tab" class="text-danger">错误</a></li>
+                                <li><a href="#output" role="tab" data-toggle="tab" class="text-success">结果</a></li>
                             </ul>
                             <!-- Tab panes -->
                             <div class="tab-content">
@@ -194,7 +194,7 @@
  
         $('#upload').removeClass('upload-teach').addClass('recording-finish').removeAttr('disabled').prop("disabled",false);
         $('#savecorde').removeClass('upload-teach').addClass('recording-finish').removeAttr('disabled').prop("disabled",false);
-        $('#cancel').attr('disabled', 'disabled').prop("disabled", true);
+        // $('#cancel').attr('disabled', 'disabled').prop("disabled", true);
  
         // $('.recording').hide();
         $('.new-recording').show();
@@ -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');
  
@@ -945,7 +929,9 @@ $(function(){
 			});
  
 			$('#cancel').click(function(){
-				$(window).unbind('beforeunload');
+				$(window).unbind('beforeunload',  function(){ 
+					return '确认退出？ 将不保存你的代码';
+				});
 				window.close();
 			})
 			// 保存代码
@@ -1025,7 +1011,6 @@ $(function(){
 					    dataType: "json",
 					    contentType: "application/json",
 					    success: function(data){
-					    	console.log(data)
 					        $(window).unbind('beforeunload');
 	                        var _data = {
 	                                "programId": data.codeReplayId,
@@ -1053,7 +1038,6 @@ $(function(){
 					    dataType: "json",
 					    contentType: "application/json",
 					    success: function(data) {
-					    	console.log(data)
 					        $(window).unbind('beforeunload');
 	                        var _data = {
 	                                "programId": data.studentReplayId,
@@ -1419,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); 
@@ -1429,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();
@@ -1441,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();
 		  	});
@@ -1487,7 +1474,6 @@ $(function(){
  
 				record.trigger = 1; //标记已运行
 				record.playTime = new Date().getTime();	// 播放开始时间
-				console.log(record)
  
 				if(replay_type){
 					GBCodePlayBack.excercise_triggertotal += 1;
@@ -76,13 +76,11 @@
                         <div class="recording-header">
                             <ul class="nav nav-tabs pull-left" id="recordertab">
                                 <li style="margin-left: 34px;">
-                                    <a href="#replayzone" data-toggle="tab">
-                                        <span class="glyphicon glyphicon-play"></span><p class="hidden-xs hidden-sm pull-right">&nbsp;课程预览区</p>
-                                    </a>
+                                    <a href="#replayzone" data-toggle="tab"></a>
                                 </li>
                             </ul>
                             <div id="editorwrapper">
-                                <button type="button" class="lang btn btn-default btn-primary pull-right" id="htmlbutton" title="" data-editorname="html"></button>
+                                <button type="button" class="lang btn btn-default btn-primary pull-right" id="htmlbutton" title="" data-editorname="html">HTML/CSS/JS</button>
                             </div>
                         </div>
                     </div>
@@ -113,10 +111,10 @@
                             <div id="resultoutput" style="overflow:auto;">
                                 <!-- 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>
-                                    <li><a href="#cmpinfo" role="tab" data-toggle="tab" class="text-warning">编译信息</a></li>
-                                    <li><a href="#stderr" role="tab" data-toggle="tab" class="text-danger">错误输出</a></li>
-                                    <li><a href="#output" role="tab" data-toggle="tab" class="text-success">运行结果</a></li>
+                                    <li class="active"><a href="#stdin" role="tab" data-toggle="tab" class="text-warning">标准</a></li>
+                                    <li><a href="#cmpinfo" role="tab" data-toggle="tab" class="text-warning">编译</a></li>
+                                    <li><a href="#stderr" role="tab" data-toggle="tab" class="text-danger">错误</a></li>
+                                    <li><a href="#output" role="tab" data-toggle="tab" class="text-success">结果</a></li>
                                 </ul>
                                 <!-- Tab panes -->
                                 <div class="tab-content">
@@ -138,7 +136,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,11 +29,36 @@ button{
 .player{
     .col-md-8{
         padding-right: 0;
-        overflow: hidden
+        overflow: hidden;
+        padding-left: 0;
     }
     .col-md-4{
         padding-left: 0;
+        padding-right: 0;
     }
+
+    // .recording-wrap{
+
+    //     .recording-header{
+    //         height: 36px;
+    //     }
+    //     .lang{
+    //         padding: 4px 24px;
+    //         margin: 3px 16px;
+    //     }
+    // }
+    // .nav-tabs > li > a{
+    //     height: 36px;
+    //     line-height: 1px;
+    // }
+    // .panel-default > .panel-heading{
+    //     height: 36px;
+    //     line-height: 18px;
+
+    // }
+    // .panel-heading{
+    //     padding: 8px 16px;
+    // }
 }
  
 .upload-tip{
@@ -371,8 +396,8 @@ button{
         margin-right: 0;
         line-height: 1.428571429;
         border: none !important;
-        height: 42px;
-        line-height: 42px;
+        height: 34px;
+        line-height: 34px;
         padding: 0;
         border-radius: 21px;
     }