瀏覽代碼

Merge branch 'master' of https://github.com/Jaskar/Babylon.js

# Conflicts:
#	Playground/js/menuPG.js
Jaskar 6 年之前
父節點
當前提交
ad76534aa2
共有 3 個文件被更改,包括 9 次插入10 次删除
  1. 7 8
      Playground/js/index.js
  2. 1 1
      Playground/js/menuPG.js
  3. 1 1
      Playground/js/monacoCreator.js

+ 7 - 8
Playground/js/index.js

@@ -10,6 +10,13 @@ zipTool = new zipTool();
  */
  */
 var splitInstance = Split(['#jsEditor', '#canvasZone']);
 var splitInstance = Split(['#jsEditor', '#canvasZone']);
 
 
+// TO DO - Make it work on small screens and mobile
+showQRCode = function () {
+    $("#qrCodeImage").empty();
+    var playgroundCode = window.location.href.split("#");
+    playgroundCode.shift();
+    $("#qrCodeImage").qrcode({ text: "https://playground.babylonjs.com/frame.html#" + (playgroundCode.join("#")) });
+};
 
 
 var run = function () {
 var run = function () {
 
 
@@ -582,14 +589,6 @@ var run = function () {
     }
     }
     utils.setToMultipleID("mainTitle", "innerHTML", "v" + BABYLON.Engine.Version);
     utils.setToMultipleID("mainTitle", "innerHTML", "v" + BABYLON.Engine.Version);
 
 
-    // TO DO - Make it work on small screens and mobile
-    var showQRCode = function () {
-        $("#qrCodeImage").empty();
-        var playgroundCode = window.location.href.split("#");
-        playgroundCode.shift();
-        $("#qrCodeImage").qrcode({ text: "https://playground.babylonjs.com/frame.html#" + (playgroundCode.join("#")) });
-    };
-
     /**
     /**
      * Toggle the code editor
      * Toggle the code editor
      */
      */

+ 1 - 1
Playground/js/menuPG.js

@@ -80,7 +80,7 @@ class MenuPG {
         }.bind(this), false);
         }.bind(this), false);
 
 
         // Message before unload
         // Message before unload
-        window.onbeforeunload = exitPrompt;
+        window.onbeforeunload = this.exitPrompt;
     }
     }
 
 
     /**
     /**

+ 1 - 1
Playground/js/monacoCreator.js

@@ -163,7 +163,7 @@ class MonacoCreator {
             catch (e) {
             catch (e) {
                 utils.showError(e.message, e);
                 utils.showError(e.message, e);
             }
             }
-        }, 100);
+        }.bind(this), 100);
     };
     };
     
     
     /**
     /**