wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-23 18:28:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

ve.init.mw.ViewPageTarget: Simplify toolbar save button and inner toolbar code

Browse source 
All this is no longer needed since 121216184718e7ebe22d6ecc8f5af5fe4e202465 in
OOjs UI and started causing issues after bb9c9c4f6a2fca6aed0e671e904e469d57da5f34.

Bug: T98795
Change-Id: I6493d6b52b313aac521aee2b0cff1571ea63bbe5
This commit is contained in:
Bartosz Dziewoński 2015-05-12 13:50:40 +02:00
parent 9025c3b690
commit e459c14442
3 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
View file

@ -21,25 +21,3 @@
.ve-active .ve-ui-toolbar-floating .oo-ui-toolbar-bar {
transform: translateY(0);
}
.ve-init-mw-viewPageTarget-toolbar-utilities,
.ve-init-mw-viewPageTarget-toolbar-actions {
display: inline-block;
vertical-align: middle;
}
.ve-init-mw-viewPageTarget-toolbar-actions {
vertical-align: top;
padding: 0.25em;
}
.ve-init-mw-viewPageTarget-toolbar-utilities > .oo-ui-buttonElement-frameless {
margin-right: 0.2em;
margin-top: 0.2em;
}
.ve-init-mw-viewPageTarget-toolbar-actions > .oo-ui-buttonElement-framed {
margin-left: 0.25em;
margin-right: 0.25em;
margin-top: 0.2em;
}

13
modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
View file

@ -1211,9 +1211,6 @@ ve.init.mw.ViewPageTarget.prototype.setupToolbarSaveButton = function () {
* Add the save button to the user interface.
*/
ve.init.mw.ViewPageTarget.prototype.attachToolbarSaveButton = function () {
var $actionTools = $( '<div>' ),
$pushButtons = $( '<div>' );
this.actionsToolbar = new ve.ui.TargetToolbar( this );
this.actionsToolbar.setup( [
@ -1226,15 +1223,7 @@ ve.init.mw.ViewPageTarget.prototype.attachToolbarSaveButton = function () {
}
], this.getSurface() );
$actionTools
.addClass( 've-init-mw-viewPageTarget-toolbar-utilities' )
.append( this.actionsToolbar.$element );
$pushButtons
.addClass( 've-init-mw-viewPageTarget-toolbar-actions' )
.append( this.toolbarSaveButton.$element );
this.toolbar.$actions.append( $actionTools, $pushButtons );
this.toolbar.$actions.append( this.actionsToolbar.$element, this.toolbarSaveButton.$element );
// Make the toolbar recalculate its sizes for narrow/wide switching.
// This really should not be necessary.
this.toolbar.narrowThreshold = this.toolbar.$group.width() + this.toolbar.$actions.width();

4
modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
View file

@ -47,7 +47,7 @@ class VisualEditorPage
span(:decrease_indentation, class: 'oo-ui-iconElement-icon oo-ui-icon-outdent-list')
text_area(:describe_change, index: 0)
table(:diff_view, css: '.ve-ui-mwSaveDialog-viewer table.diff')
div(:disabled_save_button, css: 'div.ve-init-mw-viewPageTarget-toolbar-actions > div.oo-ui-flaggedElement-progressive.oo-ui-widget-disabled')
div(:disabled_save_button, css: 'div.ve-init-mw-viewPageTarget-toolbar .oo-ui-toolbar-actions > div.oo-ui-flaggedElement-progressive.oo-ui-widget-disabled')
text_field(:display_title_textbox, css: 'div.oo-ui-fieldLayout-align-inline:nth-child(4) > label:nth-child(1) > div:nth-child(1) > div:nth-child(1) > input:nth-child(1)')
div(:enable_redirect, class: 've-test-page-settings-enable-redirect')
div(:prevent_redirect, class: 've-test-page-settings-prevent-redirect')
@ -143,7 +143,7 @@ class VisualEditorPage
li(:ve_edit_tab, id: 'ca-ve-edit')
li(:edit_source_tab, id: 'ca-edit')
a(:save_page, css: '.oo-ui-flaggedElement-progressive > a:nth-child(1)')
div(:save_enabled, css: 'div.ve-init-mw-viewPageTarget-toolbar-actions > div.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled')
div(:save_enabled, css: 'div.ve-init-mw-viewPageTarget-toolbar .oo-ui-toolbar-actions > div.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled')
a(:second_reference, text: '[1]', index: 2)
span(:second_save_page, css: '.oo-ui-processDialog-actions-primary > div:nth-child(1) > a:nth-child(1) > span:nth-child(2)')
div(:settings_apply_button, css: '.oo-ui-window-frame .oo-ui-processDialog-actions-primary')