jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/389883 )
Change subject: Update OOjs UI to v0.24.2 ...................................................................... Update OOjs UI to v0.24.2 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.2 Change-Id: I0e9d3f690349f9f01fb6424f9cb8468ebb21455a --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/History.md M oojs/oojs-ui/README.md M oojs/oojs-ui/demos/classes/SimpleWidget.css M oojs/oojs-ui/demos/pages/icons.js M oojs/oojs-ui/i18n/ka.json M oojs/oojs-ui/package.json 9 files changed, 150 insertions(+), 137 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/composer.json b/composer.json index c199fc7..1a0aaf4 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,7 @@ "mustangostang/spyc": "0.6.2", "nikic/php-parser": "3.0.6", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.24.1", + "oojs/oojs-ui": "0.24.2", "oyejorge/less.php": "1.7.0.14", "pear/console_getopt": "1.4.1", "pear/mail": "1.4.1", diff --git a/composer.lock b/composer.lock index 03b9953..87637a3 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": "6e88396c7cd175ffe4c7797f58573675", + "content-hash": "47546374fd63a4783d14b8430f4a56ef", "packages": [ { "name": "composer/semver", @@ -1193,16 +1193,16 @@ }, { "name": "oojs/oojs-ui", - "version": "v0.24.1", + "version": "v0.24.2", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "460b3700d80073dad91de8391eb7975c9a1ba34b" + "reference": "b6d9d5e50940a7c56d329a605c64d51f147aab80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/460b3700d80073dad91de8391eb7975c9a1ba34b";, - "reference": "460b3700d80073dad91de8391eb7975c9a1ba34b", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/b6d9d5e50940a7c56d329a605c64d51f147aab80";, + "reference": "b6d9d5e50940a7c56d329a605c64d51f147aab80", "shasum": "" }, "require": { @@ -1268,7 +1268,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";, - "time": "2017-10-31T22:31:08+00:00" + "time": "2017-11-07T21:27:09+00:00" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index 119c36e..838bea6 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2885,87 +2885,6 @@ "homepage": "https://www.mediawiki.org/wiki/Equivset"; }, { - "name": "oojs/oojs-ui", - "version": "v0.24.1", - "version_normalized": "0.24.1.0", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/oojs-ui.git";, - "reference": "460b3700d80073dad91de8391eb7975c9a1ba34b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/460b3700d80073dad91de8391eb7975c9a1ba34b";, - "reference": "460b3700d80073dad91de8391eb7975c9a1ba34b", - "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": "14.1.0", - "phpunit/phpunit": "4.8.21" - }, - "time": "2017-10-31T22:31:08+00:00", - "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": "serialization/serialization", "version": "3.2.2", "version_normalized": "3.2.2.0", @@ -3780,5 +3699,86 @@ "wikibase", "wikidata" ] + }, + { + "name": "oojs/oojs-ui", + "version": "v0.24.2", + "version_normalized": "0.24.2.0", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/oojs-ui.git";, + "reference": "b6d9d5e50940a7c56d329a605c64d51f147aab80" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/b6d9d5e50940a7c56d329a605c64d51f147aab80";, + "reference": "b6d9d5e50940a7c56d329a605c64d51f147aab80", + "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": "14.1.0", + "phpunit/phpunit": "4.8.21" + }, + "time": "2017-11-07T21:27:09+00:00", + "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 e74043f..1ee8904 100644 --- a/oojs/oojs-ui/History.md +++ b/oojs/oojs-ui/History.md @@ -1,4 +1,16 @@ # OOjs UI Release History +## v0.24.2 / 2017-11-07 +### Deprecations +* [DEPRECATING CHANGE] Use en-US spelling for icon names for consistency (Ed Sanders) + +### Code +* README: Consistently refer to OOUI as library (Volker E.) +* README: Fix Doxygen rendering (Volker E.) +* README: Simplify “Quick start” and “Contributing” section (Volker E.) +* demos: Correct and simplify SimpleWidget styles (Bartosz Dziewoński) +* docs: onMenuToggle: `isVisible` is the state of the menu (Prateek Saxena) + + ## v0.24.1 / 2017-10-31 ### Features * DropdownWidget: Allow pressing Space to close the widget, as well as open (Bartosz Dziewoński) diff --git a/oojs/oojs-ui/README.md b/oojs/oojs-ui/README.md index 8439be9..de5ac94 100644 --- a/oojs/oojs-ui/README.md +++ b/oojs/oojs-ui/README.md @@ -3,43 +3,40 @@ OOjs UI ================= -OOjs UI is a modern JavaScript UI toolkit. It provides common widgets, layouts, dialogs and icons that are ready to use, as well as many useful and convenient classes for constructing custom user interfaces. It is the standard user-interface library in Wikimedia Foundation Web products, having been originally created for use by [VisualEditor](https://www.mediawiki.org/wiki/VisualEditor), which uses it for its entire user interface. +OOjs UI is a modern JavaScript UI library. It provides common widgets, layouts, dialogs and icons that are ready to use, as well as many useful and convenient classes for constructing custom user interfaces. It is the standard user-interface library in Wikimedia Foundation Web products, having been originally created for use by [VisualEditor](https://www.mediawiki.org/wiki/VisualEditor), which uses it for its entire user interface. + Quick start ---------- -This library is available as an [npm](https://npmjs.org/) package! Install it right away: +The library is available on [npm](https://www.npmjs.com/package/oojs-ui). To install: + <pre lang="bash"> -npm install oojs-ui +$ npm install oojs-ui </pre> -If you don't want to use npm, you can: +Once installed, include the following scripts and styles to get started: -1. Clone the repo and move into it, `$ git clone https://phabricator.wikimedia.org/diffusion/GOJU/oojs-ui.git oojs-ui && cd oojs-ui`. +<pre lang="html"> +<script src="node_modules/jquery/dist/jquery.min.js"></script> +<script src="node_modules/oojs/dist/oojs.min.js"></script> -2. Install Grunt command-line utility:<br>`$ npm install -g grunt-cli` - -3. Install [composer](https://getcomposer.org/download/) and make sure running `composer` will execute it (*e.g.* add it to `$PATH` in POSIX environments). - -4. Install dev dependencies:<br>`$ npm install` - -5. Build the library (you can alternatively use `grunt quick-build` if you don't need to rebuild the PNGs):<br>`$ grunt build` - -6. You can now copy the distribution files from the dist directory into your project. - -7. You can see a suite of demos in `/demos` by executing:<br>`$ npm run-script demos` +<script src="node_modules/oojs-ui/dist/oojs-ui.min.js"></script> +<script src="node_modules/oojs-ui/dist/oojs-ui-wikimediaui.min.js"></script> +<link rel="stylesheet" href="node_modules/oojs-ui/dist/oojs-ui-wikimediaui.min.css"> +</pre> Loading the library ------------------- -While the distribution directory is chock-full of files, you will normally only need to load three: +While the distribution directory is chock-full of files, you will normally load only the following three: * `oojs-ui.js`, containing the full library; * One of `oojs-ui-wikimediaui.css` or `oojs-ui-apex.css`, containing theme-specific styles; and * One of `oojs-ui-wikimediaui.js` or `oojs-ui-apex.js`, containing theme-specific code -You can load additional icon packs from files named `oojs-ui-wikimediaui-icons-*.css` or `oojs-ui-apex-icons-*.css`. +You can load additional icon packs from files named `oojs-ui-wikimediaui-icons-*.css` or `oojs-ui-apex-icons-*.css`. The remaining files make it possible to load only parts of the whole library. @@ -55,14 +52,31 @@ Contributing ------------ -We are always delighted when people contribute patches. We recommend a few things to make it quicker and easier for you to contribute: +We are always delighted when people contribute patches. To setup your development environment: -* You will need a [Wikitech account](https://wikitech.wikimedia.org/w/index.php?title=Special:UserLogin&returnto=Help%3AGetting+Started&type=signup) which you can use to login to [Gerrit](https://gerrit.wikimedia.org/), our code review system. -* You will need a [Wikimedia account](https://www.mediawiki.org/w/index.php?title=Special:UserLogin&type=signup), which you can [use to login to Phabricator](https://www.mediawiki.org/w/index.php?title=Special:UserLogin&returnto=Special%3AOAuth%2Fauthorize&returntoquery=oauth_token%3D2fa60627878b83173e0196040b983326%26oauth_consumer_key%3D038ec949b263dc807b0079fd88538f37). -* You should [create a Phabricator ticket](https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=PHID-PROJ-dgmoevjqeqlerleqzzx5) describing the issue you wish to change. + +1. Clone the repo: `$ git clone https://phabricator.wikimedia.org/diffusion/GOJU/oojs-ui.git oojs-ui` + +2. Move into the library directory:<br>`$ cd oojs-ui` + +3. Install [composer](https://getcomposer.org/download/) and make sure running `composer` will execute it (*e.g.* add it to `$PATH` in POSIX environments). + +4. Install dev dependencies:<br>`$ npm install` + +5. Build the library (you can alternatively use `grunt quick-build` if you don't need to rebuild the PNGs):<br>`$ grunt build` + +6. You can see a suite of demos in `/demos` by executing:<br>`$ npm run-script demos` + +7. You can also copy the distribution files from the dist directory into your project. + + +We use [Gerrit](https://gerrit.wikimedia.org/) for code review, and [Phabricator](https://phabricator.wikimedia.org) to track issues. To contribute patches or join discussions all you need is a [developer account](https://wikitech.wikimedia.org/w/index.php?title=Special:CreateAccount&returnto=Help%3AGetting+Started). + +* If you've found a bug, or wish to request a feature [raise a ticket on Phabricator](https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=PHID-PROJ-dgmoevjqeqlerleqzzx5). +* To submit your patch, follow [the "getting started" quick-guide](https://www.mediawiki.org/wiki/Gerrit/Getting_started). We try to review patches within a week. * We automatically lint and style-check changes to JavaScript, PHP, LESS/CSS, Ruby and JSON files. You can test these yourself with `npm test` and `composer test` locally before pushing changes. SVG files should be squashed in advance of committing with [SVGO](https://github.com/svg/svgo) using `svgo --pretty --disable=removeXMLProcInst --disable=cleanupIDs <filename>`. -* To submit your patch, follow [the "getting started" quick-guide](https://www.mediawiki.org/wiki/Gerrit/Getting_started). You should expect to get code review within a day or two. -* A new version of the library is released most weeks on Tuesdays. + +A new version of the library is released most weeks on Tuesdays. Versioning @@ -79,7 +93,8 @@ ---------- Release process: -```bash +<pre lang="bash"> + $ cd path/to/oojs-ui/ $ git remote update $ git checkout -B release -t origin/master @@ -114,4 +129,5 @@ $ git checkout origin/master $ git tag "vX.X.X" $ npm run publish-build && git push --tags && npm publish -``` + +</pre> diff --git a/oojs/oojs-ui/demos/classes/SimpleWidget.css b/oojs/oojs-ui/demos/classes/SimpleWidget.css index b7f501f..04f0844 100644 --- a/oojs/oojs-ui/demos/classes/SimpleWidget.css +++ b/oojs/oojs-ui/demos/classes/SimpleWidget.css @@ -5,10 +5,8 @@ line-height: 1; } -.demo-simpleWidget.oo-ui-iconElement .oo-ui-iconElement-icon, -.demo-simpleWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { - top: 0; - height: 100%; +.demo-simpleWidget.oo-ui-labelElement { + line-height: 1.172em; } .demo-simpleWidget.oo-ui-iconElement { @@ -17,24 +15,9 @@ .demo-simpleWidget.oo-ui-iconElement .oo-ui-iconElement-icon { position: absolute; - bottom: 0; - right: 0; left: 0.9375em; } -.demo-simpleWidget.oo-ui-labelElement-label { - line-height: 1.172em; -} - -.demo-simpleWidget.oo-ui-indicatorElement { - padding-right: 2.5em; -} - -.demo-simpleWidget.oo-ui-indicatorElement-indicator { - right: 0.9375em; -} - -.demo-simpleWidget.oo-ui-widget-disabled .oo-ui-iconElement-icon, -.demo-simpleWidget.oo-ui-widget-disabled .oo-ui-indicatorElement-indicator { +.demo-simpleWidget.oo-ui-widget-disabled .oo-ui-iconElement-icon { opacity: 0.51; } diff --git a/oojs/oojs-ui/demos/pages/icons.js b/oojs/oojs-ui/demos/pages/icons.js index 7c459c9..8ae0e63 100644 --- a/oojs/oojs-ui/demos/pages/icons.js +++ b/oojs/oojs-ui/demos/pages/icons.js @@ -118,7 +118,7 @@ 'outdent' ], 'editing-advanced': [ - 'alignCentre', + 'alignCenter', 'alignLeft', 'alignRight', 'attachment', diff --git a/oojs/oojs-ui/i18n/ka.json b/oojs/oojs-ui/i18n/ka.json index 31df169..8abe495 100644 --- a/oojs/oojs-ui/i18n/ka.json +++ b/oojs/oojs-ui/i18n/ka.json @@ -8,7 +8,8 @@ "MIKHEIL", "NoiX180", "Pras", - "Tokoko" + "Tokoko", + "Kintrbr" ] }, "ooui-outline-control-move-down": "ელემენტის ქვემოთ გადატანა", @@ -17,6 +18,7 @@ "ooui-toolbar-more": "მეტი", "ooui-toolgroup-expand": "მეტი", "ooui-toolgroup-collapse": "რამდენიმე", + "ooui-item-remove": "წაშლა", "ooui-dialog-message-accept": "დიახ", "ooui-dialog-message-reject": "გაუქმება", "ooui-dialog-process-error": "მოხდა რაღაც შეცდომა", diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json index 33a9326..fe90f39 100644 --- a/oojs/oojs-ui/package.json +++ b/oojs/oojs-ui/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.24.1", + "version": "0.24.2", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", -- To view, visit https://gerrit.wikimedia.org/r/389883 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e9d3f690349f9f01fb6424f9cb8468ebb21455a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> 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
