jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (e9cf571db2) ......................................................................
Update OOjs UI to v0.1.0-pre (e9cf571db2) New changes: 1e7fcaa build: Remove over-ride on jscs's disallowQuotedKeysInObjects and make pass 170f607 Use native style property names instead of jQuery's css map eb9b38f Localisation updates from https://translatewiki.net. b812471 Unified demo page 6b06deb SVG fixes 970e35b Localisation updates from https://translatewiki.net. bbfdfa8 Localisation updates from https://translatewiki.net. 9e8f965 Fix copypasta in WindowManager documentation 7fe05d5 demos: Rename demos.html to index.html for convenience 55beb80 demos: Add example of menu item with a long label 694e81c Update oojs to v1.0.11 Change-Id: I908933a4fa025d48e2d868a83039f7636356911c --- M lib/oojs-ui/i18n/ca.json M lib/oojs-ui/i18n/en.json M lib/oojs-ui/i18n/nb.json M lib/oojs-ui/i18n/sl.json M lib/oojs-ui/i18n/tr.json M lib/oojs-ui/images/anchor.svg M lib/oojs-ui/images/icons/accept.svg M lib/oojs-ui/images/icons/add-item.svg M lib/oojs-ui/images/icons/advanced.svg M lib/oojs-ui/images/icons/alert.svg M lib/oojs-ui/images/icons/arched-arrow-ltr.svg M lib/oojs-ui/images/icons/arched-arrow-rtl.svg M lib/oojs-ui/images/icons/clear.svg M lib/oojs-ui/images/icons/close.svg M lib/oojs-ui/images/icons/collapse.svg M lib/oojs-ui/images/icons/comment.svg M lib/oojs-ui/images/icons/expand.svg M lib/oojs-ui/images/icons/help.svg M lib/oojs-ui/images/icons/history.svg M lib/oojs-ui/images/icons/info.svg M lib/oojs-ui/images/icons/link.svg M lib/oojs-ui/images/icons/menu.svg M lib/oojs-ui/images/icons/move-ltr.svg M lib/oojs-ui/images/icons/move-rtl.svg M lib/oojs-ui/images/icons/picture.svg M lib/oojs-ui/images/icons/remove-item.svg M lib/oojs-ui/images/icons/remove.svg M lib/oojs-ui/images/icons/search.svg M lib/oojs-ui/images/icons/settings.svg M lib/oojs-ui/images/icons/tag.svg M lib/oojs-ui/images/icons/window.svg M lib/oojs-ui/images/indicators/alert.svg M lib/oojs-ui/images/indicators/arrow-down.svg M lib/oojs-ui/images/indicators/arrow-up.svg M lib/oojs-ui/oojs-ui-agora.css M lib/oojs-ui/oojs-ui-agora.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui.js M lib/oojs-ui/oojs-ui.rtl.css M lib/oojs-ui/oojs-ui.svg.css M lib/oojs-ui/oojs-ui.svg.rtl.css 42 files changed, 330 insertions(+), 326 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/oojs-ui/i18n/ca.json b/lib/oojs-ui/i18n/ca.json index 4555c11..c3e80fe 100644 --- a/lib/oojs-ui/i18n/ca.json +++ b/lib/oojs-ui/i18n/ca.json @@ -8,11 +8,13 @@ "QuimGil", "SMP", "Vriullop", - "Toniher" + "Toniher", + "Edustus" ] }, "ooui-outline-control-move-down": "Baixa element", "ooui-outline-control-move-up": "Puja element", "ooui-toolbar-more": "Més", - "ooui-dialog-process-dismiss": "Descarta" + "ooui-dialog-process-dismiss": "Descarta", + "ooui-dialog-process-retry": "Torneu-ho a provar" } diff --git a/lib/oojs-ui/i18n/en.json b/lib/oojs-ui/i18n/en.json index 602efc8..9e99440 100644 --- a/lib/oojs-ui/i18n/en.json +++ b/lib/oojs-ui/i18n/en.json @@ -1,28 +1,28 @@ { - "@metadata": { - "authors": [ - "Trevor Parscal", - "Ed Sanders", - "James D. Forrester", - "Raimond Spekking", - "Erik Moeller", - "Moriel Schottlender", - "Yuki Shira", - "Siebrand Mazeland", - "Rob Moen", - "Timo Tijhof", - "Roan Kattouw", - "Christian Williams", - "Amir E. Aharoni" - ] - }, - "ooui-outline-control-move-down": "Move item down", - "ooui-outline-control-move-up": "Move item up", - "ooui-outline-control-remove": "Remove item", - "ooui-toolbar-more": "More", - "ooui-dialog-message-accept": "OK", - "ooui-dialog-message-reject": "Cancel", - "ooui-dialog-process-error": "Something went wrong", - "ooui-dialog-process-dismiss": "Dismiss", - "ooui-dialog-process-retry": "Try again" + "@metadata": { + "authors": [ + "Trevor Parscal", + "Ed Sanders", + "James D. Forrester", + "Raimond Spekking", + "Erik Moeller", + "Moriel Schottlender", + "Yuki Shira", + "Siebrand Mazeland", + "Rob Moen", + "Timo Tijhof", + "Roan Kattouw", + "Christian Williams", + "Amir E. Aharoni" + ] + }, + "ooui-outline-control-move-down": "Move item down", + "ooui-outline-control-move-up": "Move item up", + "ooui-outline-control-remove": "Remove item", + "ooui-toolbar-more": "More", + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Cancel", + "ooui-dialog-process-error": "Something went wrong", + "ooui-dialog-process-dismiss": "Dismiss", + "ooui-dialog-process-retry": "Try again" } diff --git a/lib/oojs-ui/i18n/nb.json b/lib/oojs-ui/i18n/nb.json index 43a64cd..98b6bce 100644 --- a/lib/oojs-ui/i18n/nb.json +++ b/lib/oojs-ui/i18n/nb.json @@ -8,9 +8,12 @@ "Njardarlogar" ] }, - "ooui-dialog-action-close": "Lukk", "ooui-outline-control-move-down": "Flytt ned", "ooui-outline-control-move-up": "Flytt opp", "ooui-outline-control-remove": "Fjern element", - "ooui-toolbar-more": "Mer" + "ooui-toolbar-more": "Mer", + "ooui-dialog-message-reject": "Avbryt", + "ooui-dialog-process-error": "Noe gikk galt", + "ooui-dialog-process-dismiss": "Lukk", + "ooui-dialog-process-retry": "Prøv igjen" } diff --git a/lib/oojs-ui/i18n/sl.json b/lib/oojs-ui/i18n/sl.json index f0ccce5..5737548 100644 --- a/lib/oojs-ui/i18n/sl.json +++ b/lib/oojs-ui/i18n/sl.json @@ -7,13 +7,13 @@ "Yerpo" ] }, - "ooui-dialog-action-close": "Zapri", "ooui-outline-control-move-down": "Prestavi predmet nižje", "ooui-outline-control-move-up": "Prestavi predmet višje", "ooui-outline-control-remove": "Odstrani vnos", "ooui-toolbar-more": "Več", - "ooui-dialog-confirm-title": "Potrdi", - "ooui-dialog-confirm-default-prompt": "Ste prepričani?", - "ooui-dialog-confirm-default-ok": "V redu", - "ooui-dialog-confirm-default-cancel": "Prekliči" + "ooui-dialog-message-accept": "V redu", + "ooui-dialog-message-reject": "Prekliči", + "ooui-dialog-process-error": "Nekaj je šlo narobe", + "ooui-dialog-process-dismiss": "Skrij", + "ooui-dialog-process-retry": "Poskusi znova" } diff --git a/lib/oojs-ui/i18n/tr.json b/lib/oojs-ui/i18n/tr.json index 3717cf9..82f7c6c 100644 --- a/lib/oojs-ui/i18n/tr.json +++ b/lib/oojs-ui/i18n/tr.json @@ -7,11 +7,12 @@ "Maidis", "Rapsar", "Talha Samil Cakir", - "TurkishStyles" + "TurkishStyles", + "Sayginer" ] }, - "ooui-dialog-action-close": "Kapat", "ooui-outline-control-move-down": "Ögeyi aşağı taşı", "ooui-outline-control-move-up": "Ögeyi yukarı taşı", - "ooui-toolbar-more": "Daha fazla" + "ooui-toolbar-more": "Daha fazla", + "ooui-dialog-process-retry": "Tekrar dene" } diff --git a/lib/oojs-ui/images/anchor.svg b/lib/oojs-ui/images/anchor.svg index 417bc96..3694391 100644 --- a/lib/oojs-ui/images/anchor.svg +++ b/lib/oojs-ui/images/anchor.svg @@ -1,9 +1,7 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" - width="15px" height="8px" viewBox="0 0 15 8" style="enable-background:new 0 0 15 8;" xml:space="preserve"> -<g id="anchor"> - <polygon id="outline" style="fill-rule:evenodd;clip-rule:evenodd;fill:#808080;" points="7.609,2.499 2.096,8 13.125,8"/> - <polygon id="fill" style="fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;" points="7.609,3 2.598,8 12.622,8"/> -</g> +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg"; width="15" height="8" viewBox="0 0 15 8"> + <g id="anchor"> + <polygon id="outline" style="fill:#808080;" points="7.609,2.499 2.096,8 13.125,8"/> + <polygon id="fill" style="fill:#FFFFFF;" points="7.609,3 2.598,8 12.622,8"/> + </g> </svg> diff --git a/lib/oojs-ui/images/icons/accept.svg b/lib/oojs-ui/images/icons/accept.svg index ff52c32..b385a74 100644 --- a/lib/oojs-ui/images/icons/accept.svg +++ b/lib/oojs-ui/images/icons/accept.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="apply" opacity=".75"> - <path id="check" fill-rule="evenodd" clip-rule="evenodd" d="M19.062 5.139l-1.644-1.139-8.551 12.357-3.454-3.454-1.413 1.413 5.021 5.022z"/> + <g id="accept" opacity=".75"> + <path id="check" d="M19.062 5.139l-1.644-1.139-8.551 12.357-3.454-3.454-1.413 1.413 5.021 5.022z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/add-item.svg b/lib/oojs-ui/images/icons/add-item.svg index b25d5b7..c42731a 100644 --- a/lib/oojs-ui/images/icons/add-item.svg +++ b/lib/oojs-ui/images/icons/add-item.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="apply" opacity=".75"> - <path d="M13 8h-2v3h-3v2h3v3h2v-3h3v-2h-3z"/> + <g id="add-item" opacity=".75"> + <path id="plus" d="M13 8h-2v3h-3v2h3v3h2v-3h3v-2h-3z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/advanced.svg b/lib/oojs-ui/images/icons/advanced.svg index 223b7fc..0f85e44 100644 --- a/lib/oojs-ui/images/icons/advanced.svg +++ b/lib/oojs-ui/images/icons/advanced.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="settings" opacity=".75"> - <path id="gear" d="M20.869 13.476c.079-.482.131-.972.131-1.476s-.052-.994-.131-1.476l-2.463-.259c-.149-.556-.367-1.082-.648-1.57l1.558-1.924c-.576-.806-1.281-1.511-2.087-2.087l-1.924 1.558c-.488-.281-1.015-.499-1.57-.648l-.259-2.463c-.482-.079-.972-.131-1.476-.131s-.994.052-1.476.131l-.259 2.463c-.555.149-1.081.367-1.57.648l-1.924-1.557c-.805.576-1.51 1.281-2.086 2.086l1.558 1.924c-.281.488-.499 1.015-.648 1.57l-2.463.259c-.08.482-.132.972-.132 1.476s.052.994.131 1.476l2.463.259c.149.556.367 1.082.648 1.57l-1.558 1.924c.576.806 1.281 1.511 2.087 2.087l1.924-1.558c.488.281 1.015.499 1.57.648l.259 2.463c.482.079.972.131 1.476.131s.994-.052 1.476-.131l.259-2.463c.556-.149 1.082-.367 1.57-.648l1.924 1.558c.806-.576 1.511-1.281 2.087-2.087l-1.558-1.924c.281-.488.499-1.015.648-1.57l2.463-.259zm-8.869 2.522c-2.209 0-3.998-1.789-3.998-3.998s1.789-3.998 3.998-3.998 3.998 1.789 3.998 3.998-1.789 3.998-3.998 3.998z" fill-rule="evenodd" clip-rule="evenodd"/> + <path id="gear" d="M20.869 13.476c.079-.482.131-.972.131-1.476s-.052-.994-.131-1.476l-2.463-.259c-.149-.556-.367-1.082-.648-1.57l1.558-1.924c-.576-.806-1.281-1.511-2.087-2.087l-1.924 1.558c-.488-.281-1.015-.499-1.57-.648l-.259-2.463c-.482-.079-.972-.131-1.476-.131s-.994.052-1.476.131l-.259 2.463c-.555.149-1.081.367-1.57.648l-1.924-1.557c-.805.576-1.51 1.281-2.086 2.086l1.558 1.924c-.281.488-.499 1.015-.648 1.57l-2.463.259c-.08.482-.132.972-.132 1.476s.052.994.131 1.476l2.463.259c.149.556.367 1.082.648 1.57l-1.558 1.924c.576.806 1.281 1.511 2.087 2.087l1.924-1.558c.488.281 1.015.499 1.57.648l.259 2.463c.482.079.972.131 1.476.131s.994-.052 1.476-.131l.259-2.463c.556-.149 1.082-.367 1.57-.648l1.924 1.558c.806-.576 1.511-1.281 2.087-2.087l-1.558-1.924c.281-.488.499-1.015.648-1.57l2.463-.259zm-8.869 2.522c-2.209 0-3.998-1.789-3.998-3.998s1.789-3.998 3.998-3.998 3.998 1.789 3.998 3.998-1.789 3.998-3.998 3.998z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/alert.svg b/lib/oojs-ui/images/icons/alert.svg index fb25766..819e062 100644 --- a/lib/oojs-ui/images/icons/alert.svg +++ b/lib/oojs-ui/images/icons/alert.svg @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="alert" opacity=".75"> - <path id="point" fill-rule="evenodd" clip-rule="evenodd" d="M11 16h2v2h-2z"/> - <path id="stroke" fill-rule="evenodd" clip-rule="evenodd" d="M13.516 10h-3l.484 5h2z"/> + <path id="point" d="M11 16h2v2h-2z"/> + <path id="stroke" d="M13.516 10h-3l.484 5h2z"/> <path id="triangle" d="M12.017 5.974l7.519 13.026h-15.04l7.521-13.026m0-2.474c-.544 0-1.088.357-1.5 1.071l-7.985 13.831c-.825 1.429-.15 2.598 1.5 2.598h15.968c1.65 0 2.325-1.169 1.5-2.599l-7.983-13.829c-.413-.715-.956-1.072-1.5-1.072z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/arched-arrow-ltr.svg b/lib/oojs-ui/images/icons/arched-arrow-ltr.svg index 88a6a40..9fd2866 100644 --- a/lib/oojs-ui/images/icons/arched-arrow-ltr.svg +++ b/lib/oojs-ui/images/icons/arched-arrow-ltr.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="arched-arrow-ltr" opacity=".75"> - <path id="arrow" d="M19.925 14.937l-2.391-6.901-1.48 2.329c-.964-.845-2.699-1.85-5.513-1.823-4.887.046-6.524 4.244-6.524 4.244s2.753-2.639 6.925-1.949c1.729.286 3.007 1.206 3.675 1.791l-1.474 2.319 6.782-.01z" fill-rule="evenodd" clip-rule="evenodd"/> + <path id="arrow" d="M19.925 14.937l-2.391-6.901-1.48 2.329c-.964-.845-2.699-1.85-5.513-1.823-4.887.046-6.524 4.244-6.524 4.244s2.753-2.639 6.925-1.949c1.729.286 3.007 1.206 3.675 1.791l-1.474 2.319 6.782-.01z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/arched-arrow-rtl.svg b/lib/oojs-ui/images/icons/arched-arrow-rtl.svg index 50541d2..b16c1b4 100644 --- a/lib/oojs-ui/images/icons/arched-arrow-rtl.svg +++ b/lib/oojs-ui/images/icons/arched-arrow-rtl.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="arched-arrow-rtl" opacity=".75"> - <path id="arrow" d="M13.401 8.542c-2.814-.027-4.549.978-5.513 1.823l-1.48-2.329-2.391 6.901 6.782.009-1.474-2.319c.668-.584 1.945-1.504 3.675-1.791 4.172-.69 6.925 1.949 6.925 1.949s-1.637-4.197-6.524-4.243z" fill-rule="evenodd" clip-rule="evenodd"/> + <path id="arrow" d="M13.401 8.542c-2.814-.027-4.549.978-5.513 1.823l-1.48-2.329-2.391 6.901 6.782.009-1.474-2.319c.668-.584 1.945-1.504 3.675-1.791 4.172-.69 6.925 1.949 6.925 1.949s-1.637-4.197-6.524-4.243z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/clear.svg b/lib/oojs-ui/images/icons/clear.svg index 484a104..8409c67 100644 --- a/lib/oojs-ui/images/icons/clear.svg +++ b/lib/oojs-ui/images/icons/clear.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="clear" opacity=".75"> - <path id="circle_with_strike" d="M11.999 5.022c-3.853 0-6.977 3.124-6.977 6.978 0 3.853 3.124 6.978 6.977 6.978 3.854 0 6.979-3.125 6.979-6.978 0-3.854-3.125-6.978-6.979-6.978zm-5.113 6.978c0-1.092.572-3.25.93-2.929l7.113 7.113c.488.525-1.837.931-2.93.931-2.825-.001-5.113-2.291-5.113-5.115zm9.298 2.929l-7.114-7.113c-.445-.483 1.837-.931 2.929-.931 2.827 0 5.115 2.289 5.115 5.114 0 1.093-.364 3.543-.93 2.93z" fill-rule="evenodd" clip-rule="evenodd"/> + <path id="circle-with-strike" d="M11.999 5.022c-3.853 0-6.977 3.124-6.977 6.978 0 3.853 3.124 6.978 6.977 6.978 3.854 0 6.979-3.125 6.979-6.978 0-3.854-3.125-6.978-6.979-6.978zm-5.113 6.978c0-1.092.572-3.25.93-2.929l7.113 7.113c.488.525-1.837.931-2.93.931-2.825-.001-5.113-2.291-5.113-5.115zm9.298 2.929l-7.114-7.113c-.445-.483 1.837-.931 2.929-.931 2.827 0 5.115 2.289 5.115 5.114 0 1.093-.364 3.543-.93 2.93z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/close.svg b/lib/oojs-ui/images/icons/close.svg index 15278e9..3c0ab46 100644 --- a/lib/oojs-ui/images/icons/close.svg +++ b/lib/oojs-ui/images/icons/close.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="close" opacity=".75"> - <path id="x" fill-rule="evenodd" clip-rule="evenodd" d="M18.717 6.697l-1.414-1.414-5.303 5.303-5.303-5.303-1.414 1.414 5.303 5.303-5.303 5.303 1.414 1.414 5.303-5.303 5.303 5.303 1.414-1.414-5.303-5.303z"/> + <path id="x" d="M18.717 6.697l-1.414-1.414-5.303 5.303-5.303-5.303-1.414 1.414 5.303 5.303-5.303 5.303 1.414 1.414 5.303-5.303 5.303 5.303 1.414-1.414-5.303-5.303z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/collapse.svg b/lib/oojs-ui/images/icons/collapse.svg index 97bdc50..c677e9e 100644 --- a/lib/oojs-ui/images/icons/collapse.svg +++ b/lib/oojs-ui/images/icons/collapse.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="collapse" opacity=".75"> - <path id="arrow" fill-rule="evenodd" clip-rule="evenodd" d="M6.697 15.714l5.303-5.302 5.303 5.302 1.414-1.414-6.717-6.717-6.717 6.717z"/> + <path id="arrow" d="M6.697 15.714l5.303-5.302 5.303 5.302 1.414-1.414-6.717-6.717-6.717 6.717z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/comment.svg b/lib/oojs-ui/images/icons/comment.svg index ebb038e..0348035 100644 --- a/lib/oojs-ui/images/icons/comment.svg +++ b/lib/oojs-ui/images/icons/comment.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="comment" opacity=".75"> - <path id="speech_bubble" d="M15 6h-6c-1.657 0-3 1.344-3 3v4c0 1.656 1.343 3 3 3v3l3-3h3c1.657 0 3-1.344 3-3v-4c0-1.656-1.343-3-3-3z" fill-rule="evenodd" clip-rule="evenodd"/> + <path id="speech-bubble" d="M15 6h-6c-1.657 0-3 1.344-3 3v4c0 1.656 1.343 3 3 3v3l3-3h3c1.657 0 3-1.344 3-3v-4c0-1.656-1.343-3-3-3z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/expand.svg b/lib/oojs-ui/images/icons/expand.svg index 81c2ec0..f41b9f9 100644 --- a/lib/oojs-ui/images/icons/expand.svg +++ b/lib/oojs-ui/images/icons/expand.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="expand" opacity=".75"> - <path id="arrow" fill-rule="evenodd" clip-rule="evenodd" d="M17.303 8.283l-5.303 5.303-5.303-5.303-1.414 1.414 6.717 6.717 6.717-6.717z"/> + <path id="arrow" d="M17.303 8.283l-5.303 5.303-5.303-5.303-1.414 1.414 6.717 6.717 6.717-6.717z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/help.svg b/lib/oojs-ui/images/icons/help.svg index 09117e1..ce129a7 100644 --- a/lib/oojs-ui/images/icons/help.svg +++ b/lib/oojs-ui/images/icons/help.svg @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="help" opacity=".75" fill-rule="evenodd" clip-rule="evenodd"> + <g id="help" opacity=".75"> <path id="circle" d="M12.001 2.085c-5.478 0-9.916 4.438-9.916 9.916 0 5.476 4.438 9.914 9.916 9.914 5.476 0 9.914-4.438 9.914-9.914 0-5.478-4.438-9.916-9.914-9.916zm.001 18c-4.465 0-8.084-3.619-8.084-8.083 0-4.465 3.619-8.084 8.084-8.084 4.464 0 8.083 3.619 8.083 8.084 0 4.464-3.619 8.083-8.083 8.083z"/> - <g id="question_mark"> + <g id="question-mark"> <path id="top" d="M11.766 6.688c-2.5 0-3.219 2.188-3.219 2.188l1.411.854s.298-.791.901-1.229c.516-.375 1.625-.625 2.219.125.701.885-.17 1.587-1.078 2.719-.953 1.186-1 3.655-1 3.655h1.969s.135-2.318 1.041-3.381c.603-.707 1.443-1.338 1.443-2.494s-1.187-2.437-3.687-2.437z"/> <path id="bottom" d="M11 16h2v2h-2z"/> </g> diff --git a/lib/oojs-ui/images/icons/history.svg b/lib/oojs-ui/images/icons/history.svg index a89e257..91e072f 100644 --- a/lib/oojs-ui/images/icons/history.svg +++ b/lib/oojs-ui/images/icons/history.svg @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="history" opacity=".75" fill-rule="evenodd" clip-rule="evenodd"> - <path id="clock_hands" d="M17.26 15.076s-2.385-1.935-4.005-3.062c.72-2.397 1.702-6.559 1.702-6.559s-4.35 5.363-4.877 6.699c-.463 1.168 1.459 2.209 2.346 1.678 1.9.551 4.834 1.244 4.834 1.244z"/> + <g id="history" opacity=".75"> + <path id="clock-hands" d="M17.26 15.076s-2.385-1.935-4.005-3.062c.72-2.397 1.702-6.559 1.702-6.559s-4.35 5.363-4.877 6.699c-.463 1.168 1.459 2.209 2.346 1.678 1.9.551 4.834 1.244 4.834 1.244z"/> <path id="arrow" d="M12.086 2.085c-5.478 0-9.916 4.438-9.916 9.916 0 1.783.476 3.454 1.301 4.898l-2.223 2.04h5.688v-5.219l-2.066 1.896c-.55-1.088-.866-2.312-.866-3.615 0-4.465 3.619-8.084 8.084-8.084 4.464 0 8.083 3.619 8.083 8.084 0 4.464-3.619 8.083-8.083 8.083-1.145 0-2.228-.247-3.213-.678l-.833 1.634c1.235.557 2.602.874 4.045.874 5.476 0 9.914-4.438 9.914-9.914-.001-5.477-4.439-9.915-9.915-9.915z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/info.svg b/lib/oojs-ui/images/icons/info.svg index 22ad9be..9ba57d7 100644 --- a/lib/oojs-ui/images/icons/info.svg +++ b/lib/oojs-ui/images/icons/info.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="help" opacity=".75"> - <path d="M11.499 17c-3.036 0-5.499-2.464-5.499-5.5 0-3.037 2.462-5.5 5.499-5.5 3.037 0 5.501 2.462 5.501 5.5 0 3.036-2.464 5.5-5.501 5.5zm.002-12c-3.591 0-6.501 2.91-6.501 6.5s2.91 6.5 6.501 6.5c3.588 0 6.499-2.911 6.499-6.5s-2.911-6.5-6.499-6.5zM12 10v4h1v1h-3v-1h1v-3h-1v-1zM11 8h1v1h-1z"/> + <g id="info" opacity=".75"> + <path id="circled-i" d="M11.499 17c-3.036 0-5.499-2.464-5.499-5.5 0-3.037 2.462-5.5 5.499-5.5 3.037 0 5.501 2.462 5.501 5.5 0 3.036-2.464 5.5-5.501 5.5zm.002-12c-3.591 0-6.501 2.91-6.501 6.5s2.91 6.5 6.501 6.5c3.588 0 6.499-2.911 6.499-6.5s-2.911-6.5-6.499-6.5zM12 10v4h1v1h-3v-1h1v-3h-1v-1zM11 8h1v1h-1z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/link.svg b/lib/oojs-ui/images/icons/link.svg index 7d8a1ef..fcb06be 100644 --- a/lib/oojs-ui/images/icons/link.svg +++ b/lib/oojs-ui/images/icons/link.svg @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="link" opacity=".75"> <path id="right" d="M19.188 12.001c0 1.1-.891 2.015-1.988 2.015l-4.195-.015c.538 1.088.963 1.999 1.997 1.999h3c1.656 0 2.998-2.343 2.998-4s-1.342-4-2.998-4h-3c-1.034 0-1.459.911-1.998 1.999l4.195-.015c1.098 0 1.989.917 1.989 2.017z"/> diff --git a/lib/oojs-ui/images/icons/menu.svg b/lib/oojs-ui/images/icons/menu.svg index 75866f6..2d04789 100644 --- a/lib/oojs-ui/images/icons/menu.svg +++ b/lib/oojs-ui/images/icons/menu.svg @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="menu" opacity=".75"> <path id="lines" d="M6 15h12c.553 0 1 .447 1 1v1c0 .553-.447 1-1 1h-12c-.553 0-1-.447-1-1v-1c0-.553.447-1 1-1zm-1-4v1c0 .553.447 1 1 1h12c.553 0 1-.447 1-1v-1c0-.553-.447-1-1-1h-12c-.553 0-1 .447-1 1zm0-5v1c0 .553.447 1 1 1h12c.553 0 1-.447 1-1v-1c0-.553-.447-1-1-1h-12c-.553 0-1 .447-1 1z"/> diff --git a/lib/oojs-ui/images/icons/move-ltr.svg b/lib/oojs-ui/images/icons/move-ltr.svg index 3c19c4f..eea75d8 100644 --- a/lib/oojs-ui/images/icons/move-ltr.svg +++ b/lib/oojs-ui/images/icons/move-ltr.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="move-ltr" opacity=".75"> - <path id="arrow" fill-rule="evenodd" clip-rule="evenodd" d="M8.935 7.181l5.302 5.302-5.302 5.303 1.414 1.414 6.716-6.717-6.716-6.716z"/> + <path id="arrow" d="M8.935 7.181l5.302 5.302-5.302 5.303 1.414 1.414 6.716-6.717-6.716-6.716z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/move-rtl.svg b/lib/oojs-ui/images/icons/move-rtl.svg index d9f35c1..2dc5eaf 100644 --- a/lib/oojs-ui/images/icons/move-rtl.svg +++ b/lib/oojs-ui/images/icons/move-rtl.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="move-rtl" opacity=".75"> - <path id="arrow_9_" fill-rule="evenodd" clip-rule="evenodd" d="M15.065 17.786l-5.302-5.303 5.302-5.302-1.414-1.414-6.716 6.716 6.716 6.717z"/> + <path id="arrow" d="M15.065 17.786l-5.302-5.303 5.302-5.302-1.414-1.414-6.716 6.716 6.716 6.717z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/picture.svg b/lib/oojs-ui/images/icons/picture.svg index cd4c0f7..4862fbc 100644 --- a/lib/oojs-ui/images/icons/picture.svg +++ b/lib/oojs-ui/images/icons/picture.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="picture" opacity=".75" fill-rule="evenodd" clip-rule="evenodd"> + <g id="picture" opacity=".75"> <path id="frame" d="M18 4h-12c-2-.007-3 .993-3 2.993l.014 9.007c-.014 2 .986 2.988 2.986 3h12c2-.012 2.994-1 3-3.006v-9.001c-.006-2-1-3-3-2.993zm1 13h-14v-11h14v11z"/> <path id="mountains" d="M6 13.5l3.5-3.5 2.328 2.312-1.312 1.094.875 1.032 4.109-3.438 2.5 2v3h-12z"/> <path id="sky" d="M6 12l3.516-4.156 3.046 3.172 2.938-2.016 2.5 2v-4h-12z"/> diff --git a/lib/oojs-ui/images/icons/remove-item.svg b/lib/oojs-ui/images/icons/remove-item.svg index 5dd607b..723e70f 100644 --- a/lib/oojs-ui/images/icons/remove-item.svg +++ b/lib/oojs-ui/images/icons/remove-item.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="remove-item"> - <path d="M8 11h8v2h-8z"/> + <path id="minus" d="M8 11h8v2h-8z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/remove.svg b/lib/oojs-ui/images/icons/remove.svg index 06c89d7..61f4d2d 100644 --- a/lib/oojs-ui/images/icons/remove.svg +++ b/lib/oojs-ui/images/icons/remove.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="remove" opacity=".75"> - <path id="trash_can" d="M12 10h-1v6h1v-6zm-2 0h-1v6h1v-6zm4 0h-1v6h1v-6zm0-4v-1h-5v1h-3v3h1v7.966l1 1.031v-.074.077h6.984l.016-.018v.015l1-1.031v-7.966h1v-3h-3zm1 11h-7v-8h7v8zm1-9h-9v-1h9v1z" fill-rule="evenodd" clip-rule="evenodd"/> + <path id="trash-can" d="M12 10h-1v6h1v-6zm-2 0h-1v6h1v-6zm4 0h-1v6h1v-6zm0-4v-1h-5v1h-3v3h1v7.966l1 1.031v-.074.077h6.984l.016-.018v.015l1-1.031v-7.966h1v-3h-3zm1 11h-7v-8h7v8zm1-9h-9v-1h9v1z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/search.svg b/lib/oojs-ui/images/icons/search.svg index ff7144c..75b38c8 100644 --- a/lib/oojs-ui/images/icons/search.svg +++ b/lib/oojs-ui/images/icons/search.svg @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="search" opacity=".75"> - <path id="magnifying_glass" d="M16.021 15.96l-2.374-2.375-.169-.099c.403-.566.643-1.26.643-2.009-.001-1.92-1.558-3.477-3.477-3.477-1.921 0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.749 0 1.442-.239 2.01-.643l.098.169 2.375 2.374c.19.189.543.143.79-.104s.293-.601.104-.791zm-5.377-2.27c-1.221 0-2.213-.991-2.213-2.213 0-1.221.992-2.213 2.213-2.213 1.222 0 2.213.992 2.213 2.213-.001 1.222-.992 2.213-2.213 2.213z"/> + <path id="magnifying-glass" d="M16.021 15.96l-2.374-2.375-.169-.099c.403-.566.643-1.26.643-2.009-.001-1.92-1.558-3.477-3.477-3.477-1.921 0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.749 0 1.442-.239 2.01-.643l.098.169 2.375 2.374c.19.189.543.143.79-.104s.293-.601.104-.791zm-5.377-2.27c-1.221 0-2.213-.991-2.213-2.213 0-1.221.992-2.213 2.213-2.213 1.222 0 2.213.992 2.213 2.213-.001 1.222-.992 2.213-2.213 2.213z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/settings.svg b/lib/oojs-ui/images/icons/settings.svg index cbc4efc..6e45b60 100644 --- a/lib/oojs-ui/images/icons/settings.svg +++ b/lib/oojs-ui/images/icons/settings.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="settings" opacity=".75"> - <path d="M3 4h3v2h-3zM12 4h9v2h-9zM8 3h2c.552 0 1 .448 1 1v2c0 .552-.448 1-1 1h-2c-.552 0-1-.448-1-1v-2c0-.552.448-1 1-1zM3 11h9v2h-9zM18 11h3v2h-3zM14 10h2c.552 0 1 .448 1 1v2c0 .552-.448 1-1 1h-2c-.552 0-1-.448-1-1v-2c0-.552.448-1 1-1zM3 18h6v2h-6zM15 18h6v2h-6zM11 17h2c.552 0 1 .448 1 1v2c0 .552-.448 1-1 1h-2c-.552 0-1-.448-1-1v-2c0-.552.448-1 1-1z"/> + <path id="gear" d="M3 4h3v2h-3zM12 4h9v2h-9zM8 3h2c.552 0 1 .448 1 1v2c0 .552-.448 1-1 1h-2c-.552 0-1-.448-1-1v-2c0-.552.448-1 1-1zM3 11h9v2h-9zM18 11h3v2h-3zM14 10h2c.552 0 1 .448 1 1v2c0 .552-.448 1-1 1h-2c-.552 0-1-.448-1-1v-2c0-.552.448-1 1-1zM3 18h6v2h-6zM15 18h6v2h-6zM11 17h2c.552 0 1 .448 1 1v2c0 .552-.448 1-1 1h-2c-.552 0-1-.448-1-1v-2c0-.552.448-1 1-1z"/> </g> </svg> diff --git a/lib/oojs-ui/images/icons/tag.svg b/lib/oojs-ui/images/icons/tag.svg index 496e7fc..1d61b81 100644 --- a/lib/oojs-ui/images/icons/tag.svg +++ b/lib/oojs-ui/images/icons/tag.svg @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="tag" opacity=".75"> <path d="M18.748 11.717c.389.389.389 1.025 0 1.414l-4.949 4.95c-.389.389-1.025.389-1.414 0l-6.01-6.01c-.389-.389-.707-1.157-.707-1.707l-.001-4.364c0-.55.45-1 1-1h4.364c.55 0 1.318.318 1.707.707l6.01 6.01zm-10.644-4.261c-.579.576-.578 1.514-.001 2.093.578.577 1.516.577 2.095.001.576-.578.576-1.517 0-2.095-.581-.576-1.518-.577-2.094.001z"/> diff --git a/lib/oojs-ui/images/icons/window.svg b/lib/oojs-ui/images/icons/window.svg index ad12773..802f295 100644 --- a/lib/oojs-ui/images/icons/window.svg +++ b/lib/oojs-ui/images/icons/window.svg @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?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="window" opacity=".75"> <path id="title" d="M7 10h10v1h-10z"/> diff --git a/lib/oojs-ui/images/indicators/alert.svg b/lib/oojs-ui/images/indicators/alert.svg index 7cfde44..e2e49a8 100644 --- a/lib/oojs-ui/images/indicators/alert.svg +++ b/lib/oojs-ui/images/indicators/alert.svg @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"> - <g id="deprecated" opacity=".75"> + <g id="alert" opacity=".75"> <path d="M6 12c-3.314 0-6-2.686-6-6s2.686-6 6-6 6 2.686 6 6-2.686 6-6 6zm-1-5h2v-5h-2zm0 3h2v-2h-2z"/> </g> </svg> diff --git a/lib/oojs-ui/images/indicators/arrow-down.svg b/lib/oojs-ui/images/indicators/arrow-down.svg index d345ec0..55670de 100644 --- a/lib/oojs-ui/images/indicators/arrow-down.svg +++ b/lib/oojs-ui/images/indicators/arrow-down.svg @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?xml version="1.0" encoding="utf-8"?> <svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"> <g id="down" opacity=".75"> <path id="arrow" d="M2 3l3.5 6 3.5-6z"/> diff --git a/lib/oojs-ui/images/indicators/arrow-up.svg b/lib/oojs-ui/images/indicators/arrow-up.svg index 78e0115..b9d725e 100644 --- a/lib/oojs-ui/images/indicators/arrow-up.svg +++ b/lib/oojs-ui/images/indicators/arrow-up.svg @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="iso-8859-1"?> +<?xml version="1.0" encoding="utf-8"?> <svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"> <g id="up" opacity=".75"> <path id="arrow" d="M5.5 2l-3.5 6h7z"/> diff --git a/lib/oojs-ui/oojs-ui-agora.css b/lib/oojs-ui/oojs-ui-agora.css index e9e16e0..89a474e 100644 --- a/lib/oojs-ui/oojs-ui-agora.css +++ b/lib/oojs-ui/oojs-ui-agora.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (a7ce4d48d9) + * OOjs UI v0.1.0-pre (e9cf571db2) * 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-07-23T23:47:29Z + * Date: 2014-07-28T21:47:23Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, diff --git a/lib/oojs-ui/oojs-ui-agora.rtl.css b/lib/oojs-ui/oojs-ui-agora.rtl.css index f148bcd..1346044 100644 --- a/lib/oojs-ui/oojs-ui-agora.rtl.css +++ b/lib/oojs-ui/oojs-ui-agora.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (a7ce4d48d9) + * OOjs UI v0.1.0-pre (e9cf571db2) * 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-07-23T23:47:29Z + * Date: 2014-07-28T21:47:23Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css index 87a0707..ed0f910 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 (a7ce4d48d9) + * OOjs UI v0.1.0-pre (e9cf571db2) * 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-07-23T23:47:29Z + * Date: 2014-07-28T21:47:23Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css index f9341af..18698f0 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 (a7ce4d48d9) + * OOjs UI v0.1.0-pre (e9cf571db2) * 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-07-23T23:47:29Z + * Date: 2014-07-28T21:47:23Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js index f9b608f..a68ce44 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 (a7ce4d48d9) + * OOjs UI v0.1.0-pre (e9cf571db2) * 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-07-23T23:47:29Z + * Date: 2014-07-28T21:47:23Z */ ( function ( OO ) { @@ -26,22 +26,22 @@ * @property {Object} */ OO.ui.Keys = { - 'UNDEFINED': 0, - 'BACKSPACE': 8, - 'DELETE': 46, - 'LEFT': 37, - 'RIGHT': 39, - 'UP': 38, - 'DOWN': 40, - 'ENTER': 13, - 'END': 35, - 'HOME': 36, - 'TAB': 9, - 'PAGEUP': 33, - 'PAGEDOWN': 34, - 'ESCAPE': 27, - 'SHIFT': 16, - 'SPACE': 32 + UNDEFINED: 0, + BACKSPACE: 8, + DELETE: 46, + LEFT: 37, + RIGHT: 39, + UP: 38, + DOWN: 40, + ENTER: 13, + END: 35, + HOME: 36, + TAB: 9, + PAGEUP: 33, + PAGEDOWN: 34, + ESCAPE: 27, + SHIFT: 16, + SPACE: 32 }; /** @@ -208,9 +208,9 @@ // Properties this.list = []; this.categories = { - 'actions': 'getAction', - 'flags': 'getFlags', - 'modes': 'getModes' + actions: 'getAction', + flags: 'getFlags', + modes: 'getModes' }; this.categorized = {}; this.special = {}; @@ -469,9 +469,9 @@ for ( i = 0, len = actions.length; i < len; i++ ) { action = actions[i]; action.connect( this, { - 'click': [ 'emit', 'click', action ], - 'resize': [ 'emit', 'resize', action ], - 'toggle': [ 'onActionChange' ] + click: [ 'emit', 'click', action ], + resize: [ 'emit', 'resize', action ], + toggle: [ 'onActionChange' ] } ); this.list.push( action ); } @@ -746,7 +746,7 @@ to = window; } if ( !offset ) { - offset = { 'top': 0, 'left': 0 }; + offset = { top: 0, left: 0 }; } if ( from.parent === from ) { return offset; @@ -784,7 +784,7 @@ OO.ui.Element.getRelativePosition = function ( $from, $to ) { var from = $from.offset(), to = $to.offset(); - return { 'top': Math.round( from.top - to.top ), 'left': Math.round( from.left - to.left ) }; + return { top: Math.round( from.top - to.top ), left: Math.round( from.left - to.left ) }; }; /** @@ -807,10 +807,10 @@ right = parseFloat( style ? style.borderRightWidth : $el.css( 'borderRightWidth' ) ) || 0; return { - 'top': Math.round( top ), - 'left': Math.round( left ), - 'bottom': Math.round( bottom ), - 'right': Math.round( right ) + top: Math.round( top ), + left: Math.round( left ), + bottom: Math.round( bottom ), + right: Math.round( right ) }; }; @@ -829,32 +829,32 @@ if ( win === el || el === doc.documentElement ) { $win = $( win ); return { - 'borders': { 'top': 0, 'left': 0, 'bottom': 0, 'right': 0 }, - 'scroll': { - 'top': $win.scrollTop(), - 'left': $win.scrollLeft() + borders: { top: 0, left: 0, bottom: 0, right: 0 }, + scroll: { + top: $win.scrollTop(), + left: $win.scrollLeft() }, - 'scrollbar': { 'right': 0, 'bottom': 0 }, - 'rect': { - 'top': 0, - 'left': 0, - 'bottom': $win.innerHeight(), - 'right': $win.innerWidth() + scrollbar: { right: 0, bottom: 0 }, + rect: { + top: 0, + left: 0, + bottom: $win.innerHeight(), + right: $win.innerWidth() } }; } else { $el = $( el ); return { - 'borders': this.getBorders( el ), - 'scroll': { - 'top': $el.scrollTop(), - 'left': $el.scrollLeft() + borders: this.getBorders( el ), + scroll: { + top: $el.scrollTop(), + left: $el.scrollLeft() }, - 'scrollbar': { - 'right': $el.innerWidth() - el.clientWidth, - 'bottom': $el.innerHeight() - el.clientHeight + scrollbar: { + right: $el.innerWidth() - el.clientWidth, + bottom: $el.innerHeight() - el.clientHeight }, - 'rect': el.getBoundingClientRect() + rect: el.getBoundingClientRect() }; } }; @@ -922,18 +922,18 @@ if ( $sc.is( 'body' ) ) { // If the scrollable container is the <body> this is easy rel = { - 'top': eld.rect.top, - 'bottom': $win.innerHeight() - eld.rect.bottom, - 'left': eld.rect.left, - 'right': $win.innerWidth() - eld.rect.right + top: eld.rect.top, + bottom: $win.innerHeight() - eld.rect.bottom, + left: eld.rect.left, + right: $win.innerWidth() - eld.rect.right }; } else { // Otherwise, we have to subtract el's coordinates from sc's coordinates rel = { - 'top': eld.rect.top - ( scd.rect.top + scd.borders.top ), - 'bottom': scd.rect.bottom - scd.borders.bottom - scd.scrollbar.bottom - eld.rect.bottom, - 'left': eld.rect.left - ( scd.rect.left + scd.borders.left ), - 'right': scd.rect.right - scd.borders.right - scd.scrollbar.right - eld.rect.right + top: eld.rect.top - ( scd.rect.top + scd.borders.top ), + bottom: scd.rect.bottom - scd.borders.bottom - scd.scrollbar.bottom - eld.rect.bottom, + left: eld.rect.left - ( scd.rect.left + scd.borders.left ), + right: scd.rect.right - scd.borders.right - scd.scrollbar.right - eld.rect.right }; } @@ -1118,7 +1118,7 @@ // Initialize this.$element .addClass( 'oo-ui-frame' ) - .attr( { 'frameborder': 0, 'scrolling': 'no' } ); + .attr( { frameborder: 0, scrolling: 'no' } ); }; @@ -1324,7 +1324,7 @@ * @chainable */ OO.ui.Frame.prototype.setSize = function ( width, height ) { - this.$element.css( { 'width': width, 'height': height } ); + this.$element.css( { width: width, height: height } ); return this; }; @@ -1372,7 +1372,7 @@ */ OO.ui.Widget = function OoUiWidget( config ) { // Initialize config - config = $.extend( { 'disabled': false }, config ); + config = $.extend( { disabled: false }, config ); // Parent constructor OO.ui.Widget.super.call( this, config ); @@ -1546,7 +1546,7 @@ this.opened = null; this.timing = null; this.size = config.size || this.constructor.static.size; - this.frame = new OO.ui.Frame( { '$': this.$ } ); + this.frame = new OO.ui.Frame( { $: this.$ } ); this.$frame = this.$( '<div>' ); this.$ = function () { throw new Error( 'this.$() cannot be used until the frame has been initialized.' ); @@ -1800,14 +1800,14 @@ OO.ui.Window.prototype.setDimensions = function ( dim ) { // Apply width before height so height is not based on wrapping content using the wrong width this.$frame.css( { - 'width': dim.width || '', - 'min-width': dim.minWidth || '', - 'max-width': dim.maxWidth || '' + width: dim.width || '', + minWidth: dim.minWidth || '', + maxWidth: dim.maxWidth || '' } ); this.$frame.css( { - 'height': ( dim.height !== undefined ? dim.height : this.getContentHeight() ) || '', - 'min-height': dim.minHeight || '', - 'max-height': dim.maxHeight || '' + height: ( dim.height !== undefined ? dim.height : this.getContentHeight() ) || '', + minHeight: dim.minHeight || '', + maxHeight: dim.maxHeight || '' } ); return this; }; @@ -2024,9 +2024,9 @@ // Events this.actions.connect( this, { - 'click': 'onActionClick', - 'resize': 'onActionResize', - 'change': 'onActionsChange' + click: 'onActionClick', + resize: 'onActionResize', + change: 'onActionsChange' } ); // Initialization @@ -2188,7 +2188,7 @@ ); for ( i = 0, len = actions.length; i < len; i++ ) { items.push( - new OO.ui.ActionWidget( $.extend( { '$': this.$ }, actions[i] ) ) + new OO.ui.ActionWidget( $.extend( { $: this.$ }, actions[i] ) ) ); } this.actions.add( items ); @@ -2215,7 +2215,7 @@ OO.ui.Dialog.super.prototype.initialize.call( this ); // Properties - this.title = new OO.ui.LabelWidget( { '$': this.$ } ); + this.title = new OO.ui.LabelWidget( { $: this.$ } ); // Events if ( this.constructor.static.escapable ) { @@ -2321,7 +2321,7 @@ * * - {@link #closeWindow} or {@link OO.ui.Window#close} methods are used to start closing * - `opened` promise is resolved with `closing` promise - * - {@link #event-opening} is emitted with `closing` promise + * - {@link #event-closing} is emitted with `closing` promise * - {@link #getHoldDelay} is called the returned value is used to time a pause in execution * - {@link OO.ui.Window#getHoldProcess} method is called on the window and its result executed * - `hold` progress notification is emitted from opening promise @@ -2416,19 +2416,19 @@ * @property {Object} */ OO.ui.WindowManager.static.sizes = { - 'small': { - 'width': 300 + small: { + width: 300 }, - 'medium': { - 'width': 500 + medium: { + width: 500 }, - 'large': { - 'width': 700 + large: { + width: 700 }, - 'full': { + full: { // These can be non-numeric because they are never used in calculations - 'width': '100%', - 'height': '100%' + width: '100%', + height: '100%' } }; @@ -2606,7 +2606,7 @@ 'Cannot auto-instantiate window: symbolic name is unrecognized by the factory' ) ); } else { - win = this.factory.create( name, this, { '$': this.$ } ); + win = this.factory.create( name, this, { $: this.$ } ); this.addWindows( [ win ] ).then( OO.ui.bind( deferred.resolve, deferred, win ), deferred.reject @@ -2679,11 +2679,11 @@ if ( manager.modal ) { manager.$( manager.getElementDocument() ).on( { // Prevent scrolling by keys in top-level window - 'keydown': manager.onDocumentKeyDownHandler + keydown: manager.onDocumentKeyDownHandler } ); manager.$( manager.getElementWindow() ).on( { // Prevent scrolling by wheel in top-level window - 'mousewheel': manager.onWindowMouseWheelHandler, + mousewheel: manager.onWindowMouseWheelHandler, // Start listening for top-level window dimension changes 'orientationchange resize': manager.onWindowResizeHandler } ); @@ -2699,10 +2699,10 @@ manager.updateWindowSize( win ); setTimeout( function () { win.setup( data ).then( function () { - manager.opening.notify( { 'state': 'setup' } ); + manager.opening.notify( { state: 'setup' } ); setTimeout( function () { win.ready( data ).then( function () { - manager.opening.notify( { 'state': 'ready' } ); + manager.opening.notify( { state: 'ready' } ); manager.opening = null; manager.opened = $.Deferred(); opening.resolve( manager.opened.promise(), data ); @@ -2769,18 +2769,18 @@ opened.resolve( closing.promise(), data ); setTimeout( function () { win.hold( data ).then( function () { - closing.notify( { 'state': 'hold' } ); + closing.notify( { state: 'hold' } ); setTimeout( function () { win.teardown( data ).then( function () { - closing.notify( { 'state': 'teardown' } ); + closing.notify( { state: 'teardown' } ); if ( manager.modal ) { manager.$( manager.getElementDocument() ).off( { // Allow scrolling by keys in top-level window - 'keydown': manager.onDocumentKeyDownHandler + keydown: manager.onDocumentKeyDownHandler } ); manager.$( manager.getElementWindow() ).off( { // Allow scrolling by wheel in top-level window - 'mousewheel': manager.onWindowMouseWheelHandler, + mousewheel: manager.onWindowMouseWheelHandler, // Stop listening for top-level window dimension changes 'orientationchange resize': manager.onWindowResizeHandler } ); @@ -3091,16 +3091,16 @@ OO.ui.Process.prototype.createStep = function ( step, context ) { if ( typeof step === 'number' || $.isFunction( step.promise ) ) { return { - 'callback': function () { + callback: function () { return step; }, - 'context': null + context: null }; } if ( $.isFunction( step ) ) { return { - 'callback': step, - 'context': context + callback: step, + context: context }; } throw new Error( 'Cannot create process step: number, promise or function expected' ); @@ -3176,8 +3176,8 @@ * * Tools can be specified in the following ways: * - * - A specific tool: `{ 'name': 'tool-name' }` or `'tool-name'` - * - All tools in a group: `{ 'group': 'group-name' }` + * - A specific tool: `{ name: 'tool-name' }` or `'tool-name'` + * - All tools in a group: `{ group: 'group-name' }` * - All tools: `'*'` * * @private @@ -3210,7 +3210,7 @@ item = collection[i]; // Allow plain strings as shorthand for named tools if ( typeof item === 'string' ) { - item = { 'name': item }; + item = { name: item }; } if ( OO.isPlainObject( item ) ) { if ( item.group ) { @@ -3553,7 +3553,7 @@ var buffer = 10, cOffset = this.$clippable.offset(), $container = this.$clippableContainer.is( 'body' ) ? this.$clippableWindow : this.$clippableContainer, - ccOffset = $container.offset() || { 'top': 0, 'left': 0 }, + ccOffset = $container.offset() || { top: 0, left: 0 }, ccHeight = $container.innerHeight() - buffer, ccWidth = $container.innerWidth() - buffer, scrollTop = this.$clippableScroller.scrollTop(), @@ -3566,18 +3566,18 @@ clipHeight = desiredHeight < naturalHeight; if ( clipWidth ) { - this.$clippable.css( { 'overflow-x': 'auto', 'width': desiredWidth } ); + this.$clippable.css( { overflowX: 'auto', width: desiredWidth } ); } else { this.$clippable.css( 'width', this.idealWidth || '' ); this.$clippable.width(); // Force reflow for https://code.google.com/p/chromium/issues/detail?id=387290 - this.$clippable.css( 'overflow-x', '' ); + this.$clippable.css( 'overflowX', '' ); } if ( clipHeight ) { - this.$clippable.css( { 'overflow-y': 'auto', 'height': desiredHeight } ); + this.$clippable.css( { overflowY: 'auto', height: desiredHeight } ); } else { this.$clippable.css( 'height', this.idealHeight || '' ); this.$clippable.height(); // Force reflow for https://code.google.com/p/chromium/issues/detail?id=387290 - this.$clippable.css( 'overflow-y', '' ); + this.$clippable.css( 'overflowY', '' ); } this.clipped = clipWidth || clipHeight; @@ -3951,7 +3951,7 @@ * additional icon names keyed by language code. * * Example of i18n icon definition: - * { 'default': 'bold-a', 'en': 'bold-b', 'de': 'bold-f' } + * { default: 'bold-a', en: 'bold-b', de: 'bold-f' } * * @static * @inheritable @@ -4027,7 +4027,7 @@ // Initialization this.$indicator.addClass( 'oo-ui-indicatedElement-indicator' ); this.setIndicator( config.indicator || this.constructor.static.indicator ); - this.setIndicatorTitle( config.indicatorTitle || this.constructor.static.indicatorTitle ); + this.setIndicatorTitle( config.indicatorTitle || this.constructor.static.indicatorTitle ); }; /* Setup */ @@ -4211,7 +4211,7 @@ */ OO.ui.LabeledElement.prototype.fitLabel = function () { if ( this.$label.autoEllipsis && this.autoFitLabel ) { - this.$label.autoEllipsis( { 'hasSpan': false, 'tooltip': true } ); + this.$label.autoEllipsis( { hasSpan: false, tooltip: true } ); } return this; }; @@ -4233,9 +4233,9 @@ // Properties this.popup = new OO.ui.PopupWidget( $.extend( - { 'autoClose': true }, + { autoClose: true }, config.popup, - { '$': this.$, '$autoCloseIgnore': this.$element } + { $: this.$, $autoCloseIgnore: this.$element } ) ); }; @@ -4352,7 +4352,7 @@ this.title = null; // Events - this.toolbar.connect( this, { 'updateState': 'onUpdateState' } ); + this.toolbar.connect( this, { updateState: 'onUpdateState' } ); // Initialization this.$title.addClass( 'oo-ui-tool-title' ); @@ -4680,8 +4680,8 @@ * * Tools can be specified in the following ways: * - * - A specific tool: `{ 'name': 'tool-name' }` or `'tool-name'` - * - All tools in a group: `{ 'group': 'group-name' }` + * - A specific tool: `{ name: 'tool-name' }` or `'tool-name'` + * - All tools in a group: `{ group: 'group-name' }` * - All tools: `'*'` - Using this will make the group a list with a "More" label by default * * @param {Object.<string,Array>} groups List of tool group configurations @@ -4713,7 +4713,7 @@ // Check type has been registered type = this.getToolGroupFactory().lookup( group.type ) ? group.type : defaultType; items.push( - this.getToolGroupFactory().create( type, this, $.extend( { '$': this.$ }, group ) ) + this.getToolGroupFactory().create( type, this, $.extend( { $: this.$ }, group ) ) ); } this.addItems( items ); @@ -4788,8 +4788,8 @@ * * Tools can be specified in the following ways: * - * - A specific tool: `{ 'name': 'tool-name' }` or `'tool-name'` - * - All tools in a group: `{ 'group': 'group-name' }` + * - A specific tool: `{ name: 'tool-name' }` or `'tool-name'` + * - All tools in a group: `{ group: 'group-name' }` * - All tools: `'*'` * * @abstract @@ -4830,12 +4830,12 @@ this.$element.on( { 'mousedown touchstart': OO.ui.bind( this.onPointerDown, this ), 'mouseup touchend': OO.ui.bind( this.onPointerUp, this ), - 'mouseover': OO.ui.bind( this.onMouseOver, this ), - 'mouseout': OO.ui.bind( this.onMouseOut, this ) + mouseover: OO.ui.bind( this.onMouseOver, this ), + mouseout: OO.ui.bind( this.onMouseOut, this ) } ); - this.toolbar.getToolFactory().connect( this, { 'register': 'onToolFactoryRegister' } ); - this.aggregate( { 'disable': 'itemDisable' } ); - this.connect( this, { 'itemDisable': 'updateDisabled' } ); + this.toolbar.getToolFactory().connect( this, { register: 'onToolFactoryRegister' } ); + this.aggregate( { disable: 'itemDisable' } ); + this.connect( this, { itemDisable: 'updateDisabled' } ); // Initialization this.$group.addClass( 'oo-ui-toolGroup-tools' ); @@ -5163,8 +5163,8 @@ OO.ui.MessageDialog.static.message = null; OO.ui.MessageDialog.static.actions = [ - { 'action': 'accept', 'label': OO.ui.deferMsg( 'ooui-dialog-message-accept' ), 'flags': 'primary' }, - { 'action': 'reject', 'label': OO.ui.deferMsg( 'ooui-dialog-message-reject' ), 'flags': 'safe' } + { action: 'accept', label: OO.ui.deferMsg( 'ooui-dialog-message-accept' ), flags: 'primary' }, + { action: 'reject', label: OO.ui.deferMsg( 'ooui-dialog-message-reject' ), flags: 'safe' } ]; /* Methods */ @@ -5202,7 +5202,7 @@ OO.ui.MessageDialog.prototype.getActionProcess = function ( action ) { if ( action ) { return new OO.ui.Process( function () { - this.close( { 'action': action } ); + this.close( { action: action } ); }, this ); } return OO.ui.MessageDialog.super.prototype.getActionProcess.call( this, action ); @@ -5254,13 +5254,13 @@ // Properties this.$actions = this.$( '<div>' ); this.container = new OO.ui.PanelLayout( { - '$': this.$, 'scrollable': true, 'classes': [ 'oo-ui-messageDialog-container' ] + $: this.$, scrollable: true, classes: [ 'oo-ui-messageDialog-container' ] } ); this.text = new OO.ui.PanelLayout( { - '$': this.$, 'padded': true, 'expanded': false, 'classes': [ 'oo-ui-messageDialog-text' ] + $: this.$, padded: true, expanded: false, classes: [ 'oo-ui-messageDialog-text' ] } ); this.message = new OO.ui.LabelWidget( { - '$': this.$, 'classes': [ 'oo-ui-messageDialog-message' ] + $: this.$, classes: [ 'oo-ui-messageDialog-message' ] } ); // Initialization @@ -5410,19 +5410,19 @@ this.$primaryActions = this.$( '<div>' ); this.$otherActions = this.$( '<div>' ); this.dismissButton = new OO.ui.ButtonWidget( { - '$': this.$, - 'label': OO.ui.msg( 'ooui-dialog-process-dismiss' ) + $: this.$, + label: OO.ui.msg( 'ooui-dialog-process-dismiss' ) } ); this.retryButton = new OO.ui.ButtonWidget( { - '$': this.$, - 'label': OO.ui.msg( 'ooui-dialog-process-retry' ) + $: this.$, + label: OO.ui.msg( 'ooui-dialog-process-retry' ) } ); this.$errors = this.$( '<div>' ); this.$errorsTitle = this.$( '<div>' ); // Events - this.dismissButton.connect( this, { 'click': 'onDismissErrorButtonClick' } ); - this.retryButton.connect( this, { 'click': 'onRetryButtonClick' } ); + this.dismissButton.connect( this, { click: 'onDismissErrorButtonClick' } ); + this.retryButton.connect( this, { click: 'onRetryButtonClick' } ); // Initialization this.title.$element.addClass( 'oo-ui-processDialog-title' ); @@ -5497,7 +5497,7 @@ this.$safeActions.is( ':visible' ) ? this.$safeActions.width() : 0, this.$primaryActions.is( ':visible' ) ? this.$primaryActions.width() : 0 ); - this.$location.css( { 'padding-left': width, 'padding-right': width } ); + this.$location.css( { paddingLeft: width, paddingRight: width } ); return this; }; @@ -5565,31 +5565,31 @@ this.currentPageName = null; this.pages = {}; this.ignoreFocus = false; - this.stackLayout = new OO.ui.StackLayout( { '$': this.$, 'continuous': !!config.continuous } ); + this.stackLayout = new OO.ui.StackLayout( { $: this.$, continuous: !!config.continuous } ); this.autoFocus = config.autoFocus === undefined || !!config.autoFocus; this.outlineVisible = false; this.outlined = !!config.outlined; if ( this.outlined ) { this.editable = !!config.editable; this.outlineControlsWidget = null; - this.outlineWidget = new OO.ui.OutlineWidget( { '$': this.$ } ); - this.outlinePanel = new OO.ui.PanelLayout( { '$': this.$, 'scrollable': true } ); + this.outlineWidget = new OO.ui.OutlineWidget( { $: this.$ } ); + this.outlinePanel = new OO.ui.PanelLayout( { $: this.$, scrollable: true } ); this.gridLayout = new OO.ui.GridLayout( [ this.outlinePanel, this.stackLayout ], - { '$': this.$, 'widths': [ 1, 2 ] } + { $: this.$, widths: [ 1, 2 ] } ); this.outlineVisible = true; if ( this.editable ) { this.outlineControlsWidget = new OO.ui.OutlineControlsWidget( - this.outlineWidget, { '$': this.$ } + this.outlineWidget, { $: this.$ } ); } } // Events - this.stackLayout.connect( this, { 'set': 'onStackLayoutSet' } ); + this.stackLayout.connect( this, { set: 'onStackLayoutSet' } ); if ( this.outlined ) { - this.outlineWidget.connect( this, { 'select': 'onOutlineWidgetSelect' } ); + this.outlineWidget.connect( this, { select: 'onOutlineWidgetSelect' } ); } if ( this.autoFocus ) { // Event 'focus' does not bubble, but 'focusin' does @@ -5665,7 +5665,7 @@ OO.ui.BookletLayout.prototype.onStackLayoutSet = function ( page ) { var $input, layout = this; if ( page ) { - page.scrollElementIntoView( { 'complete': function () { + page.scrollElementIntoView( { complete: function () { if ( layout.autoFocus ) { // Set focus to the first input if nothing on the page is focused yet if ( !page.$element.find( ':focus' ).length ) { @@ -5845,7 +5845,7 @@ name = page.getName(); this.pages[page.getName()] = page; if ( this.outlined ) { - item = new OO.ui.OutlineItemWidget( name, page, { '$': this.$ } ); + item = new OO.ui.OutlineItemWidget( name, page, { $: this.$ } ); page.setOutlineItem( item ); items.push( item ); } @@ -5976,13 +5976,13 @@ * @mixins OO.ui.LabeledElement * * Available label alignment modes include: - * - 'left': Label is before the field and aligned away from it, best for when the user will be + * - left: Label is before the field and aligned away from it, best for when the user will be * scanning for a specific label in a form with many fields - * - 'right': Label is before the field and aligned toward it, best for forms the user is very + * - right: Label is before the field and aligned toward it, best for forms the user is very * familiar with and will tab through field checking quickly to verify which field they are in - * - 'top': Label is before the field and above it, best for when the use will need to fill out all + * - top: Label is before the field and above it, best for when the use will need to fill out all * fields from top to bottom in a form with few fields - * - 'inline': Label is after the field and aligned toward it, best for small boolean fields like + * - inline: Label is after the field and aligned toward it, best for small boolean fields like * checkboxes or radio buttons * * @constructor @@ -5994,7 +5994,7 @@ OO.ui.FieldLayout = function OoUiFieldLayout( field, config ) { var popupButtonWidget; // Config initialization - config = $.extend( { 'align': 'left' }, config ); + config = $.extend( { align: 'left' }, config ); // Parent constructor OO.ui.FieldLayout.super.call( this, config ); @@ -6005,10 +6005,10 @@ if ( config.help ) { popupButtonWidget = new OO.ui.PopupButtonWidget( $.extend( { - '$': this.$, - 'frameless': true, - 'icon': 'info', - 'title': config.help + $: this.$, + frameless: true, + icon: 'info', + title: config.help }, config, { label: null } @@ -6026,7 +6026,7 @@ if ( this.field instanceof OO.ui.InputWidget ) { this.$label.on( 'click', OO.ui.bind( this.onLabelClick, this ) ); } - this.field.connect( this, { 'disable': 'onFieldDisable' } ); + this.field.connect( this, { disable: 'onFieldDisable' } ); // Initialization this.$element.addClass( 'oo-ui-fieldLayout' ); @@ -6326,11 +6326,11 @@ panel = this.panels[i]; width = this.widths[x]; dimensions = { - 'width': Math.round( width * 100 ) + '%', - 'height': Math.round( height * 100 ) + '%', - 'top': Math.round( top * 100 ) + '%', + width: Math.round( width * 100 ) + '%', + height: Math.round( height * 100 ) + '%', + top: Math.round( top * 100 ) + '%', // HACK: Work around IE bug by setting visibility: hidden; if width or height is zero - 'visibility': width === 0 || height === 0 ? 'hidden' : '' + visibility: width === 0 || height === 0 ? 'hidden' : '' }; // If RTL, reverse: if ( OO.ui.Element.getDir( this.$.context ) === 'rtl' ) { @@ -6413,7 +6413,7 @@ */ OO.ui.PageLayout = function OoUiPageLayout( name, config ) { // Configuration initialization - config = $.extend( { 'scrollable': true }, config ); + config = $.extend( { scrollable: true }, config ); // Parent constructor OO.ui.PageLayout.super.call( this, config ); @@ -6529,7 +6529,7 @@ */ OO.ui.StackLayout = function OoUiStackLayout( config ) { // Config initialization - config = $.extend( { 'scrollable': true }, config ); + config = $.extend( { scrollable: true }, config ); // Parent constructor OO.ui.StackLayout.super.call( this, config ); @@ -6624,7 +6624,7 @@ // Mixin method OO.ui.GroupElement.prototype.removeItems.call( this, items ); - if ( $.inArray( this.currentItem, items ) !== -1 ) { + if ( $.inArray( this.currentItem, items ) !== -1 ) { if ( this.items.length ) { this.setItem( this.items[0] ); } else { @@ -6916,7 +6916,7 @@ OO.ui.MenuToolGroup.super.call( this, toolbar, config ); // Events - this.toolbar.connect( this, { 'updateState': 'onUpdateState' } ); + this.toolbar.connect( this, { updateState: 'onUpdateState' } ); // Initialization this.$element.addClass( 'oo-ui-menuToolGroup' ); @@ -7125,9 +7125,9 @@ this.lookupInput = input; this.$overlay = config.$overlay || this.$( 'body,.oo-ui-window-overlay' ).last(); this.lookupMenu = new OO.ui.TextInputMenuWidget( this, { - '$': OO.ui.Element.getJQuery( this.$overlay ), - 'input': this.lookupInput, - '$container': config.$container + $: OO.ui.Element.getJQuery( this.$overlay ), + input: this.lookupInput, + $container: config.$container } ); this.lookupCache = {}; this.lookupQuery = null; @@ -7138,11 +7138,11 @@ this.$overlay.append( this.lookupMenu.$element ); this.lookupInput.$input.on( { - 'focus': OO.ui.bind( this.onLookupInputFocus, this ), - 'blur': OO.ui.bind( this.onLookupInputBlur, this ), - 'mousedown': OO.ui.bind( this.onLookupInputMouseDown, this ) + focus: OO.ui.bind( this.onLookupInputFocus, this ), + blur: OO.ui.bind( this.onLookupInputBlur, this ), + mousedown: OO.ui.bind( this.onLookupInputMouseDown, this ) } ); - this.lookupInput.connect( this, { 'change': 'onLookupInputChange' } ); + this.lookupInput.connect( this, { change: 'onLookupInputChange' } ); // Initialization this.$element.addClass( 'oo-ui-lookupWidget' ); @@ -7356,7 +7356,7 @@ */ OO.ui.OutlineControlsWidget = function OoUiOutlineControlsWidget( outline, config ) { // Configuration initialization - config = $.extend( { 'icon': 'add-item' }, config ); + config = $.extend( { icon: 'add-item' }, config ); // Parent constructor OO.ui.OutlineControlsWidget.super.call( this, config ); @@ -7369,33 +7369,33 @@ this.outline = outline; this.$movers = this.$( '<div>' ); this.upButton = new OO.ui.ButtonWidget( { - '$': this.$, - 'framed': false, - 'icon': 'collapse', - 'title': OO.ui.msg( 'ooui-outline-control-move-up' ) + $: this.$, + framed: false, + icon: 'collapse', + title: OO.ui.msg( 'ooui-outline-control-move-up' ) } ); this.downButton = new OO.ui.ButtonWidget( { - '$': this.$, - 'framed': false, - 'icon': 'expand', - 'title': OO.ui.msg( 'ooui-outline-control-move-down' ) + $: this.$, + framed: false, + icon: 'expand', + title: OO.ui.msg( 'ooui-outline-control-move-down' ) } ); this.removeButton = new OO.ui.ButtonWidget( { - '$': this.$, - 'framed': false, - 'icon': 'remove', - 'title': OO.ui.msg( 'ooui-outline-control-remove' ) + $: this.$, + framed: false, + icon: 'remove', + title: OO.ui.msg( 'ooui-outline-control-remove' ) } ); // Events outline.connect( this, { - 'select': 'onOutlineChange', - 'add': 'onOutlineChange', - 'remove': 'onOutlineChange' + select: 'onOutlineChange', + add: 'onOutlineChange', + remove: 'onOutlineChange' } ); - this.upButton.connect( this, { 'click': [ 'emit', 'move', -1 ] } ); - this.downButton.connect( this, { 'click': [ 'emit', 'move', 1 ] } ); - this.removeButton.connect( this, { 'click': [ 'emit', 'remove' ] } ); + this.upButton.connect( this, { click: [ 'emit', 'move', -1 ] } ); + this.downButton.connect( this, { click: [ 'emit', 'move', 1 ] } ); + this.removeButton.connect( this, { click: [ 'emit', 'remove' ] } ); // Initialization this.$element.addClass( 'oo-ui-outlineControlsWidget' ); @@ -7566,7 +7566,7 @@ */ OO.ui.ButtonWidget = function OoUiButtonWidget( config ) { // Configuration initialization - config = $.extend( { 'target': '_blank' }, config ); + config = $.extend( { target: '_blank' }, config ); // Parent constructor OO.ui.ButtonWidget.super.call( this, config ); @@ -7586,8 +7586,8 @@ // Events this.$button.on( { - 'click': OO.ui.bind( this.onClick, this ), - 'keypress': OO.ui.bind( this.onKeyPress, this ) + click: OO.ui.bind( this.onClick, this ), + keypress: OO.ui.bind( this.onKeyPress, this ) } ); // Initialization @@ -7722,7 +7722,7 @@ */ OO.ui.ActionWidget = function OoUiActionWidget( config ) { // Config intialization - config = $.extend( { 'framed': false }, config ); + config = $.extend( { framed: false }, config ); // Parent constructor OO.ui.ActionWidget.super.call( this, config ); @@ -8060,7 +8060,7 @@ */ OO.ui.InlineMenuWidget = function OoUiInlineMenuWidget( config ) { // Configuration initialization - config = $.extend( { 'indicator': 'down' }, config ); + config = $.extend( { indicator: 'down' }, config ); // Parent constructor OO.ui.InlineMenuWidget.super.call( this, config ); @@ -8072,12 +8072,12 @@ OO.ui.TitledElement.call( this, this.$label, config ); // Properties - this.menu = new OO.ui.MenuWidget( $.extend( { '$': this.$, 'widget': this }, config.menu ) ); + this.menu = new OO.ui.MenuWidget( $.extend( { $: this.$, widget: this }, config.menu ) ); this.$handle = this.$( '<span>' ); // Events - this.$element.on( { 'click': OO.ui.bind( this.onClick, this ) } ); - this.menu.connect( this, { 'select': 'onMenuSelect' } ); + this.$element.on( { click: OO.ui.bind( this.onClick, this ) } ); + this.menu.connect( this, { select: 'onMenuSelect' } ); // Initialization this.$handle @@ -8166,7 +8166,7 @@ */ OO.ui.InputWidget = function OoUiInputWidget( config ) { // Config intialization - config = $.extend( { 'readOnly': false }, config ); + config = $.extend( { readOnly: false }, config ); // Parent constructor OO.ui.InputWidget.super.call( this, config ); @@ -8441,7 +8441,7 @@ */ OO.ui.TextInputWidget = function OoUiTextInputWidget( config ) { var widget = this; - config = $.extend( { 'maxRows': 10 }, config ); + config = $.extend( { maxRows: 10 }, config ); // Parent constructor OO.ui.TextInputWidget.super.call( this, config ); @@ -8546,7 +8546,7 @@ if ( this.multiline && this.autosize ) { $clone = this.$input.clone() .val( this.$input.val() ) - .css( { 'height': 0 } ) + .css( { height: 0 } ) .insertAfter( this.$input ); // Set inline height property to 0 to measure scroll height scrollHeight = $clone[0].scrollHeight; @@ -9004,7 +9004,7 @@ */ OO.ui.MenuItemWidget = function OoUiMenuItemWidget( data, config ) { // Configuration initialization - config = $.extend( { 'icon': 'check' }, config ); + config = $.extend( { icon: 'check' }, config ); // Parent constructor OO.ui.MenuItemWidget.super.call( this, data, config ); @@ -9217,11 +9217,11 @@ this.width = config.width !== undefined ? config.width : 320; this.height = config.height !== undefined ? config.height : null; this.align = config.align || 'center'; - this.closeButton = new OO.ui.ButtonWidget( { '$': this.$, 'framed': false, 'icon': 'close' } ); + this.closeButton = new OO.ui.ButtonWidget( { $: this.$, framed: false, icon: 'close' } ); this.onMouseDownHandler = OO.ui.bind( this.onMouseDown, this ); // Events - this.closeButton.connect( this, { 'click': 'onCloseButtonClick' } ); + this.closeButton.connect( this, { click: 'onCloseButtonClick' } ); // Initialization this.toggleAnchor( config.anchor === undefined || config.anchor ); @@ -9396,7 +9396,7 @@ containerLeft = Math.round( this.$container.offset().left ), containerWidth = this.$container.innerWidth(), containerRight = containerLeft + containerWidth, - popupOffset = this.width * ( { 'left': 0, 'center': -0.5, 'right': -1 } )[this.align], + popupOffset = this.width * ( { left: 0, center: -0.5, right: -1 } )[this.align], anchorWidth = this.$anchor.width(), popupLeft = popupOffset - padding, popupRight = popupOffset + padding + this.width + padding, @@ -9425,9 +9425,9 @@ // Position body relative to anchor and resize this.$popup.css( { - 'left': popupOffset, - 'width': this.width, - 'height': this.height !== null ? this.height : 'auto' + left: popupOffset, + width: this.width, + height: this.height !== null ? this.height : 'auto' } ); if ( transition ) { @@ -9466,23 +9466,23 @@ // Properties this.query = new OO.ui.TextInputWidget( { - '$': this.$, - 'icon': 'search', - 'placeholder': config.placeholder, - 'value': config.value + $: this.$, + icon: 'search', + placeholder: config.placeholder, + value: config.value } ); - this.results = new OO.ui.SelectWidget( { '$': this.$ } ); + this.results = new OO.ui.SelectWidget( { $: this.$ } ); this.$query = this.$( '<div>' ); this.$results = this.$( '<div>' ); // Events this.query.connect( this, { - 'change': 'onQueryChange', - 'enter': 'onQueryEnter' + change: 'onQueryChange', + enter: 'onQueryEnter' } ); this.results.connect( this, { - 'highlight': 'onResultsHighlight', - 'select': 'onResultsSelect' + highlight: 'onResultsHighlight', + select: 'onResultsSelect' } ); this.query.$input.on( 'keydown', OO.ui.bind( this.onQueryKeydown, this ) ); @@ -9633,9 +9633,9 @@ // Events this.$element.on( { - 'mousedown': OO.ui.bind( this.onMouseDown, this ), - 'mouseover': OO.ui.bind( this.onMouseOver, this ), - 'mouseleave': OO.ui.bind( this.onMouseLeave, this ) + mousedown: OO.ui.bind( this.onMouseDown, this ), + mouseover: OO.ui.bind( this.onMouseOver, this ), + mouseleave: OO.ui.bind( this.onMouseLeave, this ) } ); // Initialization diff --git a/lib/oojs-ui/oojs-ui.rtl.css b/lib/oojs-ui/oojs-ui.rtl.css index 4c7bf83..bf44cc5 100644 --- a/lib/oojs-ui/oojs-ui.rtl.css +++ b/lib/oojs-ui/oojs-ui.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (a7ce4d48d9) + * OOjs UI v0.1.0-pre (e9cf571db2) * 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-07-23T23:47:29Z + * Date: 2014-07-28T21:47:23Z */ /* Textures */ diff --git a/lib/oojs-ui/oojs-ui.svg.css b/lib/oojs-ui/oojs-ui.svg.css index a151ca1..a7bfd24 100644 --- a/lib/oojs-ui/oojs-ui.svg.css +++ b/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (a7ce4d48d9) + * OOjs UI v0.1.0-pre (e9cf571db2) * 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-07-23T23:47:29Z + * Date: 2014-07-28T21:47:23Z */ /* Textures */ diff --git a/lib/oojs-ui/oojs-ui.svg.rtl.css b/lib/oojs-ui/oojs-ui.svg.rtl.css index 8181975..876f6de 100644 --- a/lib/oojs-ui/oojs-ui.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (a7ce4d48d9) + * OOjs UI v0.1.0-pre (e9cf571db2) * 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-07-23T23:47:29Z + * Date: 2014-07-28T21:47:23Z */ /* Textures */ -- To view, visit https://gerrit.wikimedia.org/r/149604 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I908933a4fa025d48e2d868a83039f7636356911c Gerrit-PatchSet: 2 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Catrope <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
