jenkins-bot has submitted this change and it was merged.
Change subject: Avoid some TypeErrors in strict mode
......................................................................
Avoid some TypeErrors in strict mode
Change-Id: I8ebe7d486c2b43d8c96ce58116e5c38cf769fa79
---
M lib/resources/jquery.ui/jquery.ui.tagadata.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
8 files changed, 21 insertions(+), 28 deletions(-)
Approvals:
Henning Snater: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.ui/jquery.ui.tagadata.js
b/lib/resources/jquery.ui/jquery.ui.tagadata.js
index 084f579..c8d1f07 100644
--- a/lib/resources/jquery.ui/jquery.ui.tagadata.js
+++ b/lib/resources/jquery.ui/jquery.ui.tagadata.js
@@ -215,8 +215,9 @@
var $tag = $( this );
if( self._formatLabel( label ) === self._formatLabel(
self.getTagLabel( $tag ) ) ) {
result = $tag;
- return false;
}
+
+ return result === null;
} );
return result;
},
@@ -585,8 +586,9 @@
if( self._getTags( label ).length > 1 ) {
hasConflict = true;
- return false;
}
+
+ return hasConflict === false;
} );
return hasConflict;
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index a535865..65542bd 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -937,7 +937,7 @@
// Item might be about to be
removed not being a list item instance.
if( !snakview || !removeToolbar
) {
- return true;
+ return;
}
$snakview.data( 'removetoolbar'
).toolbar[parentView.option( 'disabled' )
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
index b754d0c..e227271 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
@@ -149,11 +149,8 @@
isValid = true;
listview.items().each( function() {
- var fingerprintview = lia.liInstance( $( this ) );
- if( !fingerprintview.isValid() ) {
- isValid = false;
- return false;
- }
+ isValid = lia.liInstance( $( this ) ).isValid();
+ return isValid === true;
} );
return isValid;
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 2cdd71e..97d9a3c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -919,7 +919,7 @@
if( !toolbar ) {
//
Continue if the movetoolbar is not present (the snakview is
//
pending).
- return
true;
+ return;
}
var
isOverallFirst = ( i === 0 && j === 0 ),
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
index 5ae6b8a..3723dba 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -537,7 +537,7 @@
var $sitelinkview = $( this );
if( $sitelinkview.data( 'removetoolbar' ) ) {
- return true;
+ return;
}
$sitelinkview.removetoolbar( {
@@ -572,7 +572,7 @@
removetoolbar = $sitelinkview.data(
'removetoolbar' );
if( !removetoolbar ) {
- return true;
+ return;
}
removetoolbar.toolbar[sitelinkgroupview.option(
'disabled' )
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index 1216e02..7244a31 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -270,11 +270,8 @@
isValid = true;
listview.items().each( function() {
- var sitelinkview = lia.liInstance( $( this ) );
- if( !sitelinkview.isValid() ) {
- isValid = false;
- return false;
- }
+ isValid = lia.liInstance( $( this ) ).isValid();
+ return isValid === true;
} );
return isValid;
@@ -506,12 +503,11 @@
lia = listview.listItemAdapter();
listview.items().each( function() {
- var sitelinkview = lia.liInstance( $( this ) );
- if( !sitelinkview.value() ) {
- // Ignore pending value.
- return true;
+ var sitelinkviewValue = lia.liInstance( $( this )
).value();
+ // Ignore pending value.
+ if( sitelinkviewValue ) {
+ value.push( sitelinkviewValue );
}
- value.push( sitelinkview.value() );
} );
return value;
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
index 64aa0ff..9f707cd 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
@@ -381,11 +381,8 @@
$.each( listview.items(), function( i, item ) {
var snakview = listview.listItemAdapter().liInstance(
$( item ) );
-
- if ( !snakview.isValid() || !snakview.snak() ) {
- isValid = false;
- return false;
- }
+ isValid = snakview.isValid() && snakview.snak();
+ return isValid === true;
} );
return isValid;
@@ -543,8 +540,9 @@
if( self._listview.listItemAdapter().liInstance(
$itemNode ).snak().equals( snak ) ) {
$snakview = $itemNode;
- return false;
}
+
+ return $snakview === null;
} );
return $snakview;
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
index 7f89e24..272bafc 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
@@ -311,8 +311,8 @@
$.each( wb.datamodel.Statement.RANK, function( rankId, i ) {
if( rank === i ) {
rankString = rankId.toLowerCase();
- return false;
}
+ return rankString === null;
} );
return rankString;
--
To view, visit https://gerrit.wikimedia.org/r/166978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ebe7d486c2b43d8c96ce58116e5c38cf769fa79
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <adrian.l...@wikimedia.de>
Gerrit-Reviewer: Adrian Lang <adrian.l...@wikimedia.de>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
