jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403972 )
Change subject: build, demos, docs: Use “OOUI” as unified name ...................................................................... build, demos, docs: Use “OOUI” as unified name Bug: T182360 Change-Id: I005741ff06ff87725c29a9a4bb554572fc17594e --- M .phpcs.xml M Doxyfile M Gruntfile.js M LICENSE-MIT M README.md M build/banner.txt M build/modules.yaml M composer.json M demos/demos.php M demos/index.html M jsduck.categories.json M jsduck.eg-iframe.html M jsduck.json M package.json M tests/QUnit.assert.equalDomElement.js M tests/index.php 16 files changed, 24 insertions(+), 24 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/.phpcs.xml b/.phpcs.xml index 742566f..c117f3c 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<ruleset name="OOjs UI"> +<ruleset name="OOUI"> <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki"> <!-- Disabled because "@param string $config['foo']" confuses it --> <exclude name="MediaWiki.Commenting.FunctionComment.ExtraParamComment" /> diff --git a/Doxyfile b/Doxyfile index 938aa52..fe6bd6b 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,7 +1,7 @@ # Configuration file for Doxygen -PROJECT_NAME = "OOjs UI" -PROJECT_BRIEF = "Object-Oriented JavaScript – User Interface" +PROJECT_NAME = "OOUI" +PROJECT_BRIEF = "Object-Oriented User Interface" OUTPUT_DIRECTORY = doc diff --git a/Gruntfile.js b/Gruntfile.js index 0eeb524..9745817 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -17,7 +17,7 @@ concatJsFiles = {}, concatOmnibus = {}, rtlFiles = {}, - minBanner = '/*! OOjs UI v<%= pkg.version %> | http://oojs.mit-license.org */'; + minBanner = '/*! OOUI v<%= pkg.version %> | http://oojs.mit-license.org */'; grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.loadNpmTasks( 'grunt-contrib-clean' ); diff --git a/LICENSE-MIT b/LICENSE-MIT index 7648d4c..8f0984c 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright 2011-2018 OOjs UI Team and other contributors. +Copyright 2011-2018 OOUI Team and other contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index f10330f..6e98d42 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ [![npm](https://img.shields.io/npm/v/oojs-ui.svg?style=flat)](https://www.npmjs.com/package/oojs-ui) [![Packagist](https://img.shields.io/packagist/v/oojs/oojs-ui.svg?style=flat)](https://packagist.org/packages/oojs/oojs-ui) [![David](https://img.shields.io/david/dev/wikimedia/oojs-ui.svg?style=flat)](https://david-dm.org/wikimedia/oojs-ui#info=devDependencies) -OOjs UI +OOUI ================= -OOjs UI is a component-based JavaScript UI library. Key features: +OOUI is a component-based JavaScript UI library. Key features: * Common widgets, layouts, and dialogs * Classes, elements, and mixins to create custom interfaces @@ -95,7 +95,7 @@ * Join the Wikimedia Developers mailing list, [wikitech-l](https://lists.wikimedia.org/mailman/listinfo/wikitech-l). * Chat with the maintainers on `#wikimedia-dev` on `irc.freenode.net`. * Ask questions on [StackOverflow](https://stackoverflow.com/tags/oojs-ui/info). -* Watchlist the [documentation](https://www.mediawiki.org/wiki/OOjs_UI) on MediaWiki to stay updated. +* Watchlist the [documentation](https://www.mediawiki.org/wiki/OOUI) on MediaWiki to stay updated. Versioning diff --git a/build/banner.txt b/build/banner.txt index e648477..0b32af1 100644 --- a/build/banner.txt +++ b/build/banner.txt @@ -1,8 +1,8 @@ /*! - * OOjs UI v<%= pkg.version %> - * https://www.mediawiki.org/wiki/OOjs_UI + * OOUI v<%= pkg.version %> + * https://www.mediawiki.org/wiki/OOUI * - * Copyright 2011–<%= grunt.template.today("yyyy") %> OOjs UI Team and other contributors. + * Copyright 2011–<%= grunt.template.today("yyyy") %> OOUI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * diff --git a/build/modules.yaml b/build/modules.yaml index 009d003..4a71c31 100644 --- a/build/modules.yaml +++ b/build/modules.yaml @@ -15,7 +15,7 @@ "src/Widget.js", "src/Theme.js", - # Basic element mixins. These should be the same classes that are supported in OOjs UI PHP. + # Basic element mixins. These should be the same classes that are supported in OOUI PHP. "src/mixins/TabIndexedElement.js", "src/mixins/ButtonElement.js", "src/mixins/GroupElement.js", @@ -26,8 +26,8 @@ "src/mixins/TitledElement.js", "src/mixins/AccessKeyedElement.js", - # The basic widgets and layouts. These should be the same classes that are supported in OOjs - # UI PHP. (Continued below, as some dependencies below depend on these.) + # The basic widgets and layouts. These should be the same classes that are supported in + # OOUI PHP. (Continued below, as some dependencies below depend on these.) "src/widgets/ButtonWidget.js", "src/widgets/ButtonGroupWidget.js", "src/widgets/IconWidget.js", @@ -87,7 +87,7 @@ "src/layouts/HorizontalLayout.js" ] }, - # Additional widgets and layouts module. These have no equivalent in OOjs UI PHP. + # Additional widgets and layouts module. These have no equivalent in OOUI PHP. "oojs-ui-widgets": { "scripts": [ "src/mixins/DraggableElement.js", diff --git a/composer.json b/composer.json index eabd746..4e65b46 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "oojs/oojs-ui", "description": "Provides library of common widgets, layouts, and windows.", - "homepage": "https://www.mediawiki.org/wiki/OOjs_UI", + "homepage": "https://www.mediawiki.org/wiki/OOUI", "license": "MIT", "require": { "mediawiki/at-ease": "1.1.0", diff --git a/demos/demos.php b/demos/demos.php index 00eaca4..39082b7 100644 --- a/demos/demos.php +++ b/demos/demos.php @@ -81,7 +81,7 @@ <html lang="en" dir="<?php echo $direction; ?>"> <head> <meta charset="UTF-8"> - <title>OOjs UI Widget Demo</title> + <title>OOUI Widget Demo</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <?php foreach ( $urls as $url ) { diff --git a/demos/index.html b/demos/index.html index d3ef499..93cc9c6 100644 --- a/demos/index.html +++ b/demos/index.html @@ -2,7 +2,7 @@ <html lang="en" dir="ltr"> <head> <meta charset="UTF-8"> - <title>OOjs UI Demos</title> + <title>OOUI Demos</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="classes/ButtonStyleShowcaseWidget.css"> <link rel="stylesheet" href="classes/SimpleWidget.css"> diff --git a/jsduck.categories.json b/jsduck.categories.json index 07fbd39..e1a09d5 100644 --- a/jsduck.categories.json +++ b/jsduck.categories.json @@ -1,6 +1,6 @@ [ { - "name": "OOjs UI", + "name": "OOUI", "groups": [ { "name": "General", diff --git a/jsduck.eg-iframe.html b/jsduck.eg-iframe.html index fad81be..064956c 100644 --- a/jsduck.eg-iframe.html +++ b/jsduck.eg-iframe.html @@ -2,7 +2,7 @@ <html lang="en" dir="ltr"> <head> <meta charset="UTF-8"> - <title>OOjs UI example</title> + <title>OOUI example</title> <!-- Prevent scaling on mobile devices which cause problems with dialog sizing --> <meta name="viewport" content="width=device-width, user-scalable=no"> <style> diff --git a/jsduck.json b/jsduck.json index 2eae6e6..541b71f 100644 --- a/jsduck.json +++ b/jsduck.json @@ -1,5 +1,5 @@ { - "--title": "OOjs UI - Documentation", + "--title": "OOUI - Documentation", "--output": "docs", "--categories": "./jsduck.categories.json", "--eg-iframe": "./jsduck.eg-iframe.html", diff --git a/package.json b/package.json index 38065b6..ce7669b 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "oojs-plugin", "ui" ], - "homepage": "https://www.mediawiki.org/wiki/OOjs UI", + "homepage": "https://www.mediawiki.org/wiki/OOUI", "repository": { "type": "git", "url": "https://phabricator.wikimedia.org/diffusion/GOJU/oojs-ui.git" diff --git a/tests/QUnit.assert.equalDomElement.js b/tests/QUnit.assert.equalDomElement.js index c34791f..d8d6ccb 100644 --- a/tests/QUnit.assert.equalDomElement.js +++ b/tests/QUnit.assert.equalDomElement.js @@ -113,7 +113,7 @@ summary.children = []; } - // Filter out acceptable differences between OOjs UI's PHP widgets and JS widgets + // Filter out acceptable differences between OOUI's PHP widgets and JS widgets // Automatically generated IDs (Tag::generateElementId(), OO.ui.generateElementId()) for ( i = 0; i < autogeneratedAttributes.length; i++ ) { attribute = autogeneratedAttributes[ i ]; diff --git a/tests/index.php b/tests/index.php index 5f76c96..4537b5a 100644 --- a/tests/index.php +++ b/tests/index.php @@ -18,7 +18,7 @@ <html lang="en" dir="ltr"> <head> <meta charset="UTF-8"> - <title>OOjs UI Test Suite</title> + <title>OOUI Test Suite</title> <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css"> <script src="../node_modules/qunitjs/qunit/qunit.js"></script> <script src="./QUnit.assert.equalDomElement.js"></script> -- To view, visit https://gerrit.wikimedia.org/r/403972 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I005741ff06ff87725c29a9a4bb554572fc17594e Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE <volke...@wikimedia.org> Gerrit-Reviewer: Esanders <esand...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Prtksxna <psax...@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