Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186761
Change subject: snaktypeselector: Remove NativeEventHandler
......................................................................
snaktypeselector: Remove NativeEventHandler
Removed unused concept of NativeEventHandler. There is no (and there should be
no) need for
an event being triggered before changing the snak type.
Change-Id: I6c4dfc7761e9c0d3cbaf43c859c4c752264c2985
---
M lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
M lib/resources/jquery.wikibase/snakview/snakview.js
2 files changed, 15 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/61/186761/1
diff --git
a/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
b/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
index 1df67eb..95125a3 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
@@ -24,16 +24,10 @@
*
* @since 0.4
*
- * @event change Triggered before the snak type changes
- * (1) {jQuery.Event}
- * (2) {string|null} The new Snak type or null if emptied
- *
- * @event afterchange Triggered after the snak type got changed
+ * @event change Triggered when the snak type changed.
* (1) {jQuery.Event}
*/
$.widget( 'wikibase.SnakTypeSelector', PARENT, {
- widgetName: 'wikibase-snaktypeselector',
-
/**
* Icon node.
* @type {jQuery}
@@ -216,27 +210,20 @@
*
* @param {string|null} snakType
*/
- _setSnakType: $.NativeEventHandler( 'change', {
- initially: function( event, snakType ) {
- if( this.snakType() === snakType ) {
- event.cancel(); // same type selected
already, no change
- }
- },
- natively: function( event, snakType ) {
- var $menu = this._menu.element;
-
- // take active status from currently active
Snak type list item:
- $menu.children( '.ui-state-active'
).removeClass( 'ui-state-active' );
-
- if( snakType !== null ) {
- // set list item of new type active:
- $menu.children( '.' +
this.widgetBaseClass + '-menuitem-' + snakType )
- .addClass( 'ui-state-active' );
- }
-
- this._trigger( 'afterchange' );
+ _setSnakType: function( snakType ) {
+ if( this.snakType() === snakType ) {
+ return;
}
- } ),
+
+ this._menu.element.children( '.ui-state-active'
).removeClass( 'ui-state-active' );
+
+ if( snakType !== null ) {
+ this._menu.element.children( '.' +
this.widgetBaseClass + '-menuitem-' + snakType )
+ .addClass( 'ui-state-active' );
+ }
+
+ this._trigger( 'change' );
+ },
/**
* Positions the menu.
diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js
b/lib/resources/jquery.wikibase/snakview/snakview.js
index fc3277f..6aec8d6 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -894,7 +894,7 @@
// ...add the data information nevertheless:
$anchor.data( 'snaktypeselector', selector );
- var changeEvent = ( selector.widgetEventPrefix + 'afterchange'
).toLowerCase();
+ var changeEvent = ( selector.widgetEventPrefix + 'change'
).toLowerCase();
// bind user interaction on selector to snakview's state:
$anchor.on( changeEvent + '.' + this.widgetName, function(
event ) {
--
To view, visit https://gerrit.wikimedia.org/r/186761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c4dfc7761e9c0d3cbaf43c859c4c752264c2985
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
