jenkins-bot has submitted this change and it was merged.
Change subject: Restore selection after dialog close
......................................................................
Restore selection after dialog close
Change-Id: I534e38633700191782a7b088de0ae46a5f800fa8
---
M modules/ve/ce/ve.ce.Surface.js
M modules/ve/ui/ve.ui.Window.js
2 files changed, 12 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index 24ed81c..c5d7e08 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -247,6 +247,17 @@
this.$phantoms.remove();
};
+/**
+ * Give focus to the surface, preserving the previous selection.
+ *
+ * This is used when switching between surfaces, e.g. when closing a dialog
window.
+ */
+ve.ce.Surface.prototype.focus = function () {
+ this.documentView.getDocumentNode().$[0].focus();
+ this.focusedNode = null;
+ this.onChange( null, this.surface.getModel().selection );
+};
+
/*! Native Browser Events */
/**
diff --git a/modules/ve/ui/ve.ui.Window.js b/modules/ve/ui/ve.ui.Window.js
index 8317771..2fa5f29 100644
--- a/modules/ve/ui/ve.ui.Window.js
+++ b/modules/ve/ui/ve.ui.Window.js
@@ -332,7 +332,7 @@
this.onClose( action );
this.closing = false;
this.frame.$content.find( ':focus' ).blur();
-
this.surface.getView().getDocument().getDocumentNode().$.focus();
+ this.surface.getView().focus();
this.emit( 'close', action );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/69853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I534e38633700191782a7b088de0ae46a5f800fa8
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Inez <i...@wikia-inc.com>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
