jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350661 )
Change subject: Revert "Update OOjs UI to v0.21.2"
......................................................................
Revert "Update OOjs UI to v0.21.2"
This is for MediaWiki 1.30 onwards; REL1_29 needs to be the one before.
This reverts commit e4b370b5a28e8cd877115a4a2d20a34e84a9c53b.
Change-Id: Id7cae80a4f3d84ea5d50003f2409537b307c08aa
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/pages/widgets.php
M oojs/oojs-ui/i18n/sr-ec.json
M oojs/oojs-ui/package.json
8 files changed, 43 insertions(+), 118 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 3487f5d..25b488c 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.22.1",
"nmred/kafka-php": "0.1.5",
- "oojs/oojs-ui": "0.21.2",
+ "oojs/oojs-ui": "0.21.1",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 9bf1907..f2416a4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "content-hash": "5e9b8ed80416591510aab12e330bfdd1",
+ "content-hash": "0504cf9f775f597b7227cc031c0faee2",
"packages": [
{
"name": "composer/semver",
@@ -466,16 +466,16 @@
},
{
"name": "oojs/oojs-ui",
- "version": "v0.21.2",
+ "version": "v0.21.1",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
- "reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01"
+ "reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/c8e485edc3da2a47fc225f0ff794405f1ef90c01";,
- "reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01",
+ "url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/59965a94e168c23d9dbb154d8a63f6a1abc7f537";,
+ "reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537",
"shasum": ""
},
"require": {
@@ -541,7 +541,7 @@
],
"description": "Provides library of common widgets, layouts, and
windows.",
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
- "time": "2017-04-26T00:45:31+00:00"
+ "time": "2017-04-18T23:06:13+00:00"
},
{
"name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index db6fd2b..d1b6acd 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2112,17 +2112,17 @@
},
{
"name": "oojs/oojs-ui",
- "version": "v0.21.2",
- "version_normalized": "0.21.2.0",
+ "version": "v0.21.1",
+ "version_normalized": "0.21.1.0",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
- "reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01"
+ "reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/c8e485edc3da2a47fc225f0ff794405f1ef90c01";,
- "reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01",
+ "url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/59965a94e168c23d9dbb154d8a63f6a1abc7f537";,
+ "reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537",
"shasum": ""
},
"require": {
@@ -2134,7 +2134,7 @@
"mediawiki/mediawiki-codesniffer": "0.6.0",
"phpunit/phpunit": "4.8.21"
},
- "time": "2017-04-26T00:45:31+00:00",
+ "time": "2017-04-18T23:06:13+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md
index 7aab2c8..f6e9955 100644
--- a/oojs/oojs-ui/History.md
+++ b/oojs/oojs-ui/History.md
@@ -1,30 +1,4 @@
# OOjs UI Release History
-## v0.21.2 / 2017-04-25
-### Features
-* Element: New method `#getElementId` (Bartosz Dziewoński)
-* NumberInputWidget: Remake as an actual TextInputWidget child (Moriel
Schottlender)
-
-### Styles
-* ProgressBarWidget: Switch to `box-sizing: border-box` (Volker E)
-* TabOptionWidget: Cleanup & align paddings/position to dialog environment
(Volker E)
-* MediaWiki theme: Decrease selector specificity and fix invalid appearance
(Volker E)
-* MediaWiki theme: Fix IE 7 oversized buttons (Volker E)
-* MediaWiki theme: Improve SearchWidget design (Volker E)
-
-### Code
-* Do not use `role=menu`/`menuitem` for MenuSelectWidget/MenuOptionWidget
(Bartosz Dziewoński)
-* PopupTagMultiselectWidget: Update popup position on resize (Prateek Saxena)
-* ProcessDialog: Display error messages on top of footer action buttons
(Bartosz Dziewoński)
-* SelectWidget/MenuSelectWidget: Maintain `aria-activedescendant` attribute on
focus owner (Bartosz Dziewoński)
-* Set ARIA `role=combobox` on DropdownWidget and LookupElement too (Bartosz
Dziewoński)
-* Set `aria-owns` for everything with a dropdown list (ARIA `role=combobox`)
(Bartosz Dziewoński)
-* Follow-up d22d23311: Don't reference OO.ui.ToolGroup blindly (James D.
Forrester)
-* build: Bump grunt-stylelint, bring in stylelint explicitly (James D.
Forrester)
-* demos: Add some more examples with 'accessKey' (Bartosz Dziewoński)
-* docs: Document Window#$overlay property (Bartosz Dziewoński)
-* tests: Drop unnecessary hints to qunit about the number of tests (James D.
Forrester)
-
-
## v0.21.1 / 2017-04-18
### Styles
* PopupWidget: Do not leave space for anchor if there's no anchor (Bartosz
Dziewoński)
diff --git a/oojs/oojs-ui/demos/pages/widgets.js
b/oojs/oojs-ui/demos/pages/widgets.js
index 27aa493..c139838 100644
--- a/oojs/oojs-ui/demos/pages/widgets.js
+++ b/oojs/oojs-ui/demos/pages/widgets.js
@@ -1388,10 +1388,10 @@
new OO.ui.TagMultiselectWidget( {
allowArbitrary: true,
inputPosition: 'outline',
- inputWidget: new
OO.ui.NumberInputWidget()
+ inputWidget: new
OO.ui.SearchInputWidget()
} ),
{
- label: 'TagMultiselectWidget
(inputwidget: OO.ui.NumberInputWidget, inputPosition:outline)',
+ label: 'TagMultiselectWidget
(inputwidget: OO.ui.SearchInputWidget, inputPosition:outline)',
align: 'top'
}
),
@@ -1620,21 +1620,11 @@
),
new OO.ui.FieldLayout(
new OO.ui.ButtonWidget( {
- label: 'Accesskey: H',
- accessKey: 'h'
- } ),
- {
- label: 'ButtonWidget (with
accesskey)\u200E',
- align: 'top'
- }
- ),
- new OO.ui.FieldLayout(
- new OO.ui.ButtonInputWidget( {
label: 'Accesskey: I',
accessKey: 'i'
} ),
{
- label: 'ButtonInputWidget (with
accesskey)\u200E',
+ label: 'ButtonWidget (with
accesskey)\u200E',
align: 'top'
}
),
@@ -1689,36 +1679,9 @@
}
),
new OO.ui.FieldLayout(
- new OO.ui.DropdownWidget( {
- menu: {
- items: [
- new
OO.ui.MenuOptionWidget( {
- data:
'a',
- label:
'Accesskey: P',
-
accessKey: 'p'
- } ),
- new
OO.ui.MenuOptionWidget( {
- data:
'b',
- label:
'Accesskey: Q',
-
accessKey: 'q'
- } ),
- new
OO.ui.MenuOptionWidget( {
- data:
'c',
- label:
'Accesskey: R',
-
accessKey: 'r'
- } )
- ]
- }
- } ),
- {
- align: 'top',
- label: 'DropdownWidget (with
accesskeys)\u200E'
- }
- ),
- new OO.ui.FieldLayout(
new OO.ui.TextInputWidget( {
- value: 'Accesskey: S',
- accessKey: 's'
+ value: 'Accesskey: P',
+ accessKey: 'p'
} ),
{
label: 'TextInputWidget (with
accesskey)\u200E',
diff --git a/oojs/oojs-ui/demos/pages/widgets.php
b/oojs/oojs-ui/demos/pages/widgets.php
index 44b6b48..9d9daa2 100644
--- a/oojs/oojs-ui/demos/pages/widgets.php
+++ b/oojs/oojs-ui/demos/pages/widgets.php
@@ -254,6 +254,16 @@
'align' => 'top'
]
),
+ new OOUI\FieldLayout(
+ new OOUI\ButtonWidget( [
+ 'label' => 'AccessKeyed',
+ 'accessKey' => 'k',
+ ] ),
+ [
+ 'label' => "ButtonWidget (with accesskey
k)\xE2\x80\x8E",
+ 'align' => 'top'
+ ]
+ )
]
] ) );
$demoContainer->appendContent( new OOUI\FieldsetLayout( [
@@ -455,6 +465,16 @@
] ),
[
'label' => "TextInputWidget
(disabled)\xE2\x80\x8E",
+ 'align' => 'top'
+ ]
+ ),
+ new OOUI\FieldLayout(
+ new OOUI\TextInputWidget( [
+ 'value' => 'Accesskey A',
+ 'accessKey' => 'a'
+ ] ),
+ [
+ 'label' => "TextInputWidget (with
Accesskey)\xE2\x80\x8E",
'align' => 'top'
]
),
@@ -692,36 +712,6 @@
[
'align' => 'top',
'label' => "ButtonInputWidget (frameless, using
<input>)\xE2\x80\x8E"
- ]
- ),
- new OOUI\FieldLayout(
- new OOUI\ButtonWidget( [
- 'label' => 'Accesskey: H',
- 'accessKey' => 'h'
- ] ),
- [
- 'label' => "ButtonWidget (with
accesskey)\xE2\x80\x8E",
- 'align' => 'top'
- ]
- ),
- new OOUI\FieldLayout(
- new OOUI\ButtonInputWidget( [
- 'label' => 'Accesskey: I',
- 'accessKey' => 'i'
- ] ),
- [
- 'label' => "ButtonInputWidget (with
accesskey)\xE2\x80\x8E",
- 'align' => 'top'
- ]
- ),
- new OOUI\FieldLayout(
- new OOUI\TextInputWidget( [
- 'value' => 'Accesskey: S',
- 'accessKey' => 's'
- ] ),
- [
- 'label' => "TextInputWidget (with
accesskey)\xE2\x80\x8E",
- 'align' => 'top'
]
)
]
diff --git a/oojs/oojs-ui/i18n/sr-ec.json b/oojs/oojs-ui/i18n/sr-ec.json
index 87b7c2b..9d3b926 100644
--- a/oojs/oojs-ui/i18n/sr-ec.json
+++ b/oojs/oojs-ui/i18n/sr-ec.json
@@ -4,12 +4,11 @@
"Milicevic01",
"Nikola Smolenski",
"Милан Јелисавчић",
- "Zoranzoki21",
- "Obsuser"
+ "Zoranzoki21"
]
},
- "ooui-outline-control-move-down": "Премести ставку надоле",
- "ooui-outline-control-move-up": "Премести ставку нагоре",
+ "ooui-outline-control-move-down": "Премести ставку на доле",
+ "ooui-outline-control-move-up": "Премести ставку на горе",
"ooui-outline-control-remove": "Уклони ставку",
"ooui-toolbar-more": "Више",
"ooui-toolgroup-expand": "Више",
diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json
index d0a7478..6ac8d60 100644
--- a/oojs/oojs-ui/package.json
+++ b/oojs/oojs-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.21.2",
+ "version": "0.21.1",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
@@ -45,7 +45,7 @@
"grunt-karma": "2.0.0",
"grunt-promise-q":
"git://github.com/jdforrester/grunt-promise-q.git#v0.1.1-wmf.1",
"grunt-string-replace": "1.3.1",
- "grunt-stylelint": "0.8.0",
+ "grunt-stylelint": "0.7.0",
"grunt-svg2png":
"git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf.1",
"grunt-tyops": "0.1.0",
"karma": "1.1.1",
@@ -55,7 +55,6 @@
"karma-qunit": "1.1.0",
"q": "1.4.1",
"qunitjs": "1.22.0",
- "stylelint": "7.8.0",
"stylelint-config-wikimedia": "0.4.1"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/350661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7cae80a4f3d84ea5d50003f2409537b307c08aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: REL1_29
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
