fix bug

ykxie
1 parent 982c84f7
Showing 2 changed files with 88 additions and 31 deletions
src/js/gb.js
src/v1.1/index.html
@@ -144,7 +144,7 @@ $(function() {
          * @param  {[type]} id 代码编辑器的id
          */
         ,getCurrentEditor: function (id){
-            console.info('ZTREE.getCurrentEditor');
+            // console.info('ZTREE.getCurrentEditor');
             var _id = id || treeLinkEditor[0].CodeMirrorRecordId,
                 _name;
@@ -663,6 +663,7 @@ $(function() {
                 }
                 $('#recordertab a:eq(1)').tab('show');
+                GBCodePlayBack.resetCodeMirrorValue(1);
                 var playstatus = $(this).data('status');
@@ -677,11 +678,11 @@ $(function() {
                 if (!playstatus) {
                     console.log('if (!playstatus) {');
                     // TOTO 
-                    // GBCodePlayBack.resetCodeMirrorValue(); 
+                    // GBCodePlayBack.resetCodeMirrorValue(1); 
                     // 会触发编辑器的onChange事件导致 GBCodePlayBack.records 数组会添加一个空记录
                     // 播放之前删除
                     console.log(GBCodePlayBack.records);
-                    GBCodePlayBack.records.pop();
+                    // GBCodePlayBack.records.pop();
                     console.log(GBCodePlayBack.records);
                     var playbackrecord = GBCodePlayBack.records,
@@ -759,7 +760,6 @@ $(function() {
                     error: '',
                     code: ''
                 };
-                GBCodePlayBack.resetCodeMirrorValue();
                 compileResult(resultData);
                 var data = $(this).attr('data');
                 if (_role == 0) {
@@ -1601,7 +1601,7 @@ $(function() {
             /* #END: 编辑器自适应窗口 */
         },
         onChange: function(editor, changeobj) { // 监听输入事件 editor: 输入语言；changeobj：输入内容{from,text,to}
-            console.info('GBCodePlayBack.onChange');
+            // console.info('GBCodePlayBack.onChange');
             var intervaltime = 100,
                 currenttime = new Date().getTime();
             // if(!GBCodePlayBack.record_startime) GBCodePlayBack.record_startime = currenttime;
@@ -1669,7 +1669,7 @@ $(function() {
                     code: record.code || ''
                 };
-                if (resultData.cmpinfo || resultData.result == 1) {
+                if (resultData.compilerInfo) {
                     compileResult(resultData);
                 }
@@ -1787,15 +1787,37 @@ $(function() {
             doc.writeln(result);
             doc.close();
         },
-        resetCodeMirrorValue: function (){
+        /**
+         * 重置编辑器值
+         * @Author syantao
+         * Created by Keystion on 2017-02-06
+         * @param  {[type]} num 0: 重置所有录制CodeMirror的值； 0: 重置所有播放CodeMirror的值；
+         * @return {[type]}     [description]
+         */
+        resetCodeMirrorValue: function(num) {
+            console.info('GBCodePlayBack.resetCodeMirrorValue');
             var _this = this;
+            var _thisNum = num || -1;
             console.log(_this.records);
-            for (var i = 0; i < treeLinkEditor.length; i++) {
-                if(treeLinkEditor[i].CodeMirrorRecord.getValue() != ''){
-                    treeLinkEditor[i].CodeMirrorRecord.setValue("");
+            if (_thisNum == 0) {
+                // _this.resetRecordCodeMirrorValue();
+                for (var i = 0; i < treeLinkEditor.length; i++) {
+                    if (treeLinkEditor[i].CodeMirrorRecord.getValue() != undefined) {
+                        treeLinkEditor[i].CodeMirrorRecord.setValue("");
+                    }
                 }
+            } else if (_thisNum == 1) {
+                // _this.resetReplayCodeMirrorValue();
+                for (var i = 0; i < treeLinkEditor.length; i++) {
+                    if (treeLinkEditor[i].CodeMirrorReplay.getValue() != undefined) {
+                        treeLinkEditor[i].CodeMirrorReplay.setValue("");
+                    }
+                }
+            } else {
+                return false;
             }
         }
+
     }
     $('.record-before').hide();
@@ -1845,7 +1867,7 @@ $(function() {
             console.log('开始录制');
             GBCodePlayBack.isRcording = 1;
-            $("#countdown").find('img').attr('src', 'img/ready-go.gif');
+            $("#countdown").find('img').attr('src', '../img/ready-go.gif');
             $("#countdown").find('img').load(function() {
                 var countdown = setInterval(function() {
                     seconds += 1;
@@ -1928,7 +1950,7 @@ $(function() {
                 GBCodePlayBack.record_pause_time = new Date().getTime(); // 暂停的时间
                 var recordobj = {
                     intervaltime: GBCodePlayBack.record_pause_time - GBCodePlayBack.record_startime,
-                    editor: 'html',
+                    editor: 'Class1',
                     changeobj: {
                         from: {
                             ch: 0,
@@ -1958,16 +1980,17 @@ $(function() {
     // 保存编译结果
     $('#save_compile').unbind("click").click(function(){
+        console.log(GBCodePlayBack.records);
         console.info('$(\'#save_compile\').unbind("click")');
         var length = GBCodePlayBack.records.length - 1;
         recodingConf()
         GBCodePlayBack.records[length].compile = GBCodePlayBack.compileResultData;
-        GBCodePlayBack.records[length].output = GBCodePlayBack.compileResultData.output;
-        GBCodePlayBack.records[length].stderr = GBCodePlayBack.compileResultData.stderr;
-        GBCodePlayBack.records[length].cmpinfo = GBCodePlayBack.compileResultData.cmpinfo;
-        GBCodePlayBack.records[length].result = GBCodePlayBack.compileResultData.result;
+        GBCodePlayBack.records[length].content = GBCodePlayBack.compileResultData.content;
+        GBCodePlayBack.records[length].error = GBCodePlayBack.compileResultData.error;
+        GBCodePlayBack.records[length].compilerInfo = GBCodePlayBack.compileResultData.compilerInfo;
+        GBCodePlayBack.records[length].code = GBCodePlayBack.compileResultData.code;
         contrlPause();
     })
@@ -2110,22 +2133,39 @@ $(function() {
     // 编译结果
     function compileResult(data) {
         if (data.status == 200) {
-            if (data.code == 0) {
-                $('#output').html('<p class="text-success">' + data.content.replace(/\n/g, "<br />") + "</p>");
-                $('#cmpinfo').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 编译成功 </p>');
-                $('#cmprun-tabs a[href="#output"]').tab('show');
-            } else if (data.code == 1) {
-                if (data.error.length) {
-                    $('#cmpinfo').html('<p class="text-warning">' + data.error.replace(/\n/g, "<br />") + "</p>");
-                }else if (data.compilerInfo.length){
-                    $('#cmpinfo').html('<p class="text-warning">' + data.compilerInfo.replace(/\n/g, "<br />") + "</p>");
-                }else{
-                    $('#cmpinfo').html('<p class="alert alert-danger"><i class="glyphicon glyphicon-exclamation-sign"></i> 编译超时，请重新编译 </p>');
-                }
+
+            $('#cmpinfo').html('<p class="text-warning">' + data.compilerInfo.replace(/\n/g, "<br />") + "</p>");        
+            $('#stderr').html('<p class="text-danger">' + data.error.replace(/\n/g, "<br />") + "</p>");       
+            $('#output').html('<p class="text-success">' + data.content.replace(/\n/g, "<br />") + "</p>");  
+
+            if(data.compilerInfo.length){
                 $('#cmprun-tabs a[href="#cmpinfo"]').tab('show');
-            }else{
-                $('#cmpinfo').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 等待编译 </p>');
+            }else if(data.error.length){
+                $('#cmprun-tabs a[href="#stderr"]').tab('show');
+            }else if(data.content.length){
+                $('#cmprun-tabs a[href="#output"]').tab('show');
             }
+
+            if(!data.compilerInfo.length){
+                $('#cmpinfo').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 编译已成功</p>');
+            }
+
+            // if (data.code == 0) {
+            //     $('#output').html('<p class="text-success">' + data.content.replace(/\n/g, "<br />") + "</p>");
+            //     $('#cmpinfo').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 编译成功 </p>');
+            //     $('#cmprun-tabs a[href="#output"]').tab('show');
+            // } else if (data.code == 1) {
+            //     if (data.error.length) {
+            //         $('#cmpinfo').html('<p class="text-warning">' + data.error.replace(/\n/g, "<br />") + "</p>");
+            //     }else if (data.compilerInfo.length){
+            //         $('#cmpinfo').html('<p class="text-warning">' + data.compilerInfo.replace(/\n/g, "<br />") + "</p>");
+            //     }else{
+            //         $('#cmpinfo').html('<p class="alert alert-danger"><i class="glyphicon glyphicon-exclamation-sign"></i> 编译超时，请重新编译 </p>');
+            //     }
+            //     $('#cmprun-tabs a[href="#cmpinfo"]').tab('show');
+            // }else{
+            //     $('#cmpinfo').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 等待编译 </p>');
+            // }
         }else{
             $('#cmpinfo').html('<p class="alert alert-danger"><i class="glyphicon glyphicon-exclamation-sign"></i> 请求失败 </p>');
             $('#cmprun-tabs a[href="#cmpinfo"]').tab('show');
@@ -2139,7 +2179,7 @@ $(function() {
             recorder = rec;
             recorder.start();
-            GBCodePlayBack.resetCodeMirrorValue();
+            GBCodePlayBack.resetCodeMirrorValue(0);
             GBCodePlayBack.records = [];
             GBCodePlayBack.record_startime = new Date().getTime();
@@ -99,6 +99,23 @@
                     <div id="replayzone"></div>
                 </div>
                 <div id="handleMR"></div>
+                <div class="pause-shodow hidden">
+                    <div class="compile-loading">
+                        <img src="../img/loading.png" alt="">
+                    </div>
+                    <div class="compile-reslut" style="display: none;">
+                        <div class="tip-header">
+                            <span>成功获取编译运行结果</span>
+                        </div>
+                        <div class="tip-content">
+                            <p>保存编译结果后，播放到此处会在运行区域直接显示结果。需要保存结果后继续录制吗?</p>
+                        </div>
+                        <div class="tip-footer">
+                            <button class="btn btn-success btn-sm" id="save_compile">保存并继续录制</button>
+                            <button class="btn btn-danger btn-sm" id="cancel_compile">不保存继续录制</button>
+                        </div>
+                    </div>
+                </div>
             </div>
             <div id="appRight">
                 <div id="resultpanel" class="panel panel-default editor-result">