From 2d8bfb9f6db66d551f052de2e5ade27fca4d1460 Mon Sep 17 00:00:00 2001 From: Thibault Zanini Date: Fri, 22 Jun 2018 16:18:23 -0400 Subject: [PATCH] Fix #1973 --- test/spec/ui/repetition-spec.js | 6 +++--- test/spec/ui/substitution-spec.js | 4 ++-- ui/base/abstract-button.js | 1 - ui/base/abstract-toggle-button.js | 3 --- ui/button.reel/button.js | 1 - ui/component.js | 14 ++++++++++++++ ui/slot.reel/slot.js | 10 +--------- ui/substitution.reel/substitution.js | 2 -- ui/text.reel/text.js | 1 - 9 files changed, 20 insertions(+), 22 deletions(-) diff --git a/test/spec/ui/repetition-spec.js b/test/spec/ui/repetition-spec.js index 67997e02cd..c7ef9ae478 100644 --- a/test/spec/ui/repetition-spec.js +++ b/test/spec/ui/repetition-spec.js @@ -427,7 +427,7 @@ TestPageLoader.queueTest("repetition/repetition", function (testPage) { // BUG: Chrome outputs 0 on this.. // expects(querySelector("#list3 > li:nth-child(2) > ul#list4-1").length).toBe(5); - var list3a = testPage.evaluateNode("//*[@class='list3']/li[2]/ul[@class='list3a']"); + var list3a = testPage.evaluateNode("//*[@class='list3 montage-Repetition']/li[2]/ul[@class='list3a montage-Repetition']"); expect(list3a.querySelectorAll("li").length).toBe(5); console.log("should draw one>five iterations –expectationFunction expect 2 passed"); @@ -517,7 +517,7 @@ TestPageLoader.queueTest("repetition/repetition", function (testPage) { // BUG: Chrome outputs 0 on this.. // expect(querySelectorAll("#list3 > li:nth-child(2) > ul#list4-1 > li").length).toBe(5); - var list4a = testPage.evaluateNode("//*[@class='list4']/li[2]/ul[@class='list4a']"); + var list4a = testPage.evaluateNode("//*[@class='list4 montage-Repetition']/li[2]/ul[@class='list4a montage-Repetition']"); expect(list4a.querySelectorAll("li").length).toBe(5); var inputs = list4a.querySelectorAll("input"); expect(inputs.length).toBe(5); @@ -586,7 +586,7 @@ TestPageLoader.queueTest("repetition/repetition", function (testPage) { expect(querySelectorAll(".list5 > li").length).toBe(2); expect(querySelectorAll(".list5 > li:nth-child(2) > ul.list5a > li").length).toBe(5); - var list5a = testPage.evaluateNode("//*[@class='list5']/li[2]/ul[@class='list5a']"); + var list5a = testPage.evaluateNode("//*[@class='list5 montage-Repetition']/li[2]/ul[@class='list5a montage-Repetition']"); expect(list5a.querySelectorAll("li").length).toBe(5); var inputs = list5a.querySelectorAll("input"); expect(inputs.length).toBe(5); diff --git a/test/spec/ui/substitution-spec.js b/test/spec/ui/substitution-spec.js index 42f3a9caf4..944bb3a112 100644 --- a/test/spec/ui/substitution-spec.js +++ b/test/spec/ui/substitution-spec.js @@ -143,7 +143,7 @@ TestPageLoader.queueTest("substitution-test/substitution-test", function (testPa substitution.switchValue = "two"; testPage.waitForComponentDraw(substitution).then(function () { - expect(substitution._switchElements.one.className).toBe("Foo"); + expect(substitution._switchElements.one.className).toBe("Foo montage-tests-Foo"); }).finally(function () { done(); }); @@ -156,7 +156,7 @@ TestPageLoader.queueTest("substitution-test/substitution-test", function (testPa substitution.switchValue = "one"; testPage.waitForComponentDraw(substitution).then(function () { - expect(substitution.element.children[0].className).toBe("Foo"); + expect(substitution.element.children[0].className).toBe("Foo montage-tests-Foo"); }).finally(function () { done(); }); diff --git a/ui/base/abstract-button.js b/ui/base/abstract-button.js index ef5e179904..565b95b776 100644 --- a/ui/base/abstract-button.js +++ b/ui/base/abstract-button.js @@ -301,7 +301,6 @@ var AbstractButton = exports.AbstractButton = AbstractControl.specialize( /** @l } } - //this.classList.add("montage-Button"); this.element.setAttribute("role", "button"); this.element.addEventListener("keyup", this, false); } diff --git a/ui/base/abstract-toggle-button.js b/ui/base/abstract-toggle-button.js index 4523c29643..39809682d4 100644 --- a/ui/base/abstract-toggle-button.js +++ b/ui/base/abstract-toggle-button.js @@ -52,8 +52,6 @@ var AbstractToggleButton = exports.AbstractToggleButton = AbstractControl.specia this._keyComposer.keys = "space"; this.addComposer(this._keyComposer); - this.classList.add("montage-ToggleButton"); - this.defineBindings({ // classList management "classList.has('montage--disabled')": { @@ -346,4 +344,3 @@ var AbstractToggleButton = exports.AbstractToggleButton = AbstractControl.specia } }); - diff --git a/ui/button.reel/button.js b/ui/button.reel/button.js index 7b5f2ebec0..d50ac12d65 100644 --- a/ui/button.reel/button.js +++ b/ui/button.reel/button.js @@ -383,7 +383,6 @@ var Button = exports.Button = Control.specialize(/** @lends module:"montage/ui/n // } } - //this.classList.add("montage-Button"); this.element.setAttribute("role", "button"); this.element.addEventListener("keyup", this, false); } diff --git a/ui/component.js b/ui/component.js index 99a394086e..1f676e6834 100644 --- a/ui/component.js +++ b/ui/component.js @@ -2046,6 +2046,20 @@ var Component = exports.Component = Target.specialize(/** @lends Component.proto this._treeLevel = level; if (firstDraw) { this.originalElement = this.element; + + if (this !== this.rootComponent) { + var moduleInfo = Montage.getInfoForObject(this), + packageName = moduleInfo.require.packageDescription.name, + objectName = moduleInfo.objectName; + + if ( + objectName && packageName && + ((packageName === "montage" && objectName !== "Component") || + (packageName !== "montage")) + ) { + this.classList.add(packageName + "-" + objectName); + } + } } if (this.needsDraw) { this.rootComponent.addToDrawCycle(this); diff --git a/ui/slot.reel/slot.js b/ui/slot.reel/slot.js index 89d2fc03e5..575fdaa3f1 100644 --- a/ui/slot.reel/slot.js +++ b/ui/slot.reel/slot.js @@ -35,15 +35,7 @@ exports.Slot = Component.specialize( /** @lends Slot.prototype # */ { _content: { value: null }, - - enterDocument:{ - value:function (firstTime) { - if (firstTime) { - this.element.classList.add("montage-Slot"); - } - } - }, - + /** * The component that resides in this slot and in its place in the * template. diff --git a/ui/substitution.reel/substitution.js b/ui/substitution.reel/substitution.js index 5b0def25ef..40d41c446e 100644 --- a/ui/substitution.reel/substitution.js +++ b/ui/substitution.reel/substitution.js @@ -178,8 +178,6 @@ exports.Substitution = Slot.specialize( /** @lends Substitution.prototype # */ { value: function (firstTime) { var argumentNames; - Slot.prototype.enterDocument.apply(this, arguments); - if (firstTime) { argumentNames = this.getDomArgumentNames(); for (var i = 0, name; (name = argumentNames[i]); i++) { diff --git a/ui/text.reel/text.js b/ui/text.reel/text.js index 998926a36d..5f76cb4b7f 100644 --- a/ui/text.reel/text.js +++ b/ui/text.reel/text.js @@ -80,7 +80,6 @@ var MontageText = exports.Text = Component.specialize( /** @lends module:montag range.deleteContents(); this._valueNode = document.createTextNode(""); range.insertNode(this._valueNode); - this.element.classList.add("montage-Text"); } } },