jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up 8dfbc5baa: Really don't select unselectable items
......................................................................
Follow-up 8dfbc5baa: Really don't select unselectable items
SelectWidget would refuse to select unselectable items on mousedown or
mousemove, but would happily do so on mouseup. This meant unselectable
items weren't actually unselectable.
This broke the link inspector: if you clicked on the text
"External link", for instance (a ui.MenuSectionItemWidget), that "item"
would be selected, the link target input would be cleared, if you exited
the link inspector in any way the link would be unlinked, and any new
link inspector you opened would have a completely non-functional dropdown.
Change-Id: I7faa3d23b51b9cb93e68414584b9f433ea1f656a
(cherry picked from commit 4721367b618a9c62f7cdc1385d02e94360606353)
---
M modules/ve/ui/widgets/ve.ui.SelectWidget.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ui/widgets/ve.ui.SelectWidget.js
b/modules/ve/ui/widgets/ve.ui.SelectWidget.js
index 38b5666..6098c2f 100644
--- a/modules/ve/ui/widgets/ve.ui.SelectWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.SelectWidget.js
@@ -109,9 +109,13 @@
* @param {jQuery.Event} e Mouse up event
*/
ve.ui.SelectWidget.prototype.onMouseUp = function ( e ) {
+ var item;
this.pressed = false;
if ( !this.selecting ) {
- this.selecting = this.getTargetItem( e );
+ item = this.getTargetItem( e );
+ if ( item && item.isSelectable() ) {
+ this.selecting = item;
+ }
}
if ( !this.disabled && e.which === 1 && this.selecting ) {
this.selectItem( this.selecting );
--
To view, visit https://gerrit.wikimedia.org/r/90370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7faa3d23b51b9cb93e68414584b9f433ea1f656a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.22wmf22
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
