jenkins-bot has submitted this change and it was merged.
Change subject: Add getter for toolbarDialogs in ve.ui.Surface
......................................................................
Add getter for toolbarDialogs in ve.ui.Surface
We already have getDialogs(), and ve.ui.Context has getInspectors()
Change-Id: Ifb096b4f580bfbf58df459c24fe48b85730293d4
---
M src/init/ve.init.Target.js
M src/ui/actions/ve.ui.WindowAction.js
M src/ui/ve.ui.Surface.js
M src/ui/ve.ui.Toolbar.js
4 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/init/ve.init.Target.js b/src/init/ve.init.Target.js
index b09d439..9179236 100644
--- a/src/init/ve.init.Target.js
+++ b/src/init/ve.init.Target.js
@@ -306,5 +306,5 @@
ve.init.Target.prototype.setupToolbar = function ( surface ) {
this.getToolbar().setup( this.constructor.static.toolbarGroups, surface
);
this.getToolbar().$element.insertBefore( surface.$element );
- this.getToolbar().$bar.append( surface.toolbarDialogs.$element );
+ this.getToolbar().$bar.append( surface.getToolbarDialogs().$element );
};
diff --git a/src/ui/actions/ve.ui.WindowAction.js
b/src/ui/actions/ve.ui.WindowAction.js
index 17402d0..c680470 100644
--- a/src/ui/actions/ve.ui.WindowAction.js
+++ b/src/ui/actions/ve.ui.WindowAction.js
@@ -158,7 +158,7 @@
case 'inspector':
return this.surface.getContext().getInspectors();
case 'toolbar':
- return this.surface.toolbarDialogs;
+ return this.surface.getToolbarDialogs();
case 'dialog':
return this.surface.getDialogs();
}
diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js
index 697e55a..cfd4e0e 100644
--- a/src/ui/ve.ui.Surface.js
+++ b/src/ui/ve.ui.Surface.js
@@ -238,6 +238,14 @@
};
/**
+ * Get toolbar dialogs window set.
+ * @returns {ve.ui.WindowManager} Toolbar dialogs window set
+ */
+ve.ui.Surface.prototype.getToolbarDialogs = function () {
+ return this.toolbarDialogs;
+};
+
+/**
* Get the local overlay.
*
* Local overlays are attached to the same frame as the surface.
diff --git a/src/ui/ve.ui.Toolbar.js b/src/ui/ve.ui.Toolbar.js
index ccd8c1f..3a853b2 100644
--- a/src/ui/ve.ui.Toolbar.js
+++ b/src/ui/ve.ui.Toolbar.js
@@ -72,7 +72,7 @@
// Events
this.getSurface().getModel().connect( this, { contextChange:
'onContextChange' } );
- this.getSurface().toolbarDialogs.connect( this, {
+ this.getSurface().getToolbarDialogs().connect( this, {
opening: 'onToolbarWindowOpeningOrClosing',
closing: 'onToolbarWindowOpeningOrClosing'
} );
@@ -291,8 +291,8 @@
}
if ( this.getSurface() ) {
this.getSurface().getModel().disconnect( this );
- this.getSurface().toolbarDialogs.disconnect( this );
- this.getSurface().toolbarDialogs.clearWindows();
+ this.getSurface().getToolbarDialogs().disconnect( this );
+ this.getSurface().getToolbarDialogs().clearWindows();
this.surface = null;
}
};
--
To view, visit https://gerrit.wikimedia.org/r/179390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb096b4f580bfbf58df459c24fe48b85730293d4
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
