Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/120770
Change subject: Revert "Make entityselector always trigger aftersetentity event"
......................................................................
Revert "Make entityselector always trigger aftersetentity event"
This causes an issue described in bug 63057
This reverts commit 0a72344df1ad443d5af16bb1d8232e24396186cc.
Change-Id: If1efe37c3be59ea5ab693770589e54b03c41b177
---
M lib/resources/experts/EntityIdInput.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/70/120770/1
diff --git a/lib/resources/experts/EntityIdInput.js
b/lib/resources/experts/EntityIdInput.js
index 8995dbc..187f52e 100644
--- a/lib/resources/experts/EntityIdInput.js
+++ b/lib/resources/experts/EntityIdInput.js
@@ -63,7 +63,7 @@
}
)
.on(
- 'eachchange entityselectoraftersetentity',
+ 'eachchange entityselectorselect
entityselectoraftersetentity',
function( e ) {
// Entity selector's value is actual
value after change.
self._actualValue = false;
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index 1248d9e..c843948 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -683,7 +683,6 @@
url: entity.url
};
}
- this._trigger( 'aftersetentity', 0, [ entity ?
entity.id : null ] );
},
/**
@@ -709,6 +708,8 @@
self._setEntity( entity );
self.element.val( label );
+
+ self._trigger( 'aftersetentity', 0, [ entity ?
entity.id : null ] );
};
if ( entity === undefined ) {
--
To view, visit https://gerrit.wikimedia.org/r/120770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1efe37c3be59ea5ab693770589e54b03c41b177
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
