jenkins-bot has submitted this change and it was merged.
Change subject: Option parameter can be null/undefined in PHP
......................................................................
Option parameter can be null/undefined in PHP
The PHP code accepts null. No need to have a default value here.
This saves a tiny little bit bandwidth in the request string.
Change-Id: I144cbcb82a4e97fa3ef505ed5c0a1adefc0e1ff8
---
M src/RepoApi.js
M tests/RepoApi.tests.js
2 files changed, 13 insertions(+), 6 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, but someone else must approve
Addshore: Looks good to me, approved
Jeroen De Dauw: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/src/RepoApi.js b/src/RepoApi.js
index 9e29a50..9016eb1 100644
--- a/src/RepoApi.js
+++ b/src/RepoApi.js
@@ -115,7 +115,7 @@
* @see wikibase.api.RepoApi._post
*
* @param {Object} dataValue `DataValue` serialization.
- * @param {Object} [options={}]
+ * @param {Object} [options]
* @param {string} [dataType] `dataTypes.DataType` id.
* @param {string} [outputFormat]
* @return {Object} jQuery.Promise
@@ -139,9 +139,12 @@
var params = {
action: 'wbformatvalue',
- datavalue: JSON.stringify( dataValue ),
- options: JSON.stringify( options || {} )
+ datavalue: JSON.stringify( dataValue )
};
+
+ if( options ) {
+ params.options = JSON.stringify( options );
+ }
if( dataType ) {
params.datatype = dataType;
@@ -285,9 +288,13 @@
var params = {
action: 'wbparsevalue',
parser: parser,
- values: values.join( '|' ),
- options: JSON.stringify( options )
+ values: values.join( '|' )
};
+
+ if( options ) {
+ params.options = JSON.stringify( options );
+ }
+
return this._api.get( params );
},
diff --git a/tests/RepoApi.tests.js b/tests/RepoApi.tests.js
index c6ae686..f808e59 100644
--- a/tests/RepoApi.tests.js
+++ b/tests/RepoApi.tests.js
@@ -137,7 +137,7 @@
getParam( mock.spy, 'datavalue', 1 ),
JSON.stringify( { 'I am': 'DataValue serialization' } )
);
- assert.equal( getParam( mock.spy, 'options', 1 ), JSON.stringify( {} )
);
+ assert.equal( getParam( mock.spy, 'options', 1 ), undefined );
assert.strictEqual( getParam( mock.spy, 'datatype', 1 ), undefined );
assert.strictEqual( getParam( mock.spy, 'generate', 1 ), undefined );
} );
--
To view, visit https://gerrit.wikimedia.org/r/180185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I144cbcb82a4e97fa3ef505ed5c0a1adefc0e1ff8
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/WikibaseJavaScriptApi
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Henning Snater <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[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
