Merge pull request #1402 from ajaxorg/rev-resiz

Revisions: Only revisions should know about revisions.
gero3 · May 3, 2012 · 65b62a8 · 65b62a8
2 parents 96aab78 + c008245
commit 65b62a8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 35 deletions.
diff --git a/plugins-client/ext.beautify/beautify.js b/plugins-client/ext.beautify/beautify.js
@@ -84,15 +84,7 @@ module.exports = ext.register("ext/beautify/beautify", {
         sel.setSelectionRange(Range.fromPoints(range.start, end));
     },
 
-    init: function () {
-        var _self = this;
-        ide.addEventListener("revisions.visibility", function(e) {
-            if (e.visibility === "shown")
-                _self.disable();
-            else
-                _self.enable();
-        });
-    },
+    init: function () {},
 
     hook: function () {
         var _self = this;

diff --git a/plugins-client/ext.quicksearch/quicksearch.js b/plugins-client/ext.quicksearch/quicksearch.js
@@ -70,15 +70,6 @@ module.exports = ext.register("ext/quicksearch/quicksearch", {
 
             _self.updateBarPosition();
         });
-
-        ide.addEventListener("revisions.visibility", function(e) {
-            if (e.visibility === "shown")
-                _self.offsetWidth = _self.defaultOffset + e.width;
-            else
-                _self.offsetWidth = _self.defaultOffset;
-
-            _self.updateBarPosition();
-        });
 
         this.nodes.push(
             menus.addItemByPath("Find/~", new apf.divider(), 1000),

diff --git a/plugins-client/ext.revisions/revisions.js b/plugins-client/ext.revisions/revisions.js
@@ -30,6 +30,12 @@ var markup = require("text!ext/revisions/revisions.xml");
 var skin = require("text!ext/revisions/skin.xml");
 var cssString = require("text!ext/revisions/style.css");
 
+var beautify = require("ext/beautify/beautify");
+var quicksearch = require("ext/quicksearch/quicksearch");
+var statusbar = require("ext/statusbar/statusbar");
+var stripws = require("ext/stripws/stripws");
+var language = require("ext/language/language");
+
 var BAR_WIDTH = 200;
 var INTERVAL = 60000;
 var CHANGE_TIMEOUT = 5000;
@@ -775,7 +781,7 @@ module.exports = ext.register("ext/revisions/revisions", {
             }
             return index;
         };
-        
+
         var self = this;
         var pages = tabEditors.getPages();
         var page = pages.filter(function(_page) {
@@ -1362,6 +1368,14 @@ module.exports = ext.register("ext/revisions/revisions", {
                 visibility: "shown",
                 width: BAR_WIDTH
             });
+
+            beautify.disable();
+            quicksearch.offsetWidth = quicksearch.defaultOffset + BAR_WIDTH;
+            quicksearch.updateBarPosition();
+            statusbar.offsetWidth = BAR_WIDTH;
+            statusbar.setPosition();
+            stripws.disable();
+            language.disable();
         }
 
         var model = page.$mdlRevisions;
@@ -1386,6 +1400,14 @@ module.exports = ext.register("ext/revisions/revisions", {
         this.panel.hide();
         ide.dispatchEvent("revisions.visibility", { visibility: "hidden" });
 
+        beautify.enable();
+        quicksearch.offsetWidth = quicksearch.defaultOffset;
+        quicksearch.updateBarPosition();
+        statusbar.offsetWidth = 0;
+        statusbar.setPosition();
+        stripws.enable();
+        language.enable();
+
         if (lstRevisions) {
             lstRevisions.selectList([]); // Unselect everything
         }

diff --git a/plugins-client/ext.statusbar/statusbar.js b/plugins-client/ext.statusbar/statusbar.js
@@ -120,15 +120,6 @@ module.exports = ext.register("ext/statusbar/statusbar", {
             _self.setPosition();
         });
 
-        ide.addEventListener("revisions.visibility", function(e) {
-            if (e.visibility === "shown")
-                _self.offsetWidth = e.width;
-            else
-                _self.offsetWidth = 0;
-
-            _self.setPosition();
-        });
-
         ide.addEventListener("init.ext/editors/editors", function(e){
             tabEditors.addEventListener("afterswitch", function(e){
                 var editor = e.nextPage.$editor;

diff --git a/plugins-client/ext.stripws/stripws.js b/plugins-client/ext.stripws/stripws.js
@@ -81,13 +81,6 @@ module.exports = ext.register("ext/stripws/stripws", {
                 self.stripws();
             }
         });
-
-        ide.addEventListener("revisions.visibility", function(e) {
-            if (e.visibility === "shown")
-                self.disable();
-            else
-                self.enable();
-        });
 
         ide.addEventListener("settings.load", function(){
             settings.setDefaults("editors/code", [