Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/171614
Change subject: Update OOjs UI to v0.1.0-pre (12b66051ff) ...................................................................... Update OOjs UI to v0.1.0-pre (12b66051ff) New changes: 0bcb0a1 Style mediawiki theme checkbox 227aefa paralell -> parallel 51ee44c Remove nonfunctional $icon/$indicator code from OptionWidget 735ba0e Use Object.prototype.hasOwnProperty where appropriate 324b8cb Localisation updates from https://translatewiki.net. Change-Id: I2919d80b9ea5231f45b1e14ae1393a0f7665ec0c --- M lib/oojs-ui/i18n/br.json M lib/oojs-ui/i18n/de.json M lib/oojs-ui/i18n/et.json M lib/oojs-ui/i18n/fi.json A lib/oojs-ui/i18n/fy.json M lib/oojs-ui/i18n/it.json M lib/oojs-ui/i18n/mk.json M lib/oojs-ui/i18n/pl.json M lib/oojs-ui/i18n/pt.json M lib/oojs-ui/i18n/ro.json M lib/oojs-ui/i18n/ru.json M lib/oojs-ui/i18n/vi.json M lib/oojs-ui/i18n/zh-hans.json M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-apex.svg.css M lib/oojs-ui/oojs-ui-apex.svg.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.svg.css M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css M lib/oojs-ui/oojs-ui.js R lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.svg 25 files changed, 276 insertions(+), 61 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/14/171614/1 diff --git a/lib/oojs-ui/i18n/br.json b/lib/oojs-ui/i18n/br.json index 6959191..83af863 100644 --- a/lib/oojs-ui/i18n/br.json +++ b/lib/oojs-ui/i18n/br.json @@ -3,16 +3,20 @@ "authors": [ "Fohanno", "Fulup", - "Y-M D" + "Y-M D", + "Maoris" ] }, "ooui-outline-control-move-down": "Lakaat an elfenn da ziskenn", "ooui-outline-control-move-up": "Lakaat an elfenn da bignat", "ooui-outline-control-remove": "Tennañ an elfenn", "ooui-toolbar-more": "Muioc'h", + "ooui-toolgroup-expand": "Muioc'h", + "ooui-toolgroup-collapse": "Nebeutoc'h", "ooui-dialog-message-accept": "Mat eo", "ooui-dialog-message-reject": "Nullañ", "ooui-dialog-process-error": "Un dra bennak a-dreuz a zo bet", "ooui-dialog-process-dismiss": "Disteurel", - "ooui-dialog-process-retry": "Klask en-dro" + "ooui-dialog-process-retry": "Klask en-dro", + "ooui-dialog-process-continue": "Kenderc'hel" } diff --git a/lib/oojs-ui/i18n/de.json b/lib/oojs-ui/i18n/de.json index 50d93ea..15624fd 100644 --- a/lib/oojs-ui/i18n/de.json +++ b/lib/oojs-ui/i18n/de.json @@ -23,5 +23,6 @@ "ooui-dialog-message-reject": "Abbrechen", "ooui-dialog-process-error": "Etwas ist schief gelaufen", "ooui-dialog-process-dismiss": "Ausblenden", - "ooui-dialog-process-retry": "Erneut versuchen" + "ooui-dialog-process-retry": "Erneut versuchen", + "ooui-dialog-process-continue": "Fortfahren" } diff --git a/lib/oojs-ui/i18n/et.json b/lib/oojs-ui/i18n/et.json index 7b33735..6a212b6 100644 --- a/lib/oojs-ui/i18n/et.json +++ b/lib/oojs-ui/i18n/et.json @@ -15,5 +15,6 @@ "ooui-dialog-message-reject": "Loobu", "ooui-dialog-process-error": "Midagi läks valesti", "ooui-dialog-process-dismiss": "Hülga", - "ooui-dialog-process-retry": "Proovi uuesti" + "ooui-dialog-process-retry": "Proovi uuesti", + "ooui-dialog-process-continue": "Jätka" } diff --git a/lib/oojs-ui/i18n/fi.json b/lib/oojs-ui/i18n/fi.json index efaabed..6262293 100644 --- a/lib/oojs-ui/i18n/fi.json +++ b/lib/oojs-ui/i18n/fi.json @@ -20,6 +20,8 @@ "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-dialog-message-accept": "OK", "ooui-dialog-message-reject": "Peruuta", "ooui-dialog-process-error": "Jokin meni pieleen", diff --git a/lib/oojs-ui/i18n/fy.json b/lib/oojs-ui/i18n/fy.json new file mode 100644 index 0000000..2aaf960 --- /dev/null +++ b/lib/oojs-ui/i18n/fy.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Robin0van0der0vliet" + ] + }, + "ooui-dialog-message-reject": "Annulearje" +} diff --git a/lib/oojs-ui/i18n/it.json b/lib/oojs-ui/i18n/it.json index 2c79fc2..0ff8af8 100644 --- a/lib/oojs-ui/i18n/it.json +++ b/lib/oojs-ui/i18n/it.json @@ -25,5 +25,6 @@ "ooui-dialog-message-reject": "Annulla", "ooui-dialog-process-error": "Qualcosa è andato storto", "ooui-dialog-process-dismiss": "Nascondi", - "ooui-dialog-process-retry": "Riprova" + "ooui-dialog-process-retry": "Riprova", + "ooui-dialog-process-continue": "Continua" } diff --git a/lib/oojs-ui/i18n/mk.json b/lib/oojs-ui/i18n/mk.json index 32856e8..7962336 100644 --- a/lib/oojs-ui/i18n/mk.json +++ b/lib/oojs-ui/i18n/mk.json @@ -16,5 +16,6 @@ "ooui-dialog-message-reject": "Откажи", "ooui-dialog-process-error": "Нешто не е во ред", "ooui-dialog-process-dismiss": "Тргни", - "ooui-dialog-process-retry": "Обиди се пак" + "ooui-dialog-process-retry": "Обиди се пак", + "ooui-dialog-process-continue": "Продолжи" } diff --git a/lib/oojs-ui/i18n/pl.json b/lib/oojs-ui/i18n/pl.json index 7978673..dea65eb 100644 --- a/lib/oojs-ui/i18n/pl.json +++ b/lib/oojs-ui/i18n/pl.json @@ -27,5 +27,6 @@ "ooui-dialog-message-reject": "Anuluj", "ooui-dialog-process-error": "Coś poszło nie tak", "ooui-dialog-process-dismiss": "Ukryj", - "ooui-dialog-process-retry": "Spróbuj ponownie" + "ooui-dialog-process-retry": "Spróbuj ponownie", + "ooui-dialog-process-continue": "Kontynuuj" } diff --git a/lib/oojs-ui/i18n/pt.json b/lib/oojs-ui/i18n/pt.json index d02b08b..d261e2d 100644 --- a/lib/oojs-ui/i18n/pt.json +++ b/lib/oojs-ui/i18n/pt.json @@ -22,5 +22,6 @@ "ooui-dialog-message-reject": "Cancelar", "ooui-dialog-process-error": "Algo correu mal", "ooui-dialog-process-dismiss": "Ignorar", - "ooui-dialog-process-retry": "Tentar novamente" + "ooui-dialog-process-retry": "Tentar novamente", + "ooui-dialog-process-continue": "Continuar" } diff --git a/lib/oojs-ui/i18n/ro.json b/lib/oojs-ui/i18n/ro.json index 17359bd..258f3e7 100644 --- a/lib/oojs-ui/i18n/ro.json +++ b/lib/oojs-ui/i18n/ro.json @@ -18,5 +18,6 @@ "ooui-dialog-message-reject": "Revocare", "ooui-dialog-process-error": "Ceva nu a funcționat", "ooui-dialog-process-dismiss": "Renunțare", - "ooui-dialog-process-retry": "Reîncearcă" + "ooui-dialog-process-retry": "Reîncearcă", + "ooui-dialog-process-continue": "Continuă" } diff --git a/lib/oojs-ui/i18n/ru.json b/lib/oojs-ui/i18n/ru.json index 649a937..129dd6a 100644 --- a/lib/oojs-ui/i18n/ru.json +++ b/lib/oojs-ui/i18n/ru.json @@ -15,7 +15,8 @@ "Putnik", "Sunpriat", "Yury Katkov", - "Умар" + "Умар", + "Камалист" ] }, "ooui-outline-control-move-down": "Переместить элемент вниз", @@ -28,5 +29,6 @@ "ooui-dialog-message-reject": "Отмена", "ooui-dialog-process-error": "Что-то пошло не так", "ooui-dialog-process-dismiss": "Закрыть", - "ooui-dialog-process-retry": "Попробовать ещё раз" + "ooui-dialog-process-retry": "Попробовать ещё раз", + "ooui-dialog-process-continue": "Продолжить" } diff --git a/lib/oojs-ui/i18n/vi.json b/lib/oojs-ui/i18n/vi.json index 920041b..d5c1e36 100644 --- a/lib/oojs-ui/i18n/vi.json +++ b/lib/oojs-ui/i18n/vi.json @@ -3,7 +3,8 @@ "authors": [ "Cheers!", "Jdforrester", - "Minh Nguyen" + "Minh Nguyen", + "Max20091" ] }, "ooui-outline-control-move-down": "Chuyển mục xuống", @@ -16,5 +17,6 @@ "ooui-dialog-message-reject": "Hủy bỏ", "ooui-dialog-process-error": "Đã bị trục trặc", "ooui-dialog-process-dismiss": "Bỏ qua", - "ooui-dialog-process-retry": "Thử lại" + "ooui-dialog-process-retry": "Thử lại", + "ooui-dialog-process-continue": "Tiếp tục" } diff --git a/lib/oojs-ui/i18n/zh-hans.json b/lib/oojs-ui/i18n/zh-hans.json index fa86ea7..b16755e 100644 --- a/lib/oojs-ui/i18n/zh-hans.json +++ b/lib/oojs-ui/i18n/zh-hans.json @@ -29,5 +29,6 @@ "ooui-dialog-message-reject": "取消", "ooui-dialog-process-error": "发生一些错误", "ooui-dialog-process-dismiss": "解除", - "ooui-dialog-process-retry": "重试" + "ooui-dialog-process-retry": "重试", + "ooui-dialog-process-continue": "继续" } diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css index 3d6f0bf..ccd0021 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 (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:43:01Z + * Date: 2014-11-06T19:07:49Z */ /* @noflip */ .oo-ui-rtl { diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js index 2c1629f..2a9a2f5 100644 --- a/lib/oojs-ui/oojs-ui-apex.js +++ b/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:42:51Z + * Date: 2014-11-06T19:07:39Z */ /* Instantiation */ diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css index 1976671..e1c83b7 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 (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:43:01Z + * Date: 2014-11-06T19:07:49Z */ /* @noflip */ .oo-ui-rtl { diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/oojs-ui/oojs-ui-apex.svg.css index abdec20..9e85b1b 100644 --- a/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/lib/oojs-ui/oojs-ui-apex.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:43:01Z + * Date: 2014-11-06T19:07:49Z */ /* @noflip */ .oo-ui-rtl { diff --git a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css index 1b1da4a..d607c44 100644 --- a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:43:01Z + * Date: 2014-11-06T19:07:49Z */ /* @noflip */ .oo-ui-rtl { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.css b/lib/oojs-ui/oojs-ui-mediawiki.css index c0accba..7c1cefc 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:43:01Z + * Date: 2014-11-06T19:07:49Z */ /* @noflip */ .oo-ui-rtl { @@ -1138,6 +1138,54 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { left: -1.75em; } +.oo-ui-checkboxInputWidget { + position: relative; + line-height: 1.6em; +} +.oo-ui-checkboxInputWidget * { + vertical-align: middle; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] { + opacity: 0; + width: 1.6em; + height: 1.6em; + max-width: none; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] + span { + cursor: pointer; + margin: 0 0.4em; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] + span::before { + content: ""; + position: absolute; + left: 0; + border-radius: 0.3em; + width: 1.6em; + height: 1.6em; + background-color: #ffffff; + border: 1px solid grey; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:checked + span::before { + background-image: /* @embed */ url(themes/mediawiki/images/icons/check-constructive.svg); + background-size: 1.6em, 1.6em; + background-repeat: no-repeat; + background-position: center top; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:active + span::after, +.oo-ui-checkboxInputWidget input[type="checkbox"]:focus + span::after { + content: ""; + position: absolute; + width: 1.6em; + height: 1.5em; + left: 1px; + border-bottom: solid 0.2em #d3d3d3; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:disabled + span { + cursor: default; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:disabled + span::before { + background-color: lightgrey; +} .oo-ui-textInputWidget { position: relative; -webkit-box-sizing: border-box; @@ -1898,9 +1946,9 @@ .oo-ui-icon-check { background-image: /* @embed */ url(themes/mediawiki/images/icons/check.png); } -.oo-ui-image-primary .oo-ui-icon-check, -.oo-ui-image-primary.oo-ui-icon-check { - background-image: /* @embed */ url(themes/mediawiki/images/icons/check-primary.png); +.oo-ui-image-constructive .oo-ui-icon-check, +.oo-ui-image-constructive.oo-ui-icon-check { + background-image: /* @embed */ url(themes/mediawiki/images/icons/check-constructive.png); } .oo-ui-image-invert .oo-ui-icon-check, .oo-ui-image-invert.oo-ui-icon-check { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.js b/lib/oojs-ui/oojs-ui-mediawiki.js index de4144c..502a06c 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:42:51Z + * Date: 2014-11-06T19:07:39Z */ /** * @class diff --git a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css index 981af19..7f3b2e9 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:43:01Z + * Date: 2014-11-06T19:07:49Z */ /* @noflip */ .oo-ui-rtl { @@ -1138,6 +1138,54 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { right: -1.75em; } +.oo-ui-checkboxInputWidget { + position: relative; + line-height: 1.6em; +} +.oo-ui-checkboxInputWidget * { + vertical-align: middle; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] { + opacity: 0; + width: 1.6em; + height: 1.6em; + max-width: none; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] + span { + cursor: pointer; + margin: 0 0.4em; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] + span::before { + content: ""; + position: absolute; + right: 0; + border-radius: 0.3em; + width: 1.6em; + height: 1.6em; + background-color: #ffffff; + border: 1px solid grey; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:checked + span::before { + background-image: /* @embed */ url(themes/mediawiki/images/icons/check-constructive.svg); + background-size: 1.6em, 1.6em; + background-repeat: no-repeat; + background-position: center top; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:active + span::after, +.oo-ui-checkboxInputWidget input[type="checkbox"]:focus + span::after { + content: ""; + position: absolute; + width: 1.6em; + height: 1.5em; + right: 1px; + border-bottom: solid 0.2em #d3d3d3; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:disabled + span { + cursor: default; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:disabled + span::before { + background-color: lightgrey; +} .oo-ui-textInputWidget { position: relative; -webkit-box-sizing: border-box; @@ -1898,9 +1946,9 @@ .oo-ui-icon-check { background-image: /* @embed */ url(themes/mediawiki/images/icons/check.png); } -.oo-ui-image-primary .oo-ui-icon-check, -.oo-ui-image-primary.oo-ui-icon-check { - background-image: /* @embed */ url(themes/mediawiki/images/icons/check-primary.png); +.oo-ui-image-constructive .oo-ui-icon-check, +.oo-ui-image-constructive.oo-ui-icon-check { + background-image: /* @embed */ url(themes/mediawiki/images/icons/check-constructive.png); } .oo-ui-image-invert .oo-ui-icon-check, .oo-ui-image-invert.oo-ui-icon-check { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/lib/oojs-ui/oojs-ui-mediawiki.svg.css index bf8a1ee..3e57fca 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.svg.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:43:01Z + * Date: 2014-11-06T19:07:49Z */ /* @noflip */ .oo-ui-rtl { @@ -1138,6 +1138,54 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { left: -1.75em; } +.oo-ui-checkboxInputWidget { + position: relative; + line-height: 1.6em; +} +.oo-ui-checkboxInputWidget * { + vertical-align: middle; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] { + opacity: 0; + width: 1.6em; + height: 1.6em; + max-width: none; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] + span { + cursor: pointer; + margin: 0 0.4em; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] + span::before { + content: ""; + position: absolute; + left: 0; + border-radius: 0.3em; + width: 1.6em; + height: 1.6em; + background-color: #ffffff; + border: 1px solid grey; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:checked + span::before { + background-image: /* @embed */ url(themes/mediawiki/images/icons/check-constructive.svg); + background-size: 1.6em, 1.6em; + background-repeat: no-repeat; + background-position: center top; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:active + span::after, +.oo-ui-checkboxInputWidget input[type="checkbox"]:focus + span::after { + content: ""; + position: absolute; + width: 1.6em; + height: 1.5em; + left: 1px; + border-bottom: solid 0.2em #d3d3d3; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:disabled + span { + cursor: default; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:disabled + span::before { + background-color: lightgrey; +} .oo-ui-textInputWidget { position: relative; -webkit-box-sizing: border-box; @@ -1898,9 +1946,9 @@ .oo-ui-icon-check { background-image: /* @embed */ url(themes/mediawiki/images/icons/check.svg); } -.oo-ui-image-primary .oo-ui-icon-check, -.oo-ui-image-primary.oo-ui-icon-check { - background-image: /* @embed */ url(themes/mediawiki/images/icons/check-primary.svg); +.oo-ui-image-constructive .oo-ui-icon-check, +.oo-ui-image-constructive.oo-ui-icon-check { + background-image: /* @embed */ url(themes/mediawiki/images/icons/check-constructive.svg); } .oo-ui-image-invert .oo-ui-icon-check, .oo-ui-image-invert.oo-ui-icon-check { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css index 0276e93..500af1d 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:43:01Z + * Date: 2014-11-06T19:07:49Z */ /* @noflip */ .oo-ui-rtl { @@ -1138,6 +1138,54 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { right: -1.75em; } +.oo-ui-checkboxInputWidget { + position: relative; + line-height: 1.6em; +} +.oo-ui-checkboxInputWidget * { + vertical-align: middle; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] { + opacity: 0; + width: 1.6em; + height: 1.6em; + max-width: none; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] + span { + cursor: pointer; + margin: 0 0.4em; +} +.oo-ui-checkboxInputWidget input[type="checkbox"] + span::before { + content: ""; + position: absolute; + right: 0; + border-radius: 0.3em; + width: 1.6em; + height: 1.6em; + background-color: #ffffff; + border: 1px solid grey; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:checked + span::before { + background-image: /* @embed */ url(themes/mediawiki/images/icons/check-constructive.svg); + background-size: 1.6em, 1.6em; + background-repeat: no-repeat; + background-position: center top; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:active + span::after, +.oo-ui-checkboxInputWidget input[type="checkbox"]:focus + span::after { + content: ""; + position: absolute; + width: 1.6em; + height: 1.5em; + right: 1px; + border-bottom: solid 0.2em #d3d3d3; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:disabled + span { + cursor: default; +} +.oo-ui-checkboxInputWidget input[type="checkbox"]:disabled + span::before { + background-color: lightgrey; +} .oo-ui-textInputWidget { position: relative; -webkit-box-sizing: border-box; @@ -1898,9 +1946,9 @@ .oo-ui-icon-check { background-image: /* @embed */ url(themes/mediawiki/images/icons/check.svg); } -.oo-ui-image-primary .oo-ui-icon-check, -.oo-ui-image-primary.oo-ui-icon-check { - background-image: /* @embed */ url(themes/mediawiki/images/icons/check-primary.svg); +.oo-ui-image-constructive .oo-ui-icon-check, +.oo-ui-image-constructive.oo-ui-icon-check { + background-image: /* @embed */ url(themes/mediawiki/images/icons/check-constructive.svg); } .oo-ui-image-invert .oo-ui-icon-check, .oo-ui-image-invert.oo-ui-icon-check { diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js index eb38aa4..c892718 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 (b38d485723) + * OOjs UI v0.1.0-pre (12b66051ff) * 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-11-04T22:42:51Z + * Date: 2014-11-06T19:07:39Z */ ( function ( OO ) { @@ -2856,7 +2856,7 @@ // Window opening if ( opening.state() !== 'rejected' ) { // Begin loading the window if it's not loading or loaded already - may take noticable time - // and we want to do this in paralell with any other preparatory actions + // and we want to do this in parallel with any other preparatory actions if ( !win.isLoading() && !win.isLoaded() ) { // Finish initializing the window (must be done after manager is attached to DOM) win.setManager( this ); @@ -3859,7 +3859,7 @@ groupEvent = events[itemEvent]; // Remove existing aggregated event - if ( itemEvent in this.aggregateItemEvents ) { + if ( Object.prototype.hasOwnProperty.call( this.aggregateItemEvents, itemEvent ) ) { // Don't allow duplicate aggregations if ( groupEvent ) { throw new Error( 'Duplicate item event aggregation for ' + itemEvent ); @@ -3966,7 +3966,7 @@ !$.isEmptyObject( this.aggregateItemEvents ) ) { remove = {}; - if ( itemEvent in this.aggregateItemEvents ) { + if ( Object.prototype.hasOwnProperty.call( this.aggregateItemEvents, itemEvent ) ) { remove[itemEvent] = [ 'emit', this.aggregateItemEvents[itemEvent], item ]; } item.disconnect( this, remove ); @@ -3998,7 +3998,7 @@ !$.isEmptyObject( this.aggregateItemEvents ) ) { remove = {}; - if ( itemEvent in this.aggregateItemEvents ) { + if ( Object.prototype.hasOwnProperty.call( this.aggregateItemEvents, itemEvent ) ) { remove[itemEvent] = [ 'emit', this.aggregateItemEvents[itemEvent], item ]; } item.disconnect( this, remove ); @@ -8103,7 +8103,7 @@ ourRequest; this.abortLookupRequest(); - if ( value in this.lookupCache ) { + if ( Object.prototype.hasOwnProperty.call( this.lookupCache, value ) ) { deferred.resolve( this.getLookupMenuItemsFromData( this.lookupCache[value] ) ); } else { this.lookupInput.pushPending(); @@ -9048,7 +9048,7 @@ 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, $( '<span>' ) ); this.setValue( config.value ); }; @@ -9955,9 +9955,6 @@ .attr( 'role', 'option' ) .addClass( 'oo-ui-optionWidget' ) .append( this.$label ); - this.$element - .prepend( this.$icon ) - .append( this.$indicator ); }; /* Setup */ @@ -11153,7 +11150,7 @@ OO.ui.SelectWidget.prototype.getItemFromData = function ( data ) { var hash = OO.getHash( data ); - if ( hash in this.hashes ) { + if ( Object.prototype.hasOwnProperty.call( this.hashes, hash ) ) { return this.hashes[hash]; } @@ -11340,7 +11337,7 @@ for ( i = 0, len = items.length; i < len; i++ ) { item = items[i]; hash = OO.getHash( item.getData() ); - if ( hash in this.hashes ) { + if ( Object.prototype.hasOwnProperty.call( this.hashes, hash ) ) { // Remove item with same value remove.push( this.hashes[hash] ); } @@ -11374,7 +11371,7 @@ for ( i = 0, len = items.length; i < len; i++ ) { item = items[i]; hash = OO.getHash( item.getData() ); - if ( hash in this.hashes ) { + if ( Object.prototype.hasOwnProperty.call( this.hashes, hash ) ) { // Remove existing item delete this.hashes[hash]; } diff --git a/lib/oojs-ui/themes/mediawiki/images/icons/check-primary.svg b/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.svg similarity index 79% rename from lib/oojs-ui/themes/mediawiki/images/icons/check-primary.svg rename to lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.svg index 6139b58..90923d5 100644 --- a/lib/oojs-ui/themes/mediawiki/images/icons/check-primary.svg +++ b/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0, 0, 24, 24"><style>* { fill: #598AD1 }</style> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0, 0, 24, 24"><style>* { fill: #00C697 }</style> <g id="check"> <path d="M7.105 13.473l1.422-1.423 1.901 1.902 4.81-6.952 1.657 1.148-6.26 8.852z"/> </g> -- To view, visit https://gerrit.wikimedia.org/r/171614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2919d80b9ea5231f45b1e14ae1393a0f7665ec0c Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
