jenkins-bot has submitted this change and it was merged.
Change subject: Switch to using surface model focus/blur events
......................................................................
Switch to using surface model focus/blur events
Depends on Ibcda9a79 in core.
Change-Id: Ieb2f99d7d1d24c24a0f00cf7c33e23b8206bf753
---
M modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
1 file changed, 19 insertions(+), 11 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
index dcc510f..b839d52 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
@@ -78,24 +78,32 @@
// Parent method
ve.init.mw.MobileArticleTarget.super.prototype.onSurfaceReady.apply(
this, arguments );
- this.getSurface().getModel().connect( this, { select: 'onSurfaceSelect'
} );
- this.onSurfaceSelect();
+ var surfaceModel = this.getSurface().getModel();
+ surfaceModel.connect( this, {
+ blur: 'onSurfaceBlur',
+ focus: 'onSurfaceFocus'
+ } );
+ this[surfaceModel.getSelection().isNull() ? 'onSurfaceBlur' :
'onSurfaceFocus']();
this.events.trackActivationComplete();
};
/**
- * Handle surface select events
+ * Handle surface blur events
*/
-ve.init.mw.MobileArticleTarget.prototype.onSurfaceSelect = function () {
+ve.init.mw.MobileArticleTarget.prototype.onSurfaceBlur = function () {
var toolbar = this.getToolbar();
- if ( this.getSurface().getModel().getSelection().isNull() ) {
- toolbar.$group.addClass( 'oo-ui-element-hidden' );
- toolbar.$actions.removeClass( 'oo-ui-element-hidden' );
- } else {
- toolbar.$group.removeClass( 'oo-ui-element-hidden' );
- toolbar.$actions.addClass( 'oo-ui-element-hidden' );
- }
+ toolbar.$group.addClass( 'oo-ui-element-hidden' );
+ toolbar.$actions.removeClass( 'oo-ui-element-hidden' );
+};
+
+/**
+ * Handle surface focus events
+ */
+ve.init.mw.MobileArticleTarget.prototype.onSurfaceFocus = function () {
+ var toolbar = this.getToolbar();
+ toolbar.$group.removeClass( 'oo-ui-element-hidden' );
+ toolbar.$actions.addClass( 'oo-ui-element-hidden' );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/230085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb2f99d7d1d24c24a0f00cf7c33e23b8206bf753
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
