Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/166706
Change subject: Update OOjs UI to v0.1.0-pre (d74a46ca6a) ...................................................................... Update OOjs UI to v0.1.0-pre (d74a46ca6a) New changes: d74a46c Introduce oo-ui-window-inner-overlay Change-Id: I3f325f3c514d334179de46d0ea092b48f13b9dfd --- M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-apex.svg.css M lib/oojs-ui/oojs-ui-apex.svg.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.svg.css M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css M lib/oojs-ui/oojs-ui-minerva.css M lib/oojs-ui/oojs-ui-minerva.js M lib/oojs-ui/oojs-ui-minerva.rtl.css M lib/oojs-ui/oojs-ui-minerva.svg.css M lib/oojs-ui/oojs-ui-minerva.svg.rtl.css M lib/oojs-ui/oojs-ui.js 16 files changed, 71 insertions(+), 57 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/06/166706/1 diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css index e0773bc..07b5727 100644 --- a/lib/oojs-ui/oojs-ui-apex.css +++ b/lib/oojs-ui/oojs-ui-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1599,7 +1599,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; left: 0; @@ -1635,7 +1636,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-dialog-content > .oo-ui-window-body { diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js index e2ef0b2..dfb78de 100644 --- a/lib/oojs-ui/oojs-ui-apex.js +++ b/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:42Z + * Date: 2014-10-15T00:38:31Z */ /* Instantiation */ diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css index 5f68597..9114635 100644 --- a/lib/oojs-ui/oojs-ui-apex.rtl.css +++ b/lib/oojs-ui/oojs-ui-apex.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1599,7 +1599,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; right: 0; @@ -1635,7 +1636,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-dialog-content > .oo-ui-window-body { diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/oojs-ui/oojs-ui-apex.svg.css index 07a73b4..d0f54f1 100644 --- a/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/lib/oojs-ui/oojs-ui-apex.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1599,7 +1599,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; left: 0; @@ -1635,7 +1636,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-dialog-content > .oo-ui-window-body { diff --git a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css index b8328c7..afff384 100644 --- a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1599,7 +1599,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; right: 0; @@ -1635,7 +1636,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-dialog-content > .oo-ui-window-body { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.css b/lib/oojs-ui/oojs-ui-mediawiki.css index 095f44d..39e013f 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1421,7 +1421,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; left: 0; @@ -1456,7 +1457,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-dialog-content > .oo-ui-window-body { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.js b/lib/oojs-ui/oojs-ui-mediawiki.js index 85f9d8f..5dc576c 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:42Z + * Date: 2014-10-15T00:38:31Z */ /** * @class diff --git a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css index 0ad325a..417b017 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1421,7 +1421,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; right: 0; @@ -1456,7 +1457,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-dialog-content > .oo-ui-window-body { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/lib/oojs-ui/oojs-ui-mediawiki.svg.css index 2e0789d..ac0893c 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.svg.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1421,7 +1421,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; left: 0; @@ -1456,7 +1457,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-dialog-content > .oo-ui-window-body { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css index 1e48dc5..8edf776 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1421,7 +1421,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; right: 0; @@ -1456,7 +1457,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-dialog-content > .oo-ui-window-body { diff --git a/lib/oojs-ui/oojs-ui-minerva.css b/lib/oojs-ui/oojs-ui-minerva.css index 642d842..c6072e0 100644 --- a/lib/oojs-ui/oojs-ui-minerva.css +++ b/lib/oojs-ui/oojs-ui-minerva.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1008,7 +1008,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; left: 0; @@ -1037,7 +1038,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-messageDialog-actions-horizontal { diff --git a/lib/oojs-ui/oojs-ui-minerva.js b/lib/oojs-ui/oojs-ui-minerva.js index e2ef0b2..dfb78de 100644 --- a/lib/oojs-ui/oojs-ui-minerva.js +++ b/lib/oojs-ui/oojs-ui-minerva.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:42Z + * Date: 2014-10-15T00:38:31Z */ /* Instantiation */ diff --git a/lib/oojs-ui/oojs-ui-minerva.rtl.css b/lib/oojs-ui/oojs-ui-minerva.rtl.css index 05221f0..dfadac2 100644 --- a/lib/oojs-ui/oojs-ui-minerva.rtl.css +++ b/lib/oojs-ui/oojs-ui-minerva.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1008,7 +1008,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; right: 0; @@ -1037,7 +1038,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-messageDialog-actions-horizontal { diff --git a/lib/oojs-ui/oojs-ui-minerva.svg.css b/lib/oojs-ui/oojs-ui-minerva.svg.css index 45ea43a..5b529b5 100644 --- a/lib/oojs-ui/oojs-ui-minerva.svg.css +++ b/lib/oojs-ui/oojs-ui-minerva.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1008,7 +1008,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; left: 0; @@ -1037,7 +1038,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-messageDialog-actions-horizontal { diff --git a/lib/oojs-ui/oojs-ui-minerva.svg.rtl.css b/lib/oojs-ui/oojs-ui-minerva.svg.rtl.css index b729fec..ca41347 100644 --- a/lib/oojs-ui/oojs-ui-minerva.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-minerva.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:53Z + * Date: 2014-10-15T00:38:42Z */ /* @noflip */ .oo-ui-rtl { @@ -1008,7 +1008,8 @@ padding: 0; background: none; } -.oo-ui-window-overlay { +.oo-ui-window-overlay, +.oo-ui-window-inner-overlay { position: absolute; top: 0; right: 0; @@ -1037,7 +1038,7 @@ z-index: 1; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-overlay { +.oo-ui-dialog-content > .oo-ui-window-inner-overlay { z-index: 3; } .oo-ui-messageDialog-actions-horizontal { diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js index 87f8495..56b740f 100644 --- a/lib/oojs-ui/oojs-ui.js +++ b/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (837b2f733e) + * OOjs UI v0.1.0-pre (d74a46ca6a) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-10-11T01:06:42Z + * Date: 2014-10-15T00:38:31Z */ ( function ( OO ) { @@ -1900,6 +1900,7 @@ this.$head = this.$( '<div>' ); this.$body = this.$( '<div>' ); this.$foot = this.$( '<div>' ); + this.$innerOverlay = this.$( '<div>' ); // Events this.$element.on( 'mousedown', OO.ui.bind( this.onMouseDown, this ) ); @@ -1908,7 +1909,8 @@ this.$head.addClass( 'oo-ui-window-head' ); this.$body.addClass( 'oo-ui-window-body' ); this.$foot.addClass( 'oo-ui-window-foot' ); - this.$content.append( this.$head, this.$body, this.$foot ); + this.$innerOverlay.addClass( 'oo-ui-window-inner-overlay' ); + this.$content.append( this.$head, this.$body, this.$foot, this.$innerOverlay ); return this; }; -- To view, visit https://gerrit.wikimedia.org/r/166706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f325f3c514d334179de46d0ea092b48f13b9dfd Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
