jenkins-bot has submitted this change and it was merged.
Change subject: Ensure we use our references to certain native or upstream
methods
......................................................................
Ensure we use our references to certain native or upstream methods
Checked:
ve.cloneObject (oo|OO).cloneObject
ve.getObjectValues (oo|OO).getObjectValues
ve.getObjectKeys Object.keys
ve.compare (oo|OO).compare
ve.copy (oo|OO).copy
ve.isPlainObject ($|jQuery).isPlainObject
ve.isEmptyObject ($|jQuery).isEmptyObject
ve.isArray Array.isArray
ve.bind ($|jQuery).proxy
ve.indexOf ($|jQuery).inArray
ve.extendObject ($|jQuery).extend
Fixed:
* ve.dm.MWBlockImageNode.js (added in Iebb2081de)
* ve.dm.MWInlineImageNode.js (aded in I62ec12a6b)
* ve.dm.MWConverter.test.js (added in I90273786a)
* ve.ui.MWMediaInsertDialog.js (added in Ia5ad9a8c0)
* ve.dm.MWTemplateSpecModel.js (added in Ic3eb66538)
* ve.init.mw.MobileViewTarget.js
* ve.init.mw.ViewPageTarget.js
* ve.init.mw.Target.js
Skipped:
* ve.init.mw.ViewPageTarget.init.js
- Feature test (which is for the very references from ve.js
being ensured in this commit).
- Misc code using $.inArray (can't use ve.js yet since that
isn't loaded yet there).
Change-Id: I73ae005d3692e871fdcaea938641558c0b98ec69
---
M modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
M modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
M modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/test/dm/ve.dm.MWConverter.test.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
8 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
b/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
index 365ffaa..621e800 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
@@ -51,7 +51,7 @@
if ( data.description !== null ) {
this.description = data.description;
}
- if ( Array.isArray( data.paramOrder ) ) {
+ if ( ve.isArray( data.paramOrder ) ) {
this.paramOrder = data.paramOrder.slice();
}
if ( ve.isPlainObject( data.params ) ) {
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
index 5fc6807..22057e5 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
@@ -56,7 +56,7 @@
ve.dm.MWBlockImageNode.static.blacklistedAnnotationTypes = [ 'link' ];
ve.dm.MWBlockImageNode.static.getMatchRdfaTypes = function () {
- return Object.keys( this.rdfaToType );
+ return ve.getObjectKeys( this.rdfaToType );
};
ve.dm.MWBlockImageNode.static.toDataElement = function ( domElements,
converter ) {
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
index a9b5d3d..0af7295 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
@@ -52,7 +52,7 @@
ve.dm.MWInlineImageNode.static.blacklistedAnnotationTypes = [ 'link' ];
ve.dm.MWInlineImageNode.static.getMatchRdfaTypes = function () {
- return Object.keys( this.rdfaToType );
+ return ve.getObjectKeys( this.rdfaToType );
};
ve.dm.MWInlineImageNode.static.toDataElement = function ( domElements,
converter ) {
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
index 8010d3a..6d75f7e 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileViewTarget.js
@@ -39,7 +39,7 @@
OO.inheritClass( ve.init.mw.MobileViewTarget, ve.init.mw.Target );
/* Static Properties */
-$.extend( ve.init.mw.Target.static.iconModuleStyles, {
+ve.extendObject( ve.init.mw.Target.static.iconModuleStyles, {
'raster': [],
'vector': []
} );
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 01572c4..627eabc 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -837,7 +837,7 @@
fields[$this.prop( 'name' )] = $this.val();
}
} );
- $.extend( fields, {
+ ve.extendObject( fields, {
'wpSummary': this.saveDialog ?
this.saveDialog.editSummaryInput.getValue() : this.initialEditSummary,
'wpCaptchaId': this.captcha && this.captcha.id,
'wpCaptchaWord': this.captcha && this.captcha.input.getValue()
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 0324958..3b68736 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -946,7 +946,7 @@
*/
ve.init.mw.Target.prototype.tryWithPreparedCacheKey = function ( doc, options,
eventName ) {
var data, preparedCacheKey = this.getPreparedCacheKey( doc ), target =
this;
- data = $.extend( {}, options, { 'format': 'json' } );
+ data = ve.extendObject( {}, options, { 'format': 'json' } );
function ajaxRequest( cachekey ) {
var start = ve.now();
@@ -1014,7 +1014,7 @@
return false;
}
- data = $.extend( {}, options, {
+ data = ve.extendObject( {}, options, {
'action': 'visualeditoredit',
'page': this.pageName,
'oldid': this.revid,
@@ -1075,7 +1075,7 @@
this.submitting = true;
var key,
$form = $( '<form method="post" enctype="multipart/form-data"
style="display: none;"></form>' ),
- params = $.extend( {
+ params = ve.extendObject( {
'format': 'text/x-wiki',
'model': 'wikitext',
'oldid': this.revid,
diff --git a/modules/ve-mw/test/dm/ve.dm.MWConverter.test.js
b/modules/ve-mw/test/dm/ve.dm.MWConverter.test.js
index c16aaf7..208a5b6 100644
--- a/modules/ve-mw/test/dm/ve.dm.MWConverter.test.js
+++ b/modules/ve-mw/test/dm/ve.dm.MWConverter.test.js
@@ -48,7 +48,7 @@
originalConfig,
cases = ve.dm.mwExample.domToDataCases;
- QUnit.expect( 2 * Object.keys( cases ).length );
+ QUnit.expect( 2 * ve.getObjectKeys( cases ).length );
for ( msg in cases ) {
caseItem = ve.copy( cases[msg] );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
index 2794d80..dcdaf07 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
@@ -128,7 +128,7 @@
// We will only ask for the ajax call if this.sources
// isn't already set up
- if ( $.isEmptyObject( this.sources ) ) {
+ if ( ve.isEmptyObject( this.sources ) ) {
// Take sources from
api.php?action=query&meta=filerepoinfo&format=jsonfm
// The decision whether to take 'url' or 'apiurl' per each
repository is made
// in the MWMediaSearchWidget depending on whether it is local
and has apiurl
--
To view, visit https://gerrit.wikimedia.org/r/114620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73ae005d3692e871fdcaea938641558c0b98ec69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
