From: James D. Forrester Date: Mon, 13 Jul 2015 23:56:21 +0000 (-0700) Subject: Update OOjs UI to v0.12.0 X-Git-Tag: 1.31.0-rc.0~10779^2 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=5245e36d0ed9c85e64b969850123bb75fdd7840e;p=lhc%2Fweb%2Fwiklou.git Update OOjs UI to v0.12.0 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.12.0/History.md Change-Id: I3436db714409adfc844598e36790258667d6d9fd --- diff --git a/composer.json b/composer.json index fda64fdb63..c40b802b34 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "leafo/lessphp": "0.5.0", "liuggio/statsd-php-client": "1.0.12", "mediawiki/at-ease": "1.0.0", - "oojs/oojs-ui": "0.11.8", + "oojs/oojs-ui": "0.12.0", "php": ">=5.3.3", "psr/log": "1.0.0", "wikimedia/cdb": "1.0.1", diff --git a/resources/lib/oojs-ui/i18n/be.json b/resources/lib/oojs-ui/i18n/be.json index fb0f688025..7db7547b59 100644 --- a/resources/lib/oojs-ui/i18n/be.json +++ b/resources/lib/oojs-ui/i18n/be.json @@ -2,9 +2,22 @@ "@metadata": { "authors": [ "Чаховіч Уладзіслаў", - "Artificial123" + "Artificial123", + "Goshaproject" ] }, + "ooui-outline-control-move-down": "Перамясціць элемент ўніз", + "ooui-outline-control-move-up": "Перамясціць элемент уверх", + "ooui-outline-control-remove": "Выдаліць элемент", + "ooui-toolbar-more": "Яшчэ", + "ooui-toolgroup-expand": "Яшчэ", + "ooui-toolgroup-collapse": "Менш", "ooui-dialog-message-accept": "ОК", - "ooui-dialog-message-reject": "Адмяніць" + "ooui-dialog-message-reject": "Адмяніць", + "ooui-dialog-process-error": "Штось пайшло не так…", + "ooui-dialog-process-dismiss": "Прапусціць", + "ooui-dialog-process-retry": "Паспрабаваць яшчэ раз", + "ooui-dialog-process-continue": "Працягнуць", + "ooui-selectfile-not-supported": "Выбраны файл не падтрымліваецца", + "ooui-selectfile-placeholder": "Файл не выбраны" } diff --git a/resources/lib/oojs-ui/i18n/bg.json b/resources/lib/oojs-ui/i18n/bg.json index 02d95b52a2..dce3593c5d 100644 --- a/resources/lib/oojs-ui/i18n/bg.json +++ b/resources/lib/oojs-ui/i18n/bg.json @@ -4,9 +4,18 @@ "DCLXVI", "Hristofor.mirchev", "පසිඳු කාවින්ද", - "Mitzev" + "Mitzev", + "Aquilax" ] }, "ooui-outline-control-remove": "Премахване на обекта", - "ooui-toolbar-more": "Още" + "ooui-toolbar-more": "Още", + "ooui-toolgroup-expand": "Още", + "ooui-toolgroup-collapse": "По-малко", + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Отказ", + "ooui-dialog-process-error": "Нещо се обърка", + "ooui-dialog-process-dismiss": "Затвори", + "ooui-dialog-process-retry": "Опитайте отново", + "ooui-dialog-process-continue": "Продължаване" } diff --git a/resources/lib/oojs-ui/i18n/bs.json b/resources/lib/oojs-ui/i18n/bs.json index 130bd8e53f..d6f61ae53d 100644 --- a/resources/lib/oojs-ui/i18n/bs.json +++ b/resources/lib/oojs-ui/i18n/bs.json @@ -1,10 +1,11 @@ { "@metadata": { "authors": [ - "DzWiki" + "DzWiki", + "Semso98" ] }, - "ooui-outline-control-move-down": "Premjesti stavku dole", + "ooui-outline-control-move-down": "Premjesti stavku dolje", "ooui-outline-control-move-up": "Premjesti stavku gore", "ooui-outline-control-remove": "Ukloni stavku", "ooui-toolbar-more": "Više", diff --git a/resources/lib/oojs-ui/i18n/ca.json b/resources/lib/oojs-ui/i18n/ca.json index ce3afa4371..35a550bfb1 100644 --- a/resources/lib/oojs-ui/i18n/ca.json +++ b/resources/lib/oojs-ui/i18n/ca.json @@ -10,7 +10,9 @@ "Vriullop", "Toniher", "Edustus", - "Davidpar" + "Davidpar", + "Maceleiro", + "Kippelboy" ] }, "ooui-outline-control-move-down": "Baixa l'element", @@ -24,5 +26,7 @@ "ooui-dialog-process-error": "Alguna cosa no ha funcionat", "ooui-dialog-process-dismiss": "Descarta", "ooui-dialog-process-retry": "Torneu-ho a provar", - "ooui-dialog-process-continue": "Continua" + "ooui-dialog-process-continue": "Continua", + "ooui-selectfile-not-supported": "El tipus de fitxer no és compatible", + "ooui-selectfile-placeholder": "No s'ha seleccionat cap fitxer" } diff --git a/resources/lib/oojs-ui/i18n/cu.json b/resources/lib/oojs-ui/i18n/cu.json index aa916af0df..d627de06eb 100644 --- a/resources/lib/oojs-ui/i18n/cu.json +++ b/resources/lib/oojs-ui/i18n/cu.json @@ -5,5 +5,6 @@ ] }, "ooui-toolbar-more": "вѧщє", - "ooui-toolgroup-expand": "вѧщє" + "ooui-toolgroup-expand": "вѧщє", + "ooui-dialog-process-error": "нѣчьто ꙁълѣ сѧ авило" } diff --git a/resources/lib/oojs-ui/i18n/el.json b/resources/lib/oojs-ui/i18n/el.json index 6fb7dbadca..27f19963e0 100644 --- a/resources/lib/oojs-ui/i18n/el.json +++ b/resources/lib/oojs-ui/i18n/el.json @@ -22,5 +22,7 @@ "ooui-dialog-process-error": "Κάτι πήγε στραβά", "ooui-dialog-process-dismiss": "Απόρριψη", "ooui-dialog-process-retry": "Δοκιμάστε ξανά", - "ooui-dialog-process-continue": "Συνέχεια" + "ooui-dialog-process-continue": "Συνέχεια", + "ooui-selectfile-not-supported": "Επιλογή αρχείου δεν υποστηρίζεται", + "ooui-selectfile-placeholder": "Κανένα αρχείο δεν είναι επιλεγμένο" } diff --git a/resources/lib/oojs-ui/i18n/et.json b/resources/lib/oojs-ui/i18n/et.json index 6a212b6bd2..415ff60c07 100644 --- a/resources/lib/oojs-ui/i18n/et.json +++ b/resources/lib/oojs-ui/i18n/et.json @@ -2,7 +2,8 @@ "@metadata": { "authors": [ "Avjoska", - "Pikne" + "Pikne", + "Suwa" ] }, "ooui-outline-control-move-down": "Liiguta üksust allapoole", @@ -16,5 +17,7 @@ "ooui-dialog-process-error": "Midagi läks valesti", "ooui-dialog-process-dismiss": "Hülga", "ooui-dialog-process-retry": "Proovi uuesti", - "ooui-dialog-process-continue": "Jätka" + "ooui-dialog-process-continue": "Jätka", + "ooui-selectfile-not-supported": "Faili valik ei ole toetatud", + "ooui-selectfile-placeholder": "Faili ei ole valitud" } diff --git a/resources/lib/oojs-ui/i18n/fi.json b/resources/lib/oojs-ui/i18n/fi.json index d00254c1ee..8c76e07650 100644 --- a/resources/lib/oojs-ui/i18n/fi.json +++ b/resources/lib/oojs-ui/i18n/fi.json @@ -13,15 +13,16 @@ "Silvonen", "Skalman", "Stryn", - "VezonThunder" + "VezonThunder", + "Alluk." ] }, "ooui-outline-control-move-down": "Siirrä kohdetta alaspäin", "ooui-outline-control-move-up": "Siirrä kohdetta ylöspäin", "ooui-outline-control-remove": "Poista kohde", "ooui-toolbar-more": "Lisää", - "ooui-toolgroup-expand": "Enemmän", - "ooui-toolgroup-collapse": "Vähemmän", + "ooui-toolgroup-expand": "Näytä lisää", + "ooui-toolgroup-collapse": "Näytä vähemmän", "ooui-dialog-message-accept": "OK", "ooui-dialog-message-reject": "Peruuta", "ooui-dialog-process-error": "Jokin meni pieleen", diff --git a/resources/lib/oojs-ui/i18n/hi.json b/resources/lib/oojs-ui/i18n/hi.json index ce86aaab71..573096f34c 100644 --- a/resources/lib/oojs-ui/i18n/hi.json +++ b/resources/lib/oojs-ui/i18n/hi.json @@ -6,7 +6,8 @@ "Rajesh", "Siddhartha Ghai", "Goelujjwal", - "Ankita-ks" + "Ankita-ks", + "Param Mudgal" ] }, "ooui-outline-control-move-down": "प्रविष्टि नीचे ले जाएँ", @@ -20,5 +21,7 @@ "ooui-dialog-process-error": "कुछ गलत हुअा है", "ooui-dialog-process-dismiss": "ख़ारिज करें", "ooui-dialog-process-retry": "पुनः प्रयास करें", - "ooui-dialog-process-continue": "जारी रखें" + "ooui-dialog-process-continue": "जारी रखें", + "ooui-selectfile-not-supported": "फ़ाइल का चयन समर्थित नहीं है", + "ooui-selectfile-placeholder": "कोई फाइल चुनी नही गई हेै" } diff --git a/resources/lib/oojs-ui/i18n/hu-formal.json b/resources/lib/oojs-ui/i18n/hu-formal.json new file mode 100644 index 0000000000..34aa0ae638 --- /dev/null +++ b/resources/lib/oojs-ui/i18n/hu-formal.json @@ -0,0 +1,21 @@ +{ + "@metadata": { + "authors": [ + "Misibacsi" + ] + }, + "ooui-outline-control-move-down": "Elem mozgatása lefelé", + "ooui-outline-control-move-up": "Elem mozgatása felfelé", + "ooui-outline-control-remove": "Elem eltávolítása", + "ooui-toolbar-more": "Tovább...", + "ooui-toolgroup-expand": "Tovább", + "ooui-toolgroup-collapse": "Kevesebb", + "ooui-dialog-message-accept": "Rendben", + "ooui-dialog-message-reject": "Mégse", + "ooui-dialog-process-error": "Valami elromlott.", + "ooui-dialog-process-dismiss": "Mégse", + "ooui-dialog-process-retry": "Próbálja újra", + "ooui-dialog-process-continue": "Folytatás", + "ooui-selectfile-not-supported": "A fájl kiválasztása nincs támogatva", + "ooui-selectfile-placeholder": "Nincs fájl kiválasztva" +} diff --git a/resources/lib/oojs-ui/i18n/hu.json b/resources/lib/oojs-ui/i18n/hu.json index f0fae3c19b..d45b0573d5 100644 --- a/resources/lib/oojs-ui/i18n/hu.json +++ b/resources/lib/oojs-ui/i18n/hu.json @@ -17,8 +17,10 @@ "ooui-toolgroup-collapse": "Kevesebb", "ooui-dialog-message-accept": "OK", "ooui-dialog-message-reject": "Mégse", + "ooui-dialog-process-error": "Valami elromlott.", "ooui-dialog-process-dismiss": "Elrejt", "ooui-dialog-process-retry": "Próbáld újra", "ooui-dialog-process-continue": "Folytatás", + "ooui-selectfile-not-supported": "A fájl kiválasztása nincs támogatva", "ooui-selectfile-placeholder": "Nincs fájl kiválasztva" } diff --git a/resources/lib/oojs-ui/i18n/la.json b/resources/lib/oojs-ui/i18n/la.json new file mode 100644 index 0000000000..7a9b2d23f0 --- /dev/null +++ b/resources/lib/oojs-ui/i18n/la.json @@ -0,0 +1,15 @@ +{ + "@metadata": { + "authors": [ + "Jdforrester" + ] + }, + "ooui-toolbar-more": "Plus", + "ooui-toolgroup-expand": "Plus", + "ooui-toolgroup-collapse": "Paucior", + "ooui-dialog-message-accept": "Assentior", + "ooui-dialog-message-reject": "Dimittere", + "ooui-dialog-process-dismiss": "Dimittere", + "ooui-dialog-process-retry": "Retemptare", + "ooui-dialog-process-continue": "Pergere" +} diff --git a/resources/lib/oojs-ui/i18n/mr.json b/resources/lib/oojs-ui/i18n/mr.json index 6bc94f1eae..15a5de3962 100644 --- a/resources/lib/oojs-ui/i18n/mr.json +++ b/resources/lib/oojs-ui/i18n/mr.json @@ -7,7 +7,8 @@ "V.narsikar", "Ydyashad", "संतोष दहिवळ", - "NehalDaveND" + "NehalDaveND", + "Sau6402" ] }, "ooui-outline-control-move-down": "घटक (आयटम) खाली सरकवा", diff --git a/resources/lib/oojs-ui/i18n/ms.json b/resources/lib/oojs-ui/i18n/ms.json index 2be1122e47..136ada30d5 100644 --- a/resources/lib/oojs-ui/i18n/ms.json +++ b/resources/lib/oojs-ui/i18n/ms.json @@ -17,5 +17,6 @@ "ooui-dialog-process-error": "Ada masalah", "ooui-dialog-process-dismiss": "Singkir", "ooui-dialog-process-retry": "Cuba lagi", - "ooui-dialog-process-continue": "Teruskan" + "ooui-dialog-process-continue": "Teruskan", + "ooui-selectfile-placeholder": "Tiada fail yang dipilih" } diff --git a/resources/lib/oojs-ui/i18n/nb.json b/resources/lib/oojs-ui/i18n/nb.json index 9e2d8f2bf2..4efb02ac6a 100644 --- a/resources/lib/oojs-ui/i18n/nb.json +++ b/resources/lib/oojs-ui/i18n/nb.json @@ -22,5 +22,6 @@ "ooui-dialog-process-dismiss": "Lukk", "ooui-dialog-process-retry": "Prøv igjen", "ooui-dialog-process-continue": "Fortsett", + "ooui-selectfile-not-supported": "Filvalg er ikke støttet", "ooui-selectfile-placeholder": "Ingen fil er valgt" } diff --git a/resources/lib/oojs-ui/i18n/om.json b/resources/lib/oojs-ui/i18n/om.json index ecf9597184..a61083b323 100644 --- a/resources/lib/oojs-ui/i18n/om.json +++ b/resources/lib/oojs-ui/i18n/om.json @@ -16,5 +16,7 @@ "ooui-dialog-process-error": "Dogoggorri wayii ummameera", "ooui-dialog-process-dismiss": "Didi", "ooui-dialog-process-retry": "Itti deebi'ii yaali", - "ooui-dialog-process-continue": "Itti fufi" + "ooui-dialog-process-continue": "Itti fufi", + "ooui-selectfile-not-supported": "Faayilii filachuun hin danda'amu.", + "ooui-selectfile-placeholder": "Faayiliin wayiiyyuu hin filatamne" } diff --git a/resources/lib/oojs-ui/i18n/sco.json b/resources/lib/oojs-ui/i18n/sco.json index 0a26a5c8f9..794d71f720 100644 --- a/resources/lib/oojs-ui/i18n/sco.json +++ b/resources/lib/oojs-ui/i18n/sco.json @@ -1,11 +1,22 @@ { "@metadata": { "authors": [ - "John Reid" + "John Reid", + "Foxj" ] }, "ooui-outline-control-move-down": "Muiv eetem doon", "ooui-outline-control-move-up": "Muiv eetem up", "ooui-outline-control-remove": "Remuiv eetem", - "ooui-toolbar-more": "Mair" + "ooui-toolbar-more": "Mair", + "ooui-toolgroup-expand": "Mair", + "ooui-toolgroup-collapse": "Less", + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Cancel", + "ooui-dialog-process-error": "Sommit went wrang", + "ooui-dialog-process-dismiss": "Close", + "ooui-dialog-process-retry": "Hae aniter gae", + "ooui-dialog-process-continue": "Conteena", + "ooui-selectfile-not-supported": "Cannae pick ony files", + "ooui-selectfile-placeholder": "Nae file selectit" } diff --git a/resources/lib/oojs-ui/i18n/sh.json b/resources/lib/oojs-ui/i18n/sh.json index b40fa04e88..db6fa3c4bd 100644 --- a/resources/lib/oojs-ui/i18n/sh.json +++ b/resources/lib/oojs-ui/i18n/sh.json @@ -5,5 +5,17 @@ ] }, "ooui-outline-control-move-down": "Pomakni stavku dolje", - "ooui-outline-control-move-up": "Pomakni stavku gore" + "ooui-outline-control-move-up": "Premjesti stavku gore", + "ooui-outline-control-remove": "Ukloni stavku", + "ooui-toolbar-more": "Više", + "ooui-toolgroup-expand": "Više", + "ooui-toolgroup-collapse": "Manje", + "ooui-dialog-message-accept": "U redu", + "ooui-dialog-message-reject": "Otkaži", + "ooui-dialog-process-error": "Nešto je pošlo naopako", + "ooui-dialog-process-dismiss": "Odbaci", + "ooui-dialog-process-retry": "Pokušajte ponovo", + "ooui-dialog-process-continue": "Nastavi", + "ooui-selectfile-not-supported": "Izbor datoteke nije podržan", + "ooui-selectfile-placeholder": "Nijedna datoteka nije odabrana" } diff --git a/resources/lib/oojs-ui/i18n/sq.json b/resources/lib/oojs-ui/i18n/sq.json index ec180199d1..4bf5dac9b0 100644 --- a/resources/lib/oojs-ui/i18n/sq.json +++ b/resources/lib/oojs-ui/i18n/sq.json @@ -5,15 +5,22 @@ "Kushtrim", "Elioqoshi", "GretaDoci", - "Gertakapllani" + "Gertakapllani", + "Techlik" ] }, "ooui-outline-control-move-down": "Zhvendose artikullin më poshtë", "ooui-outline-control-move-up": "Zhvendose artikullin më lart", "ooui-outline-control-remove": "Hiq artikullin", "ooui-toolbar-more": "Më tepër...", + "ooui-toolgroup-expand": "Më tepër...", + "ooui-toolgroup-collapse": "Më pak", "ooui-dialog-message-accept": "Në rregull", "ooui-dialog-message-reject": "Anullo", "ooui-dialog-process-error": "Diçka shkoi keq", - "ooui-dialog-process-retry": "Provo përsëri" + "ooui-dialog-process-dismiss": "Largoje", + "ooui-dialog-process-retry": "Provo përsëri", + "ooui-dialog-process-continue": "Vazhdo", + "ooui-selectfile-not-supported": "Skedari i përzgjedhur nuk përkrahet", + "ooui-selectfile-placeholder": "Nuk është zgjedhur asnjë skedar" } diff --git a/resources/lib/oojs-ui/i18n/tl.json b/resources/lib/oojs-ui/i18n/tl.json index b3a9f246f3..c0dbd5fd2c 100644 --- a/resources/lib/oojs-ui/i18n/tl.json +++ b/resources/lib/oojs-ui/i18n/tl.json @@ -2,13 +2,22 @@ "@metadata": { "authors": [ "AnakngAraw", - "Sky Harbor" + "Sky Harbor", + "Jewel457" ] }, "ooui-outline-control-move-down": "Ilipat ang aytem pababa", "ooui-outline-control-move-up": "Ilipat ang aytem pataas", "ooui-outline-control-remove": "Tanggalin ang aytem", "ooui-toolbar-more": "Marami pa", + "ooui-toolgroup-expand": "Maraming iba pa", + "ooui-toolgroup-collapse": "Kakaunti", "ooui-dialog-message-accept": "Sige", - "ooui-dialog-message-reject": "Huwag ituloy" + "ooui-dialog-message-reject": "Huwag ituloy", + "ooui-dialog-process-error": "May pagkakamali", + "ooui-dialog-process-dismiss": "Isa-isantabi", + "ooui-dialog-process-retry": "Subuking muli", + "ooui-dialog-process-continue": "Magpatuloy", + "ooui-selectfile-not-supported": "Ang pagpili ng file ay hindi kinakatigan", + "ooui-selectfile-placeholder": "Walang piniling file" } diff --git a/resources/lib/oojs-ui/i18n/uk.json b/resources/lib/oojs-ui/i18n/uk.json index 0197a4ce64..a35d4eb85d 100644 --- a/resources/lib/oojs-ui/i18n/uk.json +++ b/resources/lib/oojs-ui/i18n/uk.json @@ -15,7 +15,8 @@ "Tel'et", "Tifinaghes", "Ата", - "Piramidion" + "Piramidion", + "A1" ] }, "ooui-outline-control-move-down": "Перемістити елемент униз", @@ -29,5 +30,6 @@ "ooui-dialog-process-error": "Щось пішло не так", "ooui-dialog-process-dismiss": "Приховати", "ooui-dialog-process-retry": "Спробуйте ще раз", - "ooui-dialog-process-continue": "Продовжити" + "ooui-dialog-process-continue": "Продовжити", + "ooui-selectfile-placeholder": "Жодного файлу не вибрано" } diff --git a/resources/lib/oojs-ui/i18n/zh-hant.json b/resources/lib/oojs-ui/i18n/zh-hant.json index 3f5920062e..195bb3ab31 100644 --- a/resources/lib/oojs-ui/i18n/zh-hant.json +++ b/resources/lib/oojs-ui/i18n/zh-hant.json @@ -31,5 +31,5 @@ "ooui-dialog-process-retry": "再試一次", "ooui-dialog-process-continue": "繼續", "ooui-selectfile-not-supported": "無法支援所選擇的檔案", - "ooui-selectfile-placeholder": "沒有選擇檔案" + "ooui-selectfile-placeholder": "未選擇檔案" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css index 0c670e1da0..6c7ae5ce44 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.11.8 + * OOjs UI v0.12.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-07-08T01:31:46Z + * Date: 2015-07-13T23:47:11Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -1527,10 +1527,10 @@ -ms-user-select: none; user-select: none; } -.oo-ui-popupWidget-head .oo-ui-buttonWidget { +.oo-ui-popupWidget-head > .oo-ui-buttonWidget { float: right; } -.oo-ui-popupWidget-head .oo-ui-labelElement-label { +.oo-ui-popupWidget-head > .oo-ui-labelElement-label { float: left; cursor: default; } @@ -1579,10 +1579,10 @@ .oo-ui-popupWidget-head { height: 2.5em; } -.oo-ui-popupWidget-head .oo-ui-buttonWidget { +.oo-ui-popupWidget-head > .oo-ui-buttonWidget { margin: 0.25em; } -.oo-ui-popupWidget-head .oo-ui-labelElement-label { +.oo-ui-popupWidget-head > .oo-ui-labelElement-label { margin: 0.75em 1em; } .oo-ui-popupWidget-body-padded { @@ -1696,7 +1696,7 @@ } .oo-ui-textInputWidget.oo-ui-widget-enabled > .oo-ui-iconElement-icon, .oo-ui-textInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator { - cursor: pointer; + cursor: text; } .oo-ui-textInputWidget.oo-ui-labelElement > .oo-ui-labelElement-label { display: block; @@ -2207,6 +2207,9 @@ z-index: 1; width: 100%; } +.oo-ui-comboBoxWidget > .oo-ui-textInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator { + cursor: pointer; +} .oo-ui-comboBoxWidget:last-child { margin-right: 0; } diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 6a12aa1ca5..91c43a6fde 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.11.8 + * OOjs UI v0.12.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-07-08T01:31:38Z + * Date: 2015-07-13T23:47:04Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css index 31537465e9..08f7f68a77 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.11.8 + * OOjs UI v0.12.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-07-08T01:31:46Z + * Date: 2015-07-13T23:47:11Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -1539,10 +1539,10 @@ -ms-user-select: none; user-select: none; } -.oo-ui-popupWidget-head .oo-ui-buttonWidget { +.oo-ui-popupWidget-head > .oo-ui-buttonWidget { float: right; } -.oo-ui-popupWidget-head .oo-ui-labelElement-label { +.oo-ui-popupWidget-head > .oo-ui-labelElement-label { float: left; cursor: default; } @@ -1591,10 +1591,10 @@ .oo-ui-popupWidget-head { height: 2.5em; } -.oo-ui-popupWidget-head .oo-ui-buttonWidget { +.oo-ui-popupWidget-head > .oo-ui-buttonWidget { margin: 0.25em; } -.oo-ui-popupWidget-head .oo-ui-labelElement-label { +.oo-ui-popupWidget-head > .oo-ui-labelElement-label { margin: 0.75em 1em; } .oo-ui-popupWidget-body-padded { @@ -1847,7 +1847,7 @@ } .oo-ui-textInputWidget.oo-ui-widget-enabled > .oo-ui-iconElement-icon, .oo-ui-textInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator { - cursor: pointer; + cursor: text; } .oo-ui-textInputWidget.oo-ui-labelElement > .oo-ui-labelElement-label { display: block; @@ -2396,6 +2396,9 @@ z-index: 1; width: 100%; } +.oo-ui-comboBoxWidget > .oo-ui-textInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator { + cursor: pointer; +} .oo-ui-comboBoxWidget:last-child { margin-right: 0; } diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 48de83fbd4..a09b898370 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.11.8 + * OOjs UI v0.12.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-07-08T01:31:38Z + * Date: 2015-07-13T23:47:04Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index b67289be1c..98ec6737de 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.11.8 + * OOjs UI v0.12.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-07-08T01:31:38Z + * Date: 2015-07-13T23:47:04Z */ ( function ( OO ) { @@ -1097,7 +1097,7 @@ OO.ui.Element.static.infuse = function ( idOrNode ) { */ OO.ui.Element.static.unsafeInfuse = function ( idOrNode, top ) { // look for a cached result of a previous infusion. - var id, $elem, data, cls, obj; + var id, $elem, data, cls, parts, parent, obj; if ( typeof idOrNode === 'string' ) { id = idOrNode; $elem = $( document.getElementById( id ) ); @@ -1132,10 +1132,33 @@ OO.ui.Element.static.unsafeInfuse = function ( idOrNode, top ) { // Special case: this is a raw Tag; wrap existing node, don't rebuild. return new OO.ui.Element( { $element: $elem } ); } - cls = OO.ui[data._]; - if ( !cls ) { - throw new Error( 'Unknown widget type: ' + id ); + parts = data._.split( '.' ); + cls = OO.getProp.apply( OO, [ window ].concat( parts ) ); + if ( cls === undefined ) { + // The PHP output might be old and not including the "OO.ui" prefix + // TODO: Remove this back-compat after next major release + cls = OO.getProp.apply( OO, [ OO.ui ].concat( parts ) ); + if ( cls === undefined ) { + throw new Error( 'Unknown widget type: id: ' + id + ', class: ' + data._ ); + } + } + + // Verify that we're creating an OO.ui.Element instance + parent = cls.parent; + + while ( parent !== undefined ) { + if ( parent === OO.ui.Element ) { + // Safe + break; + } + + parent = parent.parent; + } + + if ( parent !== OO.ui.Element ) { + throw new Error( 'Unknown widget type: id: ' + id + ', class: ' + data._ ); } + $elem.data( 'ooui-infused', true ); // prevent loops data.id = id; // implicit data = OO.copy( data, null, function deserialize( value ) { @@ -5991,6 +6014,28 @@ OO.ui.mixin.LookupElement.prototype.getLookupMenuOptionsFromData = function () { return []; }; +/** + * Set the read-only state of the widget. + * + * This will also disable/enable the lookups functionality. + * + * @param {boolean} readOnly Make input read-only + * @chainable + */ +OO.ui.mixin.LookupElement.prototype.setReadOnly = function ( readOnly ) { + // Parent method + // Note: Calling #setReadOnly this way assumes this is mixed into an OO.ui.TextInputWidget + OO.ui.TextInputWidget.prototype.setReadOnly.call( this, readOnly ); + + this.setLookupsDisabled( readOnly ); + // During construction, #setReadOnly is called before the OO.ui.mixin.LookupElement constructor + if ( readOnly && this.lookupMenu ) { + this.closeLookupMenu(); + } + + return this; +}; + /** * PopupElement is mixed into other classes to generate a {@link OO.ui.PopupWidget popup widget}. * A popup is a container for content. It is overlaid and positioned absolutely. By default, each @@ -6516,8 +6561,9 @@ OO.ui.mixin.ClippableElement.prototype.clip = function () { ccHeight = $container.innerHeight() - buffer, ccWidth = $container.innerWidth() - buffer, cWidth = this.$clippable.outerWidth() + buffer, - scrollTop = this.$clippableScroller[0] === this.$clippableWindow[0] ? this.$clippableScroller.scrollTop() : 0, - scrollLeft = this.$clippableScroller.scrollLeft(), + scrollerIsWindow = this.$clippableScroller[0] === this.$clippableWindow[0], + scrollTop = scrollerIsWindow ? this.$clippableScroller.scrollTop() : 0, + scrollLeft = scrollerIsWindow ? this.$clippableScroller.scrollLeft() : 0, desiredWidth = cOffset.left < 0 ? cWidth + cOffset.left : ( ccOffset.left + scrollLeft + ccWidth ) - cOffset.left, @@ -6539,7 +6585,7 @@ OO.ui.mixin.ClippableElement.prototype.clip = function () { } // If we stopped clipping in at least one of the dimensions - if ( !clipWidth || !clipHeight ) { + if ( ( this.clippedHorizontally && !clipWidth ) || ( this.clippedVertically && !clipHeight ) ) { OO.ui.Element.static.reconsiderScrollbars( this.$clippable[ 0 ] ); } @@ -8405,7 +8451,7 @@ OO.ui.ProcessDialog.prototype.getTeardownProcess = function ( data ) { * @param {OO.ui.Widget} fieldWidget Field widget * @param {Object} [config] Configuration options * @cfg {string} [align='left'] Alignment of the label: 'left', 'right', 'top' or 'inline' - * @cfg {string} [help] Help text. When help text is specified, a help icon will appear + * @cfg {string|OO.ui.HtmlSnippet} [help] Help text. When help text is specified, a help icon will appear * in the upper-right corner of the rendered field. */ OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) { @@ -8415,7 +8461,8 @@ OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) { fieldWidget = config.fieldWidget; } - var hasInputWidget = fieldWidget.constructor.static.supportsSimpleLabel; + var hasInputWidget = fieldWidget.constructor.static.supportsSimpleLabel, + div; // Configuration initialization config = $.extend( { align: 'left' }, config ); @@ -8438,10 +8485,14 @@ OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) { icon: 'info' } ); + div = $( '
' ); + if ( config.help instanceof OO.ui.HtmlSnippet ) { + div.html( config.help.toString() ); + } else { + div.text( config.help ); + } this.popupButtonWidget.getPopup().$body.append( - $( '
' ) - .text( config.help ) - .addClass( 'oo-ui-fieldLayout-help-content' ) + div.addClass( 'oo-ui-fieldLayout-help-content' ) ); this.$help = this.popupButtonWidget.$element; } else { @@ -13040,7 +13091,9 @@ OO.ui.InputWidget = function OoUiInputWidget( config ) { this.$input .attr( 'name', config.name ) .prop( 'disabled', this.isDisabled() ); - this.$element.addClass( 'oo-ui-inputWidget' ).append( this.$input, $( '' ) ); + this.$element + .addClass( 'oo-ui-inputWidget' ) + .append( this.$input ); this.setValue( config.value ); }; @@ -13275,6 +13328,14 @@ OO.mixinClass( OO.ui.ButtonInputWidget, OO.ui.mixin.IndicatorElement ); OO.mixinClass( OO.ui.ButtonInputWidget, OO.ui.mixin.LabelElement ); OO.mixinClass( OO.ui.ButtonInputWidget, OO.ui.mixin.TitledElement ); +/* Static Properties */ + +/** + * Disable generating `