Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/173310
Change subject: Make table inserts directional ...................................................................... Make table inserts directional Change-Id: I9d1b88525615bfe1fb6315af90fc568c6a25cfca --- R src/ui/styles/images/icons/table-insert-column-ltr.svg R src/ui/styles/images/icons/table-insert-column-rtl.svg M src/ui/styles/ve.ui.Icons.css M src/ui/ve.ui.TableContext.js 4 files changed, 50 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/10/173310/1 diff --git a/src/ui/styles/images/icons/table-insert-column-before.svg b/src/ui/styles/images/icons/table-insert-column-ltr.svg similarity index 88% rename from src/ui/styles/images/icons/table-insert-column-before.svg rename to src/ui/styles/images/icons/table-insert-column-ltr.svg index 22630bb..798ee4a 100644 --- a/src/ui/styles/images/icons/table-insert-column-before.svg +++ b/src/ui/styles/images/icons/table-insert-column-ltr.svg @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"> - <g id="table-insert-column-before"> + <g id="table-insert-column-ltr"> <path d="m 13,9 -2,0 0,2 -2,0 0,2 2,0 0,2 2,0 0,-2 2,0 0,-2 -2,0 z" id="plus" /> diff --git a/src/ui/styles/images/icons/table-insert-column-after.svg b/src/ui/styles/images/icons/table-insert-column-rtl.svg similarity index 88% rename from src/ui/styles/images/icons/table-insert-column-after.svg rename to src/ui/styles/images/icons/table-insert-column-rtl.svg index 4eea497..dfa33a0 100644 --- a/src/ui/styles/images/icons/table-insert-column-after.svg +++ b/src/ui/styles/images/icons/table-insert-column-rtl.svg @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"> - <g id="table-insert-column-after"> + <g id="table-insert-column-rtl"> <path d="m 13,9 -2,0 0,2 -2,0 0,2 2,0 0,2 2,0 0,-2 2,0 0,-2 -2,0 z" id="plus" /> diff --git a/src/ui/styles/ve.ui.Icons.css b/src/ui/styles/ve.ui.Icons.css index 3234eda..bf19986 100644 --- a/src/ui/styles/ve.ui.Icons.css +++ b/src/ui/styles/ve.ui.Icons.css @@ -282,29 +282,59 @@ } .oo-ui-icon-table-insert { - background-image: /* @embed */ url(images/icons/table-insert.svg); + /* @embed */ + background-image: url(images/icons/table-insert.svg); } .oo-ui-icon-table-insert-row-before { - background-image: /* @embed */ url(images/icons/table-insert-row-before.svg); + background-image: url(images/icons/table-insert-row-before.svg); } .oo-ui-icon-table-insert-row-after { - background-image: /* @embed */ url(images/icons/table-insert-row-after.svg); + /* @embed */ + background-image: url(images/icons/table-insert-row-after.svg); } .oo-ui-icon-table-insert-column-before { - background-image: /* @embed */ url(images/icons/table-insert-column-before.svg); + /* @embed */ + background-image: url(images/icons/table-insert-column-ltr.svg); +} + +/* @noflip */ +.ve-ui-dir-block-rtl .oo-ui-icon-table-insert-column-before { + /* @embed */ + background-image: url(images/icons/table-insert-column-rtl.svg); +} + +/* @noflip */ +.ve-ui-dir-block-ltr .oo-ui-icon-table-insert-column-before { + /* @embed */ + background-image: url(images/icons/table-insert-column-ltr.svg); } .oo-ui-icon-table-insert-column-after { - background-image: /* @embed */ url(images/icons/table-insert-column-after.svg); + /* @embed */ + background-image: url(images/icons/table-insert-column-rtl.svg); +} + +/* @noflip */ +.ve-ui-dir-block-rtl .oo-ui-icon-table-insert-column-after { + /* @embed */ + background-image: url(images/icons/table-insert-column-ltr.svg); +} + +/* @noflip */ +.ve-ui-dir-block-ltr .oo-ui-icon-table-insert-column-after { + /* @embed */ + background-image: url(images/icons/table-insert-column-rtl.svg); } .oo-ui-icon-table-merge-cells { - background-image: /* @embed */ url(images/icons/table-merge-cells.svg); + /* @embed */ + background-image: url(images/icons/table-merge-cells.svg); } .oo-ui-icon-table-caption { - background-image: /* @embed */ url(images/icons/table-caption.svg); + /* @embed */ + background-image: url(images/icons/table-caption.svg); } diff --git a/src/ui/ve.ui.TableContext.js b/src/ui/ve.ui.TableContext.js index f4a6d6f..cfc77ed 100644 --- a/src/ui/ve.ui.TableContext.js +++ b/src/ui/ve.ui.TableContext.js @@ -116,13 +116,20 @@ * @param {boolean} [show] Show the context menu */ ve.ui.TableContext.prototype.toggle = function ( show ) { + var dir, + surfaceModel = this.surface.getModel(), + surfaceView = this.surface.getView(); this.popup.toggle( show ); if ( this.popup.isVisible() ) { this.tableNode.setEditing( false ); - this.surface.getModel().connect( this, { select: 'toggle' } ); - this.surface.getView().$document.on( 'mousedown', this.onDocumentMouseDownHandler ); + surfaceModel.connect( this, { select: 'toggle' } ); + surfaceView.$document.on( 'mousedown', this.onDocumentMouseDownHandler ); + dir = surfaceView.getDocument().getDirectionFromSelection( surfaceModel.getSelection() ) || surfaceModel.getDocument().getDir(); + this.$element + .removeClass( 've-ui-dir-block-rtl ve-ui-dir-block-ltr' ) + .addClass( 've-ui-dir-block-' + dir ); } else { - this.surface.getModel().disconnect( this ); - this.surface.getView().$document.off( 'mousedown', this.onDocumentMouseDownHandler ); + surfaceModel.disconnect( this ); + surfaceView.$document.off( 'mousedown', this.onDocumentMouseDownHandler ); } }; -- To view, visit https://gerrit.wikimedia.org/r/173310 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d1b88525615bfe1fb6315af90fc568c6a25cfca Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
