jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338024 )
Change subject: Revert "Revert "Revert "Update OOjs UI to v0.19.2"""
......................................................................
Revert "Revert "Revert "Update OOjs UI to v0.19.2"""
This reverts commit 4cb28cbcb348e985393d4b85ec2d3801aa3e1d5f.
Change-Id: I2a969f2a4c74b3a7a596be69882f816c3303a68f
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/package.json
6 files changed, 92 insertions(+), 113 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/composer.json b/composer.json
index eb1e070..f0cd9d7 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
- "oojs/oojs-ui": "0.19.2",
+ "oojs/oojs-ui": "0.19.1",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 595c8e9..411108d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "hash": "ab18d8e0cc932fec99b526c2d1e1fafc",
- "content-hash": "17e19b0718d463c61c3be9db39fc18e2",
+ "hash": "bd584c21af40cc628648796b0ccf8e91",
+ "content-hash": "008b82e482b471745b498860c2e038b4",
"packages": [
{
"name": "composer/semver",
@@ -466,16 +466,16 @@
},
{
"name": "oojs/oojs-ui",
- "version": "v0.19.2",
+ "version": "v0.19.1",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
- "reference": "58fb445bc1f2323548b736b84af8409a13499107"
+ "reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107";,
- "reference": "58fb445bc1f2323548b736b84af8409a13499107",
+ "url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605";,
+ "reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
"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-02-14 22:27:07"
+ "time": "2017-02-08 00:17:30"
},
{
"name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index fc8afc6..77eb7f8 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1895,6 +1895,87 @@
"description": "PHP port of the TextCat language guesser utility, see
http://odur.let.rug.nl/~vannoord/TextCat/.";
},
{
+ "name": "oojs/oojs-ui",
+ "version": "v0.19.1",
+ "version_normalized": "0.19.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wikimedia/oojs-ui.git";,
+ "reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605";,
+ "reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
+ "shasum": ""
+ },
+ "require": {
+ "mediawiki/at-ease": "1.1.0",
+ "php": ">=5.5.9"
+ },
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/mediawiki-codesniffer": "0.6.0",
+ "phpunit/phpunit": "4.8.21"
+ },
+ "time": "2017-02-08 00:17:30",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "php/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Timo Tijhof",
+ "email": "krinklem...@gmail.com"
+ },
+ {
+ "name": "Bartosz Dziewoński",
+ "email": "matma....@gmail.com"
+ },
+ {
+ "name": "Ed Sanders",
+ "email": "esand...@wikimedia.org"
+ },
+ {
+ "name": "James D. Forrester",
+ "email": "jforres...@wikimedia.org"
+ },
+ {
+ "name": "Kirsten Menger-Anderson",
+ "email": "kmen...@wikimedia.org"
+ },
+ {
+ "name": "Rob Moen",
+ "email": "rm...@wikimedia.org"
+ },
+ {
+ "name": "Roan Kattouw",
+ "email": "r...@wikimedia.org"
+ },
+ {
+ "name": "Trevor Parscal",
+ "email": "tre...@wikimedia.org"
+ },
+ {
+ "name": "Kunal Mehta",
+ "email": "lego...@gmail.com"
+ },
+ {
+ "name": "Prateek Saxena",
+ "email": "prtks...@gmail.com"
+ }
+ ],
+ "description": "Provides library of common widgets, layouts, and
windows.",
+ "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";
+ },
+ {
"name": "cssjanus/cssjanus",
"version": "v1.1.3",
"version_normalized": "1.1.3.0",
@@ -2017,86 +2098,5 @@
"psr",
"psr-3"
]
- },
- {
- "name": "oojs/oojs-ui",
- "version": "v0.19.2",
- "version_normalized": "0.19.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/oojs-ui.git";,
- "reference": "58fb445bc1f2323548b736b84af8409a13499107"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107";,
- "reference": "58fb445bc1f2323548b736b84af8409a13499107",
- "shasum": ""
- },
- "require": {
- "mediawiki/at-ease": "1.1.0",
- "php": ">=5.5.9"
- },
- "require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.6.0",
- "phpunit/phpunit": "4.8.21"
- },
- "time": "2017-02-14 22:27:07",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "php/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Timo Tijhof",
- "email": "krinklem...@gmail.com"
- },
- {
- "name": "Bartosz Dziewoński",
- "email": "matma....@gmail.com"
- },
- {
- "name": "Ed Sanders",
- "email": "esand...@wikimedia.org"
- },
- {
- "name": "James D. Forrester",
- "email": "jforres...@wikimedia.org"
- },
- {
- "name": "Kirsten Menger-Anderson",
- "email": "kmen...@wikimedia.org"
- },
- {
- "name": "Rob Moen",
- "email": "rm...@wikimedia.org"
- },
- {
- "name": "Roan Kattouw",
- "email": "r...@wikimedia.org"
- },
- {
- "name": "Trevor Parscal",
- "email": "tre...@wikimedia.org"
- },
- {
- "name": "Kunal Mehta",
- "email": "lego...@gmail.com"
- },
- {
- "name": "Prateek Saxena",
- "email": "prtks...@gmail.com"
- }
- ],
- "description": "Provides library of common widgets, layouts, and
windows.",
- "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";
}
]
diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md
index 3a6e9b7..d9532f5 100644
--- a/oojs/oojs-ui/History.md
+++ b/oojs/oojs-ui/History.md
@@ -1,20 +1,4 @@
# OOjs UI Release History
-## v0.19.2 / 2017-02-14
-### Features
-* CapsuleMultiselectWidget: Make labels work (Prateek Saxena)
-* FloatableElement, PopupWidget: Do positioning from the right in RTL (Roan
Kattouw)
-* TextInputWidget: getValidity: Check browser validation first (Prateek Saxena)
-
-### Styles
-* icons: Fix vertical alignment of eye icon (Ed Sanders)
-
-### Code
-* core: Do not clear unrelated flags when clearing 'progressive' (Bartosz
Dziewoński)
-* ActionWidget: Remove event listening code for widget's 'resize' event
(Prateek Saxena)
-* ClippableElement: Order matters (inexplicably) (Bartosz Dziewoński)
-* demos: Use longer text in popup in $overlay demo (Bartosz Dziewoński)
-
-
## v0.19.1 / 2017-02-07
### Features
* Dialog: Support meta as well as ctrl for modifier on enter key (David Lynch)
diff --git a/oojs/oojs-ui/demos/pages/dialogs.js
b/oojs/oojs-ui/demos/pages/dialogs.js
index 0bf3c59..f48d456 100644
--- a/oojs/oojs-ui/demos/pages/dialogs.js
+++ b/oojs/oojs-ui/demos/pages/dialogs.js
@@ -660,7 +660,7 @@
label: 'Popup button',
popup: {
padded: true,
- $content: this.makeContents()
+ $content: $( '<p>' ).text(
'Popup contents.' )
}
} ), $spacer.clone() ]
} ),
@@ -671,7 +671,7 @@
label: 'Popup button',
popup: {
padded: true,
- $content: this.makeContents()
+ $content: $( '<p>' ).text(
'Popup contents.' )
}
} ), $spacer.clone() ]
} ),
@@ -718,11 +718,6 @@
label: String( val )
} );
} );
- };
- DialogWithDropdowns.prototype.makeContents = function () {
- var loremIpsum = 'Lorem ipsum dolor sit amet, consectetur
adipisicing elit, ' +
- 'sed do eiusmod tempor incididunt ut labore et dolore
magna aliqua.\u200E';
- return $( '<p>' ).text( loremIpsum );
};
DialogWithDropdowns.prototype.getActionProcess = function ( action ) {
diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json
index 7e7e97f..0e30389 100644
--- a/oojs/oojs-ui/package.json
+++ b/oojs/oojs-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.19.2",
+ "version": "0.19.1",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/338024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a969f2a4c74b3a7a596be69882f816c3303a68f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: VolkerE <volke...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
