jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404601 )
Change subject: Rename prefixes of unique IDs to not mention "OOjs"
......................................................................
Rename prefixes of unique IDs to not mention "OOjs"
Following up the recent changes to unify the name of the library
to "OOUI".
Note that the prefixes in OOUI\Tag::generateElementId() and
OO.ui.generateElementId() must be different to avoid conflicts.
Change-Id: I0866d984aadf1fac24b790ccb2e26818eb5ad539
---
M php/Tag.php
M src/core.js
M tests/QUnit.assert.equalDomElement.js
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
diff --git a/php/Tag.php b/php/Tag.php
index e35fcd2..9f39861 100644
--- a/php/Tag.php
+++ b/php/Tag.php
@@ -279,7 +279,7 @@
*/
public static function generateElementId() {
self::$elementId++;
- return 'ooui-' . self::$elementId;
+ return 'ooui-php-' . self::$elementId;
}
/**
diff --git a/src/core.js b/src/core.js
index ba9081d..c4afac5 100644
--- a/src/core.js
+++ b/src/core.js
@@ -54,7 +54,7 @@
*/
OO.ui.generateElementId = function () {
OO.ui.elementId++;
- return 'oojsui-' + OO.ui.elementId;
+ return 'ooui-' + OO.ui.elementId;
};
/**
diff --git a/tests/QUnit.assert.equalDomElement.js
b/tests/QUnit.assert.equalDomElement.js
index d8d6ccb..afacb1a 100644
--- a/tests/QUnit.assert.equalDomElement.js
+++ b/tests/QUnit.assert.equalDomElement.js
@@ -119,7 +119,7 @@
attribute = autogeneratedAttributes[ i ];
if (
summary.attributes[ attribute ] !== undefined &&
- summary.attributes[ attribute ].match(
/^(ooui-|oojsui-)/ )
+ summary.attributes[ attribute ].match(
/^(ooui-php-|ooui-)/ )
) {
summary.attributes[ attribute ] =
'(autogenerated)';
}
--
To view, visit https://gerrit.wikimedia.org/r/404601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0866d984aadf1fac24b790ccb2e26818eb5ad539
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
