jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (d74a46ca6a) and VisualEditor-MediaWiki to Ie06056b ......................................................................
Update OOjs UI to v0.1.0-pre (d74a46ca6a) and VisualEditor-MediaWiki to Ie06056b Change-Id: I3f325f3c514d334179de46d0ea092b48f13b9dfd --- M extensions/VisualEditor M resources/lib/oojs-ui/oojs-ui-apex.css M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-apex.svg.css M resources/lib/oojs-ui/oojs-ui-mediawiki.css M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css M resources/lib/oojs-ui/oojs-ui-minerva.css M resources/lib/oojs-ui/oojs-ui-minerva.js M resources/lib/oojs-ui/oojs-ui-minerva.svg.css M resources/lib/oojs-ui/oojs-ui.js 11 files changed, 41 insertions(+), 33 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/VisualEditor b/extensions/VisualEditor index dd6329d..3d2d9ba 160000 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit dd6329d3ebc5ce5f6cc41e446c76cb18eb41d243 +Subproject commit 3d2d9ba4adb753b07a7b5efebcc74c55b9b089c5 diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index a8f1e8e..42e6699 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.css +++ b/resources/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:05:40Z + * Date: 2014-10-15T00:40:28Z */ /* @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/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 3835239..ba1ef86 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.js +++ b/resources/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:05:29Z + * Date: 2014-10-15T00:40:17Z */ /* Instantiation */ diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css b/resources/lib/oojs-ui/oojs-ui-apex.svg.css index 8a70e54..06880ff 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/resources/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:05:40Z + * Date: 2014-10-15T00:40:28Z */ /* @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/resources/lib/oojs-ui/oojs-ui-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.css index f18c048..7fbd762 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css +++ b/resources/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:05:40Z + * Date: 2014-10-15T00:40:28Z */ /* @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/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 9c1ca57..8fed983 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/resources/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:05:29Z + * Date: 2014-10-15T00:40:17Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css index 2888159..266d714 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css +++ b/resources/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:05:40Z + * Date: 2014-10-15T00:40:28Z */ /* @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/resources/lib/oojs-ui/oojs-ui-minerva.css b/resources/lib/oojs-ui/oojs-ui-minerva.css index 9d39fdb..8feccb9 100644 --- a/resources/lib/oojs-ui/oojs-ui-minerva.css +++ b/resources/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:05:40Z + * Date: 2014-10-15T00:40:28Z */ /* @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/resources/lib/oojs-ui/oojs-ui-minerva.js b/resources/lib/oojs-ui/oojs-ui-minerva.js index 3835239..ba1ef86 100644 --- a/resources/lib/oojs-ui/oojs-ui-minerva.js +++ b/resources/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:05:29Z + * Date: 2014-10-15T00:40:17Z */ /* Instantiation */ diff --git a/resources/lib/oojs-ui/oojs-ui-minerva.svg.css b/resources/lib/oojs-ui/oojs-ui-minerva.svg.css index 3f671e0..ad1316c 100644 --- a/resources/lib/oojs-ui/oojs-ui-minerva.svg.css +++ b/resources/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:05:40Z + * Date: 2014-10-15T00:40:28Z */ /* @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/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index f98f3f3..50f69f3 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/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:05:29Z + * Date: 2014-10-15T00:40:17Z */ ( 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/166708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f325f3c514d334179de46d0ea092b48f13b9dfd Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf3 Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
