Merge branch 'fixbug' into dev

ykxie
2 parents 085137bd 663f7141
Showing 2 changed files with 4 additions and 2 deletions
src/index.html
src/js/gbreplayer.js
@@ -210,7 +210,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();
@@ -945,7 +945,9 @@ $(function(){
 			});
 			$('#cancel').click(function(){
-				$(window).unbind('beforeunload');
+				$(window).unbind('beforeunload',  function(){ 
+					return '确认退出？ 将不保存你的代码';
+				});
 				window.close();
 			})
 			// 保存代码