diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js index b279376592..b4adf40fd1 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js @@ -17,7 +17,7 @@ */ ve.ui.MWBetaWelcomeDialog = function VeUiMWBetaWelcomeDialog( surface, config ) { // Configuration initialization - config = ve.extendObject( {}, config, { 'small': true, 'footless': false } ); + config = ve.extendObject( { 'small': true, 'footless': false }, config ); // Parent constructor ve.ui.MWDialog.call( this, surface, config ); diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js index c0155810f7..ef5053726f 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js @@ -17,7 +17,7 @@ */ ve.ui.MWMediaInsertDialog = function VeUiMWMediaInsertDialog( surface, config ) { // Configuration initialization - config = ve.extendObject( {}, config, { 'footless': true } ); + config = ve.extendObject( { 'footless': true }, config ); // Parent constructor ve.ui.MWDialog.call( this, surface, config ); diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js index f4d45eb2a8..9185995d4f 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js @@ -21,7 +21,7 @@ */ ve.ui.MWTransclusionDialog = function VeUiMWTransclusionDialog( surface, config ) { // Configuration initialization - config = ve.extendObject( {}, config, { + config = ve.extendObject( { 'editable': true, 'adders': [ { @@ -35,7 +35,7 @@ ve.ui.MWTransclusionDialog = function VeUiMWTransclusionDialog( surface, config 'title': ve.msg( 'visualeditor-dialog-transclusion-add-content' ) } ] - } ); + }, config ); // Parent constructor ve.ui.MWDialog.call( this, surface, config ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js index bd10559fd4..b61f1e16e9 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js @@ -16,7 +16,7 @@ */ ve.ui.MWCategoryPopupWidget = function VeUiMWCategoryPopupWidget ( config ) { // Configuration initialization - config = ve.extendObject( {}, config, { 'autoClose': true } ); + config = ve.extendObject( { 'autoClose': true }, config ); // Parent constructor ve.ui.PopupWidget.call( this, config ); @@ -56,11 +56,6 @@ ve.ui.MWCategoryPopupWidget = function VeUiMWCategoryPopupWidget ( config ) { config.$overlay.append( this.$ ); }; -/** - * @private - * @cfg {boolean} [autoClose=true] Overridden in this subclass - */ - /* Inheritance */ ve.inheritClass( ve.ui.MWCategoryPopupWidget, ve.ui.PopupWidget ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js index 990f848312..c7f1f0ece1 100755 --- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js @@ -19,10 +19,10 @@ */ ve.ui.MWMediaSearchWidget = function VeUiMWMediaSearchWidget( config ) { // Configuration intialization - config = ve.extendObject( {}, config, { + config = ve.extendObject( { 'placeholder': ve.msg( 'visualeditor-media-input-placeholder' ), 'value': mw.config.get( 'wgTitle' ) - } ); + }, config ); // Parent constructor ve.ui.SearchWidget.call( this, config ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js index 8936fe4a47..299ff2b1cc 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js @@ -17,7 +17,7 @@ */ ve.ui.MWParameterResultWidget = function VeUiMWParameterResultWidget( data, config ) { // Configuration initialization - config = ve.extendObject( {}, config, { 'icon': 'parameter' } ); + config = ve.extendObject( { 'icon': 'parameter' }, config ); // Parent constructor ve.ui.OptionWidget.call( this, data, config ); @@ -27,11 +27,6 @@ ve.ui.MWParameterResultWidget = function VeUiMWParameterResultWidget( data, conf this.setLabel( this.buildLabel() ); }; -/** - * @private - * @cfg {string} icon - */ - /* Inheritance */ ve.inheritClass( ve.ui.MWParameterResultWidget, ve.ui.OptionWidget ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js index 591afb6394..e685b08436 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js @@ -16,9 +16,9 @@ */ ve.ui.MWParameterSearchWidget = function VeUiMWParameterSearchWidget( template, config ) { // Configuration intialization - config = ve.extendObject( {}, config, { + config = ve.extendObject( { 'placeholder': ve.msg( 'visualeditor-parameter-input-placeholder' ) - } ); + }, config ); // Parent constructor ve.ui.SearchWidget.call( this, config ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js index bd61cabac6..3fd7207b15 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js @@ -17,9 +17,9 @@ */ ve.ui.MWReferenceSearchWidget = function VeUiMWReferenceSearchWidget( surface, config ) { // Configuration intialization - config = ve.extendObject( {}, config, { + config = ve.extendObject( { 'placeholder': ve.msg( 'visualeditor-reference-input-placeholder' ) - } ); + }, config ); // Parent constructor ve.ui.SearchWidget.call( this, config ); diff --git a/modules/ve/ui/layouts/ve.ui.StackPanelLayout.js b/modules/ve/ui/layouts/ve.ui.StackPanelLayout.js index 2b14581b02..4b2ea9bace 100644 --- a/modules/ve/ui/layouts/ve.ui.StackPanelLayout.js +++ b/modules/ve/ui/layouts/ve.ui.StackPanelLayout.js @@ -18,7 +18,7 @@ */ ve.ui.StackPanelLayout = function VeUiStackPanelLayout( config ) { // Config initialization - config = ve.extendObject( config, { 'scrollable': true } ); + config = ve.extendObject( { 'scrollable': true }, config ); // Parent constructor ve.ui.PanelLayout.call( this, config ); diff --git a/modules/ve/ui/widgets/ve.ui.MenuItemWidget.js b/modules/ve/ui/widgets/ve.ui.MenuItemWidget.js index 4e51c8c1cf..607299ace3 100644 --- a/modules/ve/ui/widgets/ve.ui.MenuItemWidget.js +++ b/modules/ve/ui/widgets/ve.ui.MenuItemWidget.js @@ -17,7 +17,7 @@ */ ve.ui.MenuItemWidget = function VeUiMenuItemWidget( data, config ) { // Configuration initialization - config = ve.extendObject( {}, config, { 'icon': 'check' } ); + config = ve.extendObject( { 'icon': 'check' }, config ); // Parent constructor ve.ui.OptionWidget.call( this, data, config ); @@ -26,11 +26,6 @@ ve.ui.MenuItemWidget = function VeUiMenuItemWidget( data, config ) { this.$.addClass( 've-ui-menuItemWidget' ); }; -/** - * @private - * @cfg {string} icon - */ - /* Inheritance */ ve.inheritClass( ve.ui.MenuItemWidget, ve.ui.OptionWidget );