[MediaWiki-commits] [Gerrit] oojs/ui[master]: Avoid unique ID conflicts between PHP and JS code

[Code Review]

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332755 )

Change subject: Avoid unique ID conflicts between PHP and JS code
......................................................................

Avoid unique ID conflicts between PHP and JS code

This undoes an incidental and not very well thought out change from
e7efb19369e9c6f822330b46ed968a363bcb5bd6.

Change-Id: I689c22c079eb85976327ef669767b277c0e59676
---
M src/core.js
M tests/QUnit.assert.equalDomElement.js
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/55/332755/1

diff --git a/src/core.js b/src/core.js
index fe57ee8..1aa9a10 100644
--- a/src/core.js
+++ b/src/core.js
@@ -54,7 +54,7 @@
  */
 OO.ui.generateElementId = function () {
        OO.ui.elementId++;
-       return 'ooui-' + OO.ui.elementId;
+       return 'oojsui-' + OO.ui.elementId;
 };
 
 /**
diff --git a/tests/QUnit.assert.equalDomElement.js 
b/tests/QUnit.assert.equalDomElement.js
index 269db79..94da6c0 100644
--- a/tests/QUnit.assert.equalDomElement.js
+++ b/tests/QUnit.assert.equalDomElement.js
@@ -82,7 +82,7 @@
 
                // Filter out acceptable differences between OOjs UI's PHP 
widgets and JS widgets
                // Automatically generated IDs (Tag::generateElementId(), 
OO.ui.generateElementId())
-               if ( summary.attributes.id !== undefined && 
summary.attributes.id.substr( 0, 5 ) === 'ooui-' ) {
+               if ( summary.attributes.id !== undefined && 
summary.attributes.id.match(/^(ooui-|oojsui-)/) ) {
                        delete summary.attributes.id;
                }
                // Infusion data

-- 
To view, visit https://gerrit.wikimedia.org/r/332755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I689c22c079eb85976327ef669767b277c0e59676
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits