jenkins-bot has submitted this change and it was merged.
Change subject: Follow up patch to address all comments
......................................................................
Follow up patch to address all comments
Change-Id: I6dac6f7b6a7a7651cdcb2696194448b7197cb232
---
M view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
M
view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
M view/resources/wikibase/view/ToolbarViewController.js
4 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
b/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
index 5ed7278..cac26f7 100644
--- a/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
+++ b/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
@@ -154,7 +154,8 @@
/**
* @return {Object} jQuery.Promise
- * No resolved parameters.
+ * Resolved parameters:
+ * - {*} [value] the data model object returned by save API call
* Rejected parameters:
* - {Error}
*/
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index a436dbb..4011157 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -315,9 +315,7 @@
if ( event.target === $listview[0] ) {
self._drawReferencesCounter();
}
- if ( event.type === 'listviewitemremoved' ) {
- self._trigger( 'change' );
- }
+ self._trigger( 'change' );
} )
.on( lia.prefixedEvent( 'change.' + this.widgetName ),
function( event ) {
@@ -786,7 +784,7 @@
return false;
}
- if ( this._referencesListview && this._hasInvalidReferences() )
{
+ if ( this._hasInvalidReferences() ) {
return false;
}
@@ -810,10 +808,15 @@
*/
_hasInvalidReferences: function() {
var isInvalid = false;
+
+ if ( !this._referencesListview ) {
+ return isInvalid;
+ }
+
$.each( this._referencesListview.value(), function ( key,
referenceView ) {
if ( !referenceView.isValid() ) {
isInvalid = true;
- return;
+ return false;
}
} );
diff --git
a/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
index d0b0041..58efb10 100644
---
a/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
+++
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
@@ -16,7 +16,6 @@
events: {
referenceviewafterstartediting: function( event ) {
var $referenceview = $( event.target ),
- referenceview = $referenceview.data(
'referenceview' ),
options = {},
$container = $( '<div/>' ).appendTo(
$referenceview.find(
'.wikibase-referenceview-heading' )
@@ -31,9 +30,6 @@
statementview._referencesListview.removeItem(
$referenceview );
}
- if ( ( !referenceview.options.statementGuid ||
!referenceview.value() ) && !statementview.isInEditMode() ) {
- options.label = mw.msg( 'wikibase-cancel' );
- }
$referenceview.removetoolbar( options )
.on( 'removetoolbarremove.removetoolbar', function(
event ) {
if ( event.target === $referenceview[0] ) {
diff --git a/view/resources/wikibase/view/ToolbarViewController.js
b/view/resources/wikibase/view/ToolbarViewController.js
index 28b7cc1..26a6165 100644
--- a/view/resources/wikibase/view/ToolbarViewController.js
+++ b/view/resources/wikibase/view/ToolbarViewController.js
@@ -82,7 +82,7 @@
/**
* Stop editing
*
- * @param {boolean} dropValue Whether the current value should be kept and
+ * @param {boolean} [dropValue=false] Whether the current value should be kept
and
* persisted or dropped
*/
SELF.prototype.stopEditing = function( dropValue ) {
@@ -155,7 +155,7 @@
/**
* Set or clear error
*
- * @param {mixed|undefined} [error] The error or undefined, if error should be
+ * @param {mixed} [error] The error or undefined, if error should be
* cleared
*/
SELF.prototype.setError = function( error ) {
--
To view, visit https://gerrit.wikimedia.org/r/252673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6dac6f7b6a7a7651cdcb2696194448b7197cb232
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
