Trevor Parscal has uploaded a new change for review. https://gerrit.wikimedia.org/r/99724
Change subject: Spell removable and movable using modern English ...................................................................... Spell removable and movable using modern English Also... * Update OOjs UI to v0.1.0-pre (5ffe63d088) * Make template parameter text boxes shorter (3em down from 10em) * Reorder extendObject calls to not modify incoming config objects * Allow level option to default to 0, rather than specifically defining it * Use icon button widgets with remove icons for parameter, placeholder, template and content removal buttons Change-Id: I29db9d814fab5cf4debd0fc7bab6f51475cb0f94 --- M modules/oojs-ui/oojs-ui.js M modules/oojs-ui/oojs-ui.svg.css M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js M modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js M modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js M modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js M modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js M modules/ve-mw/ui/styles/ve.ui.MWDialog.css M modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js M modules/ve/ui/ve.ui.Inspector.js 13 files changed, 55 insertions(+), 54 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/24/99724/1 diff --git a/modules/oojs-ui/oojs-ui.js b/modules/oojs-ui/oojs-ui.js index 1984f6f..cdcb64a 100644 --- a/modules/oojs-ui/oojs-ui.js +++ b/modules/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOJS UI v0.1.0-pre (592e1d6401) - * https://www.mediawiki.org/wiki/OOJS + * OOjs UI v0.1.0-pre (5ffe63d088) + * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011-2013 OOJS Team and other contributors. + * Copyright 2011-2013 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: Thu Dec 05 2013 16:06:17 GMT-0800 (PST) + * Date: Fri Dec 06 2013 12:23:15 GMT-0800 (PST) */ ( function () { @@ -3410,7 +3410,7 @@ 'label': page.getLabel() || name, 'level': page.getLevel(), 'icon': page.getIcon(), - 'moveable': page.isMovable() + 'movable': page.isMovable() } ) ); } @@ -5769,31 +5769,31 @@ * @method */ OO.ui.OutlineControlsWidget.prototype.onOutlineChange = function () { - var i, len, firstMoveable, lastMoveable, - moveable = false, + var i, len, firstMovable, lastMovable, + movable = false, items = this.outline.getItems(), selectedItem = this.outline.getSelectedItem(); - if ( selectedItem && selectedItem.isMoveable() ) { - moveable = true; + if ( selectedItem && selectedItem.isMovable() ) { + movable = true; i = -1; len = items.length; while ( ++i < len ) { - if ( items[i].isMoveable() ) { - firstMoveable = items[i]; + if ( items[i].isMovable() ) { + firstMovable = items[i]; break; } } i = len; while ( i-- ) { - if ( items[i].isMoveable() ) { - lastMoveable = items[i]; + if ( items[i].isMovable() ) { + lastMovable = items[i]; break; } } } - this.upButton.setDisabled( !moveable || selectedItem === firstMoveable ); - this.downButton.setDisabled( !moveable || selectedItem === lastMoveable ); + this.upButton.setDisabled( !movable || selectedItem === firstMovable ); + this.downButton.setDisabled( !movable || selectedItem === lastMovable ); }; /** @@ -5829,7 +5829,7 @@ * @param {Mixed} data Item data * @param {Object} [config] Configuration options * @cfg {number} [level] Indentation level - * @cfg {boolean} [moveable] Allow modification from outline controls + * @cfg {boolean} [movable] Allow modification from outline controls */ OO.ui.OutlineItemWidget = function OoUiOutlineItemWidget( data, config ) { // Config intialization @@ -5840,7 +5840,7 @@ // Properties this.level = 0; - this.moveable = !!config.moveable; + this.movable = !!config.movable; // Initialization this.$element.addClass( 'oo-ui-outlineItemWidget' ); @@ -5864,14 +5864,14 @@ /* Methods */ /** - * Check if item is moveable. + * Check if item is movable. * * Moveablilty is used by outline controls. * - * @returns {boolean} Item is moveable + * @returns {boolean} Item is movable */ -OO.ui.OutlineItemWidget.prototype.isMoveable = function () { - return this.moveable; +OO.ui.OutlineItemWidget.prototype.isMovable = function () { + return this.movable; }; /** diff --git a/modules/oojs-ui/oojs-ui.svg.css b/modules/oojs-ui/oojs-ui.svg.css index 17f6157..ac34187 100644 --- a/modules/oojs-ui/oojs-ui.svg.css +++ b/modules/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOJS UI v0.1.0-pre-svg (592e1d6401) - * https://www.mediawiki.org/wiki/OOJS + * OOjs UI v0.1.0-pre-svg (5ffe63d088) + * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011-2013 OOJS Team and other contributors. + * Copyright 2011-2013 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: Thu Dec 05 2013 16:06:17 GMT-0800 (PST) + * Date: Fri Dec 06 2013 12:23:15 GMT-0800 (PST) */ /*csslint vendor-prefix:false */ @@ -1018,11 +1018,8 @@ float: right; } -.oo-ui-outlineControlsWidget-adders:not(:hover) .oo-ui-iconButtonWidget:not(:first-child) { - opacity: 0; -} - -.oo-ui-outlineControlsWidget-adders:hover .oo-ui-iconButtonWidget:first-child { +.oo-ui-outlineControlsWidget-adders .oo-ui-iconButtonWidget:first-child, +.oo-ui-outlineControlsWidget-adders .oo-ui-iconButtonWidget:first-child:hover { opacity: 0.25; cursor: default; } diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js index be456fe..7b6769f 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js @@ -55,7 +55,7 @@ } removed.disconnect( this ); } - if ( this.outlined ) { + if ( this.bookletLayout.isOutlined() ) { // Auto-select new part if placeholder is still selected selected = this.bookletLayout.getOutline().getSelectedItem(); if ( selected && removed.getId() === selected.getData() ) { @@ -124,7 +124,7 @@ }; /** - * Get an outlined booklet layout widget. + * Get a booklet layout widget. * * @return {OO.ui.BookletLayout} Configured widget */ @@ -140,7 +140,7 @@ * @param {string} name Page name */ ve.ui.MWTransclusionDialog.prototype.setPageByName = function ( name ) { - if ( this.outlined ) { + if ( this.bookletLayout.isOutlined() ) { this.bookletLayout.getOutline().selectItem( this.bookletLayout.getOutline().getItemFromData( name ) ); diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js index bb9126f..84a5ead 100644 --- a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js +++ b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js @@ -31,7 +31,7 @@ ve.ui.MWExtensionInspector.static.nodeModel = null; -ve.ui.MWExtensionInspector.static.removeable = false; +ve.ui.MWExtensionInspector.static.removable = false; /* Methods */ diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js index 40300ed..707427a 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js @@ -21,7 +21,7 @@ */ ve.ui.MWCategoriesPage = function VeUiMWCategoriesPage( surface, name, config ) { // Configuration initialization - config = ve.extendObject( config, { 'icon': 'tag' } ); + config = ve.extendObject( { 'icon': 'tag' }, config ); // Parent constructor OO.ui.PageLayout.call( this, name, config ); diff --git a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js index ee5eef3..13db8d9 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js @@ -19,7 +19,7 @@ */ ve.ui.MWLanguagesPage = function VeUiMWLanguagesPage( name, config ) { // Configuration initialization - config = ve.extendObject( config, { 'icon': 'language' } ); + config = ve.extendObject( { 'icon': 'language' }, config ); // Parent constructor OO.ui.PageLayout.call( this, name, config ); diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js index 7e283ef..7e109ab 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js @@ -18,7 +18,7 @@ */ ve.ui.MWTemplatePage = function VeUiMWTemplatePage( template, name, config ) { // Configuration initialization - config = ve.extendObject( config, { 'icon': 'template', 'moveable': true, 'level': 0 } ); + config = ve.extendObject( { 'icon': 'template', 'movable': true }, config ); // Parent constructor OO.ui.PageLayout.call( this, name, config ); @@ -29,9 +29,10 @@ this.label = this.spec.getLabel(); this.addParameterSearch = new ve.ui.MWParameterSearchWidget( this.template, { '$': this.$ } ) .connect( this, { 'select': 'onParameterSelect' } ); - this.removeButton = new OO.ui.PushButtonWidget( { + this.removeButton = new OO.ui.IconButtonWidget( { '$': this.$, - 'label': ve.msg( 'visualeditor-dialog-transclusion-remove-template' ), + 'icon': 'remove', + 'title': ve.msg( 'visualeditor-dialog-transclusion-remove-template' ), 'flags': ['destructive'], 'classes': [ 've-ui-mwTransclusionDialog-removeButton' ] } ) diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js b/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js index d71435f..57443a2 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js @@ -18,7 +18,7 @@ */ ve.ui.MWTemplateParameterPage = function VeUiMWTemplateParameter( parameter, name, config ) { // Configuration initialization - config = ve.extendObject( config, { 'icon': 'parameter', 'moveable': false, 'level': 1 } ); + config = ve.extendObject( { 'icon': 'parameter', 'movable': false, 'level': 1 }, config ); // Parent constructor OO.ui.PageLayout.call( this, name, config ); @@ -39,9 +39,10 @@ 'input': this.textInput, 'label': this.spec.getParameterDescription( this.parameter.getName() ) || '' } ); - this.removeButton = new OO.ui.PushButtonWidget( { + this.removeButton = new OO.ui.IconButtonWidget( { '$': this.$, - 'label': ve.msg( 'visualeditor-dialog-transclusion-remove-param' ), + 'icon': 'remove', + 'title': ve.msg( 'visualeditor-dialog-transclusion-remove-param' ), 'flags': ['destructive'], 'classes': [ 've-ui-mwTransclusionDialog-removeButton' ] } ) diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js index 9c8e887..95ad072 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js @@ -18,7 +18,7 @@ */ ve.ui.MWTemplatePlaceholderPage = function VeUiMWTemplatePlaceholder( placeholder, name, config ) { // Configuration initialization - config = ve.extendObject( config, { 'icon': 'template', 'moveable': true, 'level': 0 } ); + config = ve.extendObject( { 'icon': 'template', 'movable': true }, config ); // Parent constructor OO.ui.PageLayout.call( this, name, config ); @@ -42,9 +42,10 @@ 'disabled': true } ) .connect( this, { 'click': 'onAddTemplate' } ); - this.removeButton = new OO.ui.PushButtonWidget( { + this.removeButton = new OO.ui.IconButtonWidget( { '$': this.$, - 'label': ve.msg( 'visualeditor-dialog-transclusion-remove-template' ), + 'icon': 'remove', + 'title': ve.msg( 'visualeditor-dialog-transclusion-remove-template' ), 'flags': ['destructive'], 'classes': [ 've-ui-mwTransclusionDialog-removeButton' ] } ) diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js index 6b6bb59..c30a99e 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js @@ -18,7 +18,7 @@ */ ve.ui.MWTransclusionContentPage = function VeUiMWTransclusionContent( content, name, config ) { // Configuration initialization - config = ve.extendObject( config, { 'icon': 'source', 'moveable': true, 'level': 0 } ); + config = ve.extendObject( { 'icon': 'source', 'movable': true }, config ); // Parent constructor OO.ui.PageLayout.call( this, name, config ); @@ -33,9 +33,10 @@ } ) .setValue( this.content.getValue() ) .connect( this, { 'change': 'onTextInputChange' } ); - this.removeButton = new OO.ui.PushButtonWidget( { + this.removeButton = new OO.ui.IconButtonWidget( { '$': this.$, - 'label': ve.msg( 'visualeditor-dialog-transclusion-remove-content' ), + 'icon': 'remove', + 'title': ve.msg( 'visualeditor-dialog-transclusion-remove-content' ), 'flags': [ 'destructive' ], 'classes': [ 've-ui-mwTransclusionDialog-removeButton' ] } ) diff --git a/modules/ve-mw/ui/styles/ve.ui.MWDialog.css b/modules/ve-mw/ui/styles/ve.ui.MWDialog.css index 50cd951..e7dac87 100644 --- a/modules/ve-mw/ui/styles/ve.ui.MWDialog.css +++ b/modules/ve-mw/ui/styles/ve.ui.MWDialog.css @@ -12,7 +12,7 @@ } .ve-ui-mwTransclusionDialog-input textarea { - height: 10em; + height: 3em; } .ve-ui-mwTransclusionDialog-addTemplateFieldset .oo-ui-widget { diff --git a/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js b/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js index df41dfc..268f1c7 100644 --- a/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js +++ b/modules/ve/ui/inspectors/ve.ui.SpecialCharacterInspector.js @@ -79,7 +79,7 @@ ve.ui.SpecialCharacterInspector.static.titleMessage = 'visualeditor-specialcharacterinspector-title'; -ve.ui.SpecialCharacterInspector.static.removeable = false; +ve.ui.SpecialCharacterInspector.static.removable = false; /* Methods */ diff --git a/modules/ve/ui/ve.ui.Inspector.js b/modules/ve/ui/ve.ui.Inspector.js index 39395c6..d5450d3 100644 --- a/modules/ve/ui/ve.ui.Inspector.js +++ b/modules/ve/ui/ve.ui.Inspector.js @@ -52,7 +52,7 @@ * @inheritable * @property {boolean} */ -ve.ui.Inspector.static.removeable = true; +ve.ui.Inspector.static.removable = true; /* Methods */ @@ -112,7 +112,7 @@ this.closeButton = new OO.ui.IconButtonWidget( { '$': this.$, 'icon': 'previous', 'title': ve.msg( 'visualeditor-inspector-close-tooltip' ) } ); - if ( this.constructor.static.removeable ) { + if ( this.constructor.static.removable ) { this.removeButton = new OO.ui.IconButtonWidget( { '$': this.$, 'icon': 'remove', 'title': ve.msg( 'visualeditor-inspector-remove-tooltip' ) } ); @@ -124,14 +124,14 @@ 'keydown': OO.ui.bind( this.onFormKeyDown, this ) } ); this.closeButton.connect( this, { 'click': 'onCloseButtonClick' } ); - if ( this.constructor.static.removeable ) { + if ( this.constructor.static.removable ) { this.removeButton.connect( this, { 'click': 'onRemoveButtonClick' } ); } // Initialization this.closeButton.$element.addClass( 've-ui-inspector-closeButton' ); this.$head.prepend( this.closeButton.$element ); - if ( this.constructor.static.removeable ) { + if ( this.constructor.static.removable ) { this.removeButton.$element.addClass( 've-ui-inspector-removeButton' ); this.$head.append( this.removeButton.$element ); } -- To view, visit https://gerrit.wikimedia.org/r/99724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29db9d814fab5cf4debd0fc7bab6f51475cb0f94 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Trevor Parscal <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
