Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92996
Change subject: Get rid of OO.ui.extendObject and OO.ui.indexOf
......................................................................
Get rid of OO.ui.extendObject and OO.ui.indexOf
Replaced uses of extendObject with $.extend . Replaced the one use of
OO.ui.indexOf with Array.prototype.indexOf because that's what
everything else was already using.
Change-Id: I63f40989057b8065ec977efafbf68d6e22c8e679
---
M modules/oojs-ui/OO.ui.Toolbar.js
M modules/oojs-ui/OO.ui.Widget.js
M modules/oojs-ui/OO.ui.js
M modules/oojs-ui/elements/OO.ui.PopuppableElement.js
M modules/oojs-ui/layouts/OO.ui.StackPanelLayout.js
M modules/oojs-ui/toolgroups/OO.ui.PopupToolGroup.js
M modules/oojs-ui/widgets/OO.ui.ButtonWidget.js
M modules/oojs-ui/widgets/OO.ui.InputLabelWidget.js
M modules/oojs-ui/widgets/OO.ui.InputWidget.js
M modules/oojs-ui/widgets/OO.ui.MenuItemWidget.js
M modules/oojs-ui/widgets/OO.ui.SelectWidget.js
11 files changed, 11 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/96/92996/1
diff --git a/modules/oojs-ui/OO.ui.Toolbar.js b/modules/oojs-ui/OO.ui.Toolbar.js
index 44f61f4..b1110b5 100644
--- a/modules/oojs-ui/OO.ui.Toolbar.js
+++ b/modules/oojs-ui/OO.ui.Toolbar.js
@@ -141,7 +141,7 @@
}
type = constructors[group.type] ? group.type : defaultType;
items.push(
- new constructors[type]( this, OO.ui.extendObject( {
'$$': this.$$ }, group ) )
+ new constructors[type]( this, $.extend( { '$$': this.$$
}, group ) )
);
}
this.addItems( items );
diff --git a/modules/oojs-ui/OO.ui.Widget.js b/modules/oojs-ui/OO.ui.Widget.js
index b057ed6..76a199c 100644
--- a/modules/oojs-ui/OO.ui.Widget.js
+++ b/modules/oojs-ui/OO.ui.Widget.js
@@ -19,7 +19,7 @@
*/
OO.ui.Widget = function OoUiWidget( config ) {
// Initialize config
- config = OO.ui.extendObject( { 'disabled': false }, config );
+ config = $.extend( { 'disabled': false }, config );
// Parent constructor
OO.ui.Element.call( this, config );
diff --git a/modules/oojs-ui/OO.ui.js b/modules/oojs-ui/OO.ui.js
index a291c89..1633281 100644
--- a/modules/oojs-ui/OO.ui.js
+++ b/modules/oojs-ui/OO.ui.js
@@ -15,10 +15,6 @@
OO.ui.bind = $.proxy;
-OO.ui.extendObject = $.extend;
-
-OO.ui.indexOf = $.inArray;
-
OO.ui.getUserLanguages = function () {
return [ 'en' ];
};
diff --git a/modules/oojs-ui/elements/OO.ui.PopuppableElement.js
b/modules/oojs-ui/elements/OO.ui.PopuppableElement.js
index 7539256..e4bc3e9 100644
--- a/modules/oojs-ui/elements/OO.ui.PopuppableElement.js
+++ b/modules/oojs-ui/elements/OO.ui.PopuppableElement.js
@@ -19,10 +19,10 @@
*/
OO.ui.PopuppableElement = function OoUiPopuppableElement( config ) {
// Configuration initialization
- config = OO.ui.extendObject( { 'popupWidth': 320 }, config );
+ config = $.extend( { 'popupWidth': 320 }, config );
// Properties
- this.popup = new OO.ui.PopupWidget( OO.ui.extendObject(
+ this.popup = new OO.ui.PopupWidget( $.extend(
{ 'align': 'center', 'autoClose': true },
config.popup,
{ '$$': this.$$, '$autoCloseIgnore': this.$ }
diff --git a/modules/oojs-ui/layouts/OO.ui.StackPanelLayout.js
b/modules/oojs-ui/layouts/OO.ui.StackPanelLayout.js
index 3223751..374bdec 100644
--- a/modules/oojs-ui/layouts/OO.ui.StackPanelLayout.js
+++ b/modules/oojs-ui/layouts/OO.ui.StackPanelLayout.js
@@ -18,7 +18,7 @@
*/
OO.ui.StackPanelLayout = function OoUiStackPanelLayout( config ) {
// Config initialization
- config = OO.ui.extendObject( { 'scrollable': true }, config );
+ config = $.extend( { 'scrollable': true }, config );
// Parent constructor
OO.ui.PanelLayout.call( this, config );
diff --git a/modules/oojs-ui/toolgroups/OO.ui.PopupToolGroup.js
b/modules/oojs-ui/toolgroups/OO.ui.PopupToolGroup.js
index 121848c..8106244 100644
--- a/modules/oojs-ui/toolgroups/OO.ui.PopupToolGroup.js
+++ b/modules/oojs-ui/toolgroups/OO.ui.PopupToolGroup.js
@@ -21,7 +21,7 @@
*/
OO.ui.PopupToolGroup = function OoUiPopupToolGroup( toolbar, config ) {
// Configuration initialization
- config = OO.ui.extendObject( { 'icon': 'down' }, config );
+ config = $.extend( { 'icon': 'down' }, config );
// Parent constructor
OO.ui.ToolGroup.call( this, toolbar, config );
diff --git a/modules/oojs-ui/widgets/OO.ui.ButtonWidget.js
b/modules/oojs-ui/widgets/OO.ui.ButtonWidget.js
index a9a4ee2..c59594c 100644
--- a/modules/oojs-ui/widgets/OO.ui.ButtonWidget.js
+++ b/modules/oojs-ui/widgets/OO.ui.ButtonWidget.js
@@ -23,7 +23,7 @@
*/
OO.ui.ButtonWidget = function OoUiButtonWidget( config ) {
// Configuration initialization
- config = OO.ui.extendObject( { 'target': '_blank' }, config );
+ config = $.extend( { 'target': '_blank' }, config );
// Parent constructor
OO.ui.Widget.call( this, config );
diff --git a/modules/oojs-ui/widgets/OO.ui.InputLabelWidget.js
b/modules/oojs-ui/widgets/OO.ui.InputLabelWidget.js
index 7e825f9..132ffba 100644
--- a/modules/oojs-ui/widgets/OO.ui.InputLabelWidget.js
+++ b/modules/oojs-ui/widgets/OO.ui.InputLabelWidget.js
@@ -20,7 +20,7 @@
*/
OO.ui.InputLabelWidget = function OoUiInputLabelWidget( config ) {
// Config intialization
- config = OO.ui.extendObject( { 'input': null }, config );
+ config = $.extend( { 'input': null }, config );
// Parent constructor
OO.ui.Widget.call( this, config );
diff --git a/modules/oojs-ui/widgets/OO.ui.InputWidget.js
b/modules/oojs-ui/widgets/OO.ui.InputWidget.js
index 52bd90e..387684f 100644
--- a/modules/oojs-ui/widgets/OO.ui.InputWidget.js
+++ b/modules/oojs-ui/widgets/OO.ui.InputWidget.js
@@ -20,7 +20,7 @@
*/
OO.ui.InputWidget = function OoUiInputWidget( config ) {
// Config intialization
- config = OO.ui.extendObject( { 'readOnly': false }, config );
+ config = $.extend( { 'readOnly': false }, config );
// Parent constructor
OO.ui.Widget.call( this, config );
diff --git a/modules/oojs-ui/widgets/OO.ui.MenuItemWidget.js
b/modules/oojs-ui/widgets/OO.ui.MenuItemWidget.js
index 6a51d38..9f57ff2 100644
--- a/modules/oojs-ui/widgets/OO.ui.MenuItemWidget.js
+++ b/modules/oojs-ui/widgets/OO.ui.MenuItemWidget.js
@@ -17,7 +17,7 @@
*/
OO.ui.MenuItemWidget = function OoUiMenuItemWidget( data, config ) {
// Configuration initialization
- config = OO.ui.extendObject( { 'icon': 'check' }, config );
+ config = $.extend( { 'icon': 'check' }, config );
// Parent constructor
OO.ui.OptionWidget.call( this, data, config );
diff --git a/modules/oojs-ui/widgets/OO.ui.SelectWidget.js
b/modules/oojs-ui/widgets/OO.ui.SelectWidget.js
index 06852f9..3c18ed1 100644
--- a/modules/oojs-ui/widgets/OO.ui.SelectWidget.js
+++ b/modules/oojs-ui/widgets/OO.ui.SelectWidget.js
@@ -317,7 +317,7 @@
var inc = direction > 0 ? 1 : -1,
len = this.items.length,
index = item instanceof OO.ui.OptionWidget ?
- OO.ui.indexOf( item, this.items ) : ( inc > 0 ? -1 : 0
),
+ this.items.indexOf( item ) : ( inc > 0 ? -1 : 0 ),
stopAt = Math.max( Math.min( index, len - 1 ), 0 ),
i = inc > 0 ?
// Default to 0 instead of -1, if nothing is selected
let's start at the beginning
--
To view, visit https://gerrit.wikimedia.org/r/92996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63f40989057b8065ec977efafbf68d6e22c8e679
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
