From 97e00a35dddbdf68142b4eafef763952fc927f6e Mon Sep 17 00:00:00 2001 From: Mateusz Uzdowski <mateusz@silverstripe.com> Date: Fri, 11 May 2012 17:36:18 +1200 Subject: [PATCH] BUGFIX: add missing onunmatches causing exceptions in entwine --- admin/javascript/LeftAndMain.Content.js | 8 +++++++- admin/javascript/LeftAndMain.EditForm.js | 5 ++++- admin/javascript/LeftAndMain.Tree.js | 3 +++ admin/javascript/LeftAndMain.js | 3 +++ javascript/TabSet.js | 5 ++++- 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/admin/javascript/LeftAndMain.Content.js b/admin/javascript/LeftAndMain.Content.js index 0a102ced0..fcbcbc242 100644 --- a/admin/javascript/LeftAndMain.Content.js +++ b/admin/javascript/LeftAndMain.Content.js @@ -18,6 +18,9 @@ this._super(); }, + onunmatch: function() { + this._super(); + }, redraw: function() { // Force initialization of tabsets to avoid layout glitches @@ -228,6 +231,9 @@ self.removeForm(); } }); + }, + onunmatch: function() { + this._super(); } }); @@ -237,8 +243,8 @@ this._super(); }, onunmatch: function() { - this._super(); this.find('.cms-content-loading-overlay,.cms-content-loading-spinner').remove(); + this._super(); } }); }); diff --git a/admin/javascript/LeftAndMain.EditForm.js b/admin/javascript/LeftAndMain.EditForm.js index 61b6a22eb..a6ddc9c4f 100644 --- a/admin/javascript/LeftAndMain.EditForm.js +++ b/admin/javascript/LeftAndMain.EditForm.js @@ -107,6 +107,9 @@ this._super(); }, + onunmatch: function() { + this._super(); + }, redraw: function() { // Force initialization of tabsets to avoid layout glitches @@ -211,4 +214,4 @@ }); -}(jQuery)); \ No newline at end of file +}(jQuery)); diff --git a/admin/javascript/LeftAndMain.Tree.js b/admin/javascript/LeftAndMain.Tree.js index 96a07887d..619fa2312 100644 --- a/admin/javascript/LeftAndMain.Tree.js +++ b/admin/javascript/LeftAndMain.Tree.js @@ -100,6 +100,9 @@ self._onLoadNewPage(e, data); }); }, + onunmatch: function() { + this._super(); + }, getTreeConfig: function() { var self = this; diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index 579c55a39..6b9d71ad1 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -637,6 +637,9 @@ jQuery.noConflict(); this.redrawTabs(); this._super(); }, + onunmatch: function() { + this._super(); + }, redrawTabs: function() { this.rewriteHashlinks(); diff --git a/javascript/TabSet.js b/javascript/TabSet.js index 291cf7556..fad57a8cf 100644 --- a/javascript/TabSet.js +++ b/javascript/TabSet.js @@ -9,6 +9,9 @@ this.redrawTabs(); this._super(); }, + onunmatch: function() { + this._super(); + }, redrawTabs: function() { this.rewriteHashlinks(); @@ -29,4 +32,4 @@ } }); }); -})(jQuery); \ No newline at end of file +})(jQuery);