[MediaWiki-commits] [Gerrit] Ensure we use our references to certain native or upstream m... - change (mediawiki...VisualEditor)

2014-02-20 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/114620

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/20/114620/1

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,

[MediaWiki-commits] [Gerrit] Ensure we use our references to certain native or upstream m... - change (mediawiki...VisualEditor)

2014-02-20 Thread jenkins-bot (Code Review) 
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,