From: Volker E Date: Wed, 17 Jan 2018 07:04:01 +0000 (-0800) Subject: Hygiene: Use “OOUI” as unified name in build and code documentation X-Git-Tag: 1.31.0-rc.0~742^2 X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=21a36e80464f364d894eb49b3073069fc87f97b1;p=lhc%2Fweb%2Fwiklou.git Hygiene: Use “OOUI” as unified name in build and code documentation Bug: T182360 Change-Id: I981c574003fa505fe133be6da405e73330c4e9a1 --- diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json index 51f9417d30..e13129bb56 100644 --- a/docs/extension.schema.v2.json +++ b/docs/extension.schema.v2.json @@ -669,7 +669,7 @@ }, "SkinOOUIThemes": { "type": "object", - "description": "Map of skin names to OOjs UI themes to use. Same format as ResourceLoaderOOUIModule::$builtinSkinThemeMap." + "description": "Map of skin names to OOUI themes to use. Same format as ResourceLoaderOOUIModule::$builtinSkinThemeMap." }, "PasswordPolicy": { "type": "object", diff --git a/includes/htmlform/HTMLFormElement.php b/includes/htmlform/HTMLFormElement.php index 66d6143329..2830b9c258 100644 --- a/includes/htmlform/HTMLFormElement.php +++ b/includes/htmlform/HTMLFormElement.php @@ -1,7 +1,7 @@ addClasses( [ 'mw-htmlform-hide-if' ] ); } if ( $this->modules ) { - // JS code must be able to read this before infusing (before OOjs UI is even loaded), + // JS code must be able to read this before infusing (before OOUI is even loaded), // so we put this in a separate attribute (not with the rest of the config). // And it's not needed anymore after infusing, so we don't put it in JS config at all. $this->setAttributes( [ 'data-mw-modules' => implode( ',', $this->modules ) ] ); diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php index 9c301e6aa7..aab881129b 100644 --- a/includes/htmlform/HTMLFormField.php +++ b/includes/htmlform/HTMLFormField.php @@ -673,7 +673,7 @@ abstract class HTMLFormField { } /** - * Whether the field should be automatically infused. Note that all OOjs UI HTMLForm fields are + * Whether the field should be automatically infused. Note that all OOUI HTMLForm fields are * infusable (you can call OO.ui.infuse() on them), but not all are infused by default, since * there is no benefit in doing it e.g. for buttons and it's a small performance hit on page load. * @@ -686,7 +686,7 @@ abstract class HTMLFormField { /** * Get the list of extra ResourceLoader modules which must be loaded client-side before it's - * possible to infuse this field's OOjs UI widget. + * possible to infuse this field's OOUI widget. * * @return string[] */ diff --git a/maintenance/resources/update-oojs-ui.sh b/maintenance/resources/update-oojs-ui.sh index 799af4ca47..d1e6496dce 100755 --- a/maintenance/resources/update-oojs-ui.sh +++ b/maintenance/resources/update-oojs-ui.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu -# This script generates a commit that updates our copy of OOjs UI +# This script generates a commit that updates our copy of OOUI if [ -n "${2:-}" ] then @@ -20,7 +20,7 @@ git checkout composer.json git reset -- $TARGET_DIR git checkout -- $TARGET_DIR git fetch origin -git checkout -B upstream-oojs-ui origin/master +git checkout -B upstream-ooui origin/master # Fetch upstream version cd $NPM_DIR @@ -31,10 +31,10 @@ else npm install oojs-ui fi -OOJSUI_VERSION=$(node -e 'console.log(require("./node_modules/oojs-ui/package.json").version);') -if [ "$OOJSUI_VERSION" == "" ] +OOUI_VERSION=$(node -e 'console.log(require("./node_modules/oojs-ui/package.json").version);') +if [ "$OOUI_VERSION" == "" ] then - echo 'Could not find OOjs UI version' + echo 'Could not find OOUI version' exit 1 fi @@ -68,15 +68,15 @@ rm -rf "$NPM_DIR" cd $REPO_DIR COMMITMSG=$(cat <