Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191587
Change subject: Separate out toolbar attachment in overridable method
......................................................................
Separate out toolbar attachment in overridable method
Also fix some docs in ve.ui.Toolbar.
Change-Id: I53f032e59dc64ac3286af26d3186af377bf46cb3
---
M src/init/ve.init.Target.js
M src/ui/ve.ui.Toolbar.js
2 files changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/87/191587/1
diff --git a/src/init/ve.init.Target.js b/src/init/ve.init.Target.js
index d68f7ba..b562ada 100644
--- a/src/init/ve.init.Target.js
+++ b/src/init/ve.init.Target.js
@@ -318,6 +318,13 @@
*/
ve.init.Target.prototype.setupToolbar = function ( surface ) {
this.getToolbar().setup( this.constructor.static.toolbarGroups, surface
);
- this.getToolbar().$element.insertBefore( surface.$element );
+ this.attachToolbar( surface );
this.getToolbar().$bar.append( surface.getToolbarDialogs().$element );
};
+
+/**
+ * Attach the toolbar to the DOM
+ */
+ve.init.Target.prototype.attachToolbar = function () {
+ this.getToolbar().$element.insertBefore(
this.getToolbar().getSurface().$element );
+};
diff --git a/src/ui/ve.ui.Toolbar.js b/src/ui/ve.ui.Toolbar.js
index 1e0320a..f48c770 100644
--- a/src/ui/ve.ui.Toolbar.js
+++ b/src/ui/ve.ui.Toolbar.js
@@ -60,7 +60,10 @@
/* Methods */
/**
- * inheritdoc
+ * Setup toolbar
+ *
+ * @param {Object} groups List of tool group configurations
+ * @param {ve.ui.Surface} [surface] Surface to attach to
*/
ve.ui.Toolbar.prototype.setup = function ( groups, surface ) {
this.detach();
@@ -79,7 +82,7 @@
};
/**
- * inheritdoc
+ * @inheritdoc
*/
ve.ui.Toolbar.prototype.isToolAvailable = function ( name ) {
if ( !ve.ui.Toolbar.super.prototype.isToolAvailable.apply( this,
arguments ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/191587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53f032e59dc64ac3286af26d3186af377bf46cb3
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
