梁美英 / programming · Commits

Commit 0f2453ed4344d00576090ab47a77537baead556a

Authored by ykxie
2 parents 31462a5c 537c2933

merged bug fix bug issue-1

Inline Side-by-side
Showing 3 changed files with 6 additions and 10 deletions
src/index.html
  View file @0f2453e
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
16 <link href="css/recording.css" rel="stylesheet"> 16 <link href="css/recording.css" rel="stylesheet">
17 17
18 <script> 18 <script>
19 - var gxb_api = "https://restful1.gaoxiaobang.com";  
20 - // var gxb_api = "https://restful1.gaoxiaobang.cn" 19 + // var gxb_api = "https://restful1.gaoxiaobang.com";
  20 + var gxb_api = "https://restful.gaoxiaobang.cn"
21 21
22 </script> 22 </script>
23 23
@@ -35,8 +35,6 @@ @@ -35,8 +35,6 @@
35 <script src="js/emmet.js"></script> 35 <script src="js/emmet.js"></script>
36 <script src="js/jshint-2.6.min.js"></script> 36 <script src="js/jshint-2.6.min.js"></script>
37 <script src="js/jstorage.js"></script> 37 <script src="js/jstorage.js"></script>
38 -  
39 -  
40 38
41 <script src="js/05-util.js"></script> 39 <script src="js/05-util.js"></script>
42 <script src="js/03-http.js"></script> 40 <script src="js/03-http.js"></script>
@@ -233,6 +231,7 @@ @@ -233,6 +231,7 @@
233 231
234 $('.recording').click(function(){ 232 $('.recording').click(function(){
235 $('.recording').hide(); 233 $('.recording').hide();
  234 + $('.recording-time').removeClass('twinkle');
236 timer.stopTimer(); // 停止计时器 235 timer.stopTimer(); // 停止计时器
237 236
238 $('#upload').removeClass('upload-teach').addClass('recording-finish').removeAttr('disabled').prop("disabled",false); 237 $('#upload').removeClass('upload-teach').addClass('recording-finish').removeAttr('disabled').prop("disabled",false);
src/js/gbreplayer.js
  View file @0f2453e
@@ -950,8 +950,8 @@ $(function(){ @@ -950,8 +950,8 @@ $(function(){
950 }) 950 })
951 // 保存代码 951 // 保存代码
952 $('#savecorde').click(function(){ 952 $('#savecorde').click(function(){
953 - // alert('9999')  
954 $('#savemsg').addClass('hidden'); 953 $('#savemsg').addClass('hidden');
  954 + $('.upload-tip').show();
955 955
956 $('#uploading2').css('display', 'inline-block') 956 $('#uploading2').css('display', 'inline-block')
957 957
src/player.html
  View file @0f2453e
@@ -15,8 +15,8 @@ @@ -15,8 +15,8 @@
15 <link href="css/recording.css" rel="stylesheet"> 15 <link href="css/recording.css" rel="stylesheet">
16 16
17 <script> 17 <script>
18 - var gxb_api = "https://restful1.gaoxiaobang.com";  
19 - // var gxb_api = "https://restful1.gaoxiaobang.cn" 18 + // var gxb_api = "https://restful1.gaoxiaobang.com";
  19 + var gxb_api = "https://restful.gaoxiaobang.cn"
20 </script> 20 </script>
21 21
22 <script src="js/jquery-1.7.1.js"></script> 22 <script src="js/jquery-1.7.1.js"></script>
@@ -45,9 +45,6 @@ @@ -45,9 +45,6 @@
45 <script src="js/jquery.validationEngine.js"></script> 45 <script src="js/jquery.validationEngine.js"></script>
46 <script src="js/jquery.validationEngine-zh.js"></script> 46 <script src="js/jquery.validationEngine-zh.js"></script>
47 <script src="js/jquery.isotope.js"></script> 47 <script src="js/jquery.isotope.js"></script>
48 -  
49 - <!-- <script src="js/identityService.js"></script> -->  
50 - <!-- <script src="js/engine.js"></script> -->  
51 48
52 <script src="js/gbreplayer.js"></script> 49 <script src="js/gbreplayer.js"></script>
53 <script src="js/recording/recording.js"></script> 50 <script src="js/recording/recording.js"></script>