Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92779
Change subject: Add reset method to toolbar
......................................................................
Add reset method to toolbar
Make toolbar resetting code reusable.
Change-Id: I4e796309fc721622c313f6ec5121b4d011c25c51
---
M modules/oojs-ui/OO.ui.Toolbar.js
1 file changed, 16 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/79/92779/1
diff --git a/modules/oojs-ui/OO.ui.Toolbar.js b/modules/oojs-ui/OO.ui.Toolbar.js
index 91c6e65..44f61f4 100644
--- a/modules/oojs-ui/OO.ui.Toolbar.js
+++ b/modules/oojs-ui/OO.ui.Toolbar.js
@@ -125,10 +125,7 @@
};
// Cleanup previous groups
- for ( i = 0, len = this.items.length; i < len; i++ ) {
- this.items[i].destroy();
- }
- this.clearItems();
+ this.reset();
// Build out new groups
for ( i = 0, len = groups.length; i < len; i++ ) {
@@ -151,17 +148,26 @@
};
/**
+ * Remove all tools and groups from the toolbar.
+ */
+OO.ui.Toolbar.prototype.reset = function () {
+ var i, len;
+
+ this.groups = [];
+ this.tools = {};
+ for ( i = 0, len = this.items.length; i < len; i++ ) {
+ this.items[i].destroy();
+ }
+ this.clearItems();
+};
+
+/**
* Destroys toolbar, removing event handlers and DOM elements.
*
* Call this whenever you are done using a toolbar.
*/
OO.ui.Toolbar.prototype.destroy = function () {
- var i, len;
-
- for ( i = 0, len = this.items.length; i < len; i++ ) {
- this.items[i].destroy();
- }
- this.clearItems();
+ this.reset();
this.$.remove();
};
--
To view, visit https://gerrit.wikimedia.org/r/92779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e796309fc721622c313f6ec5121b4d011c25c51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
