Merge pull request #2540 from ajaxorg/improve_zen_loading

Only load zen bg on button click

Author: nightwing

plugins-client/ext.zen/zen.js

@@ -44,6 +44,8 @@ module.exports = ext.register("ext/zen/zen", {
     handleLeftMove : false,
     handleRightMove : false,
 
+    entered: false,
+
     nodes : [],
 
     hook : function(){
@@ -157,12 +159,24 @@ module.exports = ext.register("ext/zen/zen", {
                 page.appendChild(button);
         });
 
-        vbMain.parentNode.appendChild(new apf.vbox({
-            anchors: "0 0 0 0",
-            id: "vbZen",
-            "class": "vbZen",
-            visible: false
-        }));
+        ide.addEventListener("enterzen", function() {
+            // prevent adding vbZen every time the button is clicked
+            if (!_self.entered) {
+                _self.entered = true;
+                vbMain.parentNode.appendChild(new apf.vbox({
+                    anchors: "0 0 0 0",
+                    id: "vbZen",
+                    "class": "vbZen",
+                    visible: false
+                }));
+
+                vbZen.addEventListener("resize", function(e) {
+                    if (_self.isFocused) {
+                        _self.calculatePositions();
+                    }
+                });
+            }
+        });
 
         setTimeout(function() {
             _self.updateButtonPosition();
@@ -171,12 +185,6 @@ module.exports = ext.register("ext/zen/zen", {
         this.animateZen = document.getElementById("animateZen");
         this.animateZenPosition = document.getElementById("animateZenPosition");
 
-        vbZen.addEventListener("resize", function(e) {
-            if (_self.isFocused) {
-                _self.calculatePositions();
-            }
-        });
-
         ide.addEventListener("exitfullscreen", function() {
             _self.escapeFromZenMode(false, true);
         });
@@ -301,6 +309,8 @@ module.exports = ext.register("ext/zen/zen", {
      * @param {boolean} slow Whether to slow down the animation
      */
     enterIntoZenMode : function(slow) {
+        ide.dispatchEvent("enterzen");
+
         var _self = this;
 
         var activeElement = apf.document.activeElement;
@@ -381,6 +391,8 @@ module.exports = ext.register("ext/zen/zen", {
         if (this.isFocused === false)
             return;
 
+        ide.dispatchEvent("escapezen");
+
         var _self = this;
 
         var activeElement = apf.document.activeElement;
@@ -563,4 +575,4 @@ module.exports = ext.register("ext/zen/zen", {
     }
 });
 
-});
+});