From cefcd774c67ec0640e4a2c21a6a905314b871aa3 Mon Sep 17 00:00:00 2001 From: Brad Buchanan Date: Wed, 1 Mar 2017 22:47:07 -0800 Subject: [PATCH] Revert "Set icon color" --- apps/src/applab/designMode.js | 11 ------ apps/src/applab/setPropertyDropdown.js | 6 +--- .../levelSolutions/applab/ec_setprop.js | 35 ++++--------------- 3 files changed, 8 insertions(+), 44 deletions(-) diff --git a/apps/src/applab/designMode.js b/apps/src/applab/designMode.js index f519935d1dd25..9e38c83215ea6 100644 --- a/apps/src/applab/designMode.js +++ b/apps/src/applab/designMode.js @@ -250,15 +250,6 @@ designMode.updateProperty = function (element, name, value) { break; case 'icon-color': element.setAttribute('data-icon-color', value); - const imageUrl = element.getAttribute('data-canonical-image-url'); - if (ICON_PREFIX_REGEX.test(imageUrl)) { - const url = assetPrefix.renderIconToString(imageUrl, element); - if (element.nodeName == "IMG") { - element.src = url; - } else { - element.style.backgroundImage = 'url(' + url + ')'; - } - } break; case 'image': var originalValue = element.getAttribute('data-canonical-image-url'); @@ -484,8 +475,6 @@ designMode.readProperty = function (element, name) { return parseFloat(element.style.fontSize); case 'textAlign': return element.style.textAlign; - case 'icon-color': - return element.getAttribute('data-icon-color'); case 'image': return element.getAttribute('data-canonical-image-url'); case 'screen-image': diff --git a/apps/src/applab/setPropertyDropdown.js b/apps/src/applab/setPropertyDropdown.js index ee566b555e1a6..81d8ba6e692a0 100644 --- a/apps/src/applab/setPropertyDropdown.js +++ b/apps/src/applab/setPropertyDropdown.js @@ -42,7 +42,6 @@ var PROP_INFO = { // it won't show up in the dropdown. pictureImage: { friendlyName: 'image', internalName: 'picture', type: 'string' }, picture: { friendlyName: 'picture', internalName: 'picture', type: 'string', alias: true }, - iconColor: { friendlyName: 'icon-color', internalName: 'icon-color', type: 'string' }, groupId: { friendlyName: 'group-id', internalName: 'groupId', type: 'string' }, checked: { friendlyName: 'checked', internalName: 'checked', type: 'boolean' }, readonly: { friendlyName: 'readonly', internalName: 'readonly', type: 'boolean' }, @@ -79,7 +78,6 @@ PROPERTIES[ElementType.BUTTON] = { 'fontSize', 'textAlign', 'image', - 'iconColor', 'hidden' ] }; @@ -159,7 +157,6 @@ PROPERTIES[ElementType.IMAGE] = { 'y', 'pictureImage', 'picture', // Since this is an alias, it is not shown in the dropdown but is allowed as a value - 'iconColor', 'hidden' ] }; @@ -176,8 +173,7 @@ PROPERTIES[ElementType.SCREEN] = { propertyNames: [ 'text', 'backgroundColor', - 'screenImage', - 'iconColor' + 'screenImage' ] }; PROPERTIES[ElementType.TEXT_AREA] = { diff --git a/apps/test/integration/levelSolutions/applab/ec_setprop.js b/apps/test/integration/levelSolutions/applab/ec_setprop.js index 343fce1027a70..5dbe0f857b29c 100644 --- a/apps/test/integration/levelSolutions/applab/ec_setprop.js +++ b/apps/test/integration/levelSolutions/applab/ec_setprop.js @@ -31,8 +31,6 @@ module.exports = { console.log("font-size: " + getProperty("my_button", "font-size")); setProperty("my_button", "image", "${facebookImage}"); console.log("image: " + getProperty("my_button", "image")); - setProperty("my_button", "icon-color", "blue"); - console.log("icon-color: " + getProperty("my_button", "icon-color")); `, runBeforeClick: function (assert) { // add a completion on timeout since this is a freeplay level @@ -45,7 +43,6 @@ module.exports = { assert.equal(button.style.fontSize, '21px'); assert(/facebook_purple.png$/.test(button.getAttribute('data-canonical-image-url'))); - assert(/blue/.test(button.getAttribute('data-icon-color'))); Applab.onPuzzleComplete(); }); @@ -57,8 +54,7 @@ module.exports = { expect(debugOutput.textContent).to.contain('text-color: red\n'); expect(debugOutput.textContent).to.contain('background-color: green\n'); expect(debugOutput.textContent).to.contain('font-size: 21\n'); - expect(debugOutput.textContent).to.match(/image: .*facebook_purple.png\n/); - expect(debugOutput.textContent).to.contain('icon-color: blue'); + expect(debugOutput.textContent).to.match(/image: .*facebook_purple.png$/); return true; }, @@ -82,10 +78,7 @@ module.exports = { setProperty("my_button", "font-size", 21); console.log("font-size: " + getProperty("my_button", "font-size")); setProperty("my_button", "image", "${facebookImage}"); - console.log("image: " + getProperty("my_button", "image")); - setProperty("my_button", "icon-color", "blue"); - console.log("icon-color: " + getProperty("my_button", "icon-color")); -`, + console.log("image: " + getProperty("my_button", "image"));`, runBeforeClick: function (assert) { // add a completion on timeout since this is a freeplay level tickWrapper.runOnAppTick(Applab, 2, function () { @@ -97,7 +90,6 @@ module.exports = { assert.equal(button.style.fontSize, '21px'); assert(/facebook_purple.png$/.test(button.getAttribute('data-canonical-image-url'))); - assert(/blue/.test(button.getAttribute('data-icon-color'))); Applab.onPuzzleComplete(); }); @@ -109,8 +101,7 @@ module.exports = { expect(debugOutput.textContent).to.contain('text-color: red\n'); expect(debugOutput.textContent).to.contain('background-color: green\n'); expect(debugOutput.textContent).to.contain('font-size: 21\n'); - expect(debugOutput.textContent).to.match(/image: .*facebook_purple.png\n/); - expect(debugOutput.textContent).to.contain('icon-color: blue'); + expect(debugOutput.textContent).to.match(/image: .*facebook_purple.png$/); return true; }, @@ -203,9 +194,7 @@ step: 3`); setProperty("my_image", "picture", "${facebookImage}"); console.log("picture: " + getProperty("my_image", "picture")); setProperty("my_image", "hidden", true); - console.log("hidden: " + getProperty("my_image", "hidden")); - setProperty("my_image", "icon-color", "blue"); - console.log("icon-color: " + getProperty("my_image", "icon-color"));`, + console.log("hidden: " + getProperty("my_image", "hidden"));`, runBeforeClick: function (assert) { // add a completion on timeout since this is a freeplay level tickWrapper.runOnAppTick(Applab, 2, function () { @@ -221,7 +210,6 @@ step: 3`); assert.equal(image.style.top, '14px'); assert(/facebook_purple.png$/.test(image.src)); - assert(/blue/.test(image.getAttribute('data-icon-color'))); // visibility is set via a class, so use getComputedStyle assert(window.getComputedStyle(image).visibility, 'hidden'); @@ -239,7 +227,6 @@ step: 3`); expect(debugOutput.textContent).to.contain('y: 14\n'); expect(debugOutput.textContent).to.match(/picture: .*facebook_purple.png\n/); expect(debugOutput.textContent).to.contain('hidden: true'); - expect(debugOutput.textContent).to.contain('icon-color: blue'); return true; }, @@ -266,9 +253,7 @@ step: 3`); setProperty("my_image", "picture", "${facebookImage}"); console.log("picture: " + getProperty("my_image", "picture")); setProperty("my_image", "hidden", true); - console.log("hidden: " + getProperty("my_image", "hidden")); - setProperty("my_image", "icon-color", "blue"); - console.log("icon-color: " + getProperty("my_image", "icon-color"));`, + console.log("hidden: " + getProperty("my_image", "hidden"));`, runBeforeClick: function (assert) { // add a completion on timeout since this is a freeplay level tickWrapper.runOnAppTick(Applab, 2, function () { @@ -284,7 +269,6 @@ step: 3`); assert.equal(image.style.top, '14px'); assert(/facebook_purple.png$/.test(image.src)); - assert(/blue/.test(image.getAttribute('data-icon-color'))); // visibility is set via a class, so use getComputedStyle assert(window.getComputedStyle(image).visibility, 'hidden'); @@ -302,7 +286,6 @@ step: 3`); expect(debugOutput.textContent).to.contain('y: 14\n'); expect(debugOutput.textContent).to.match(/picture: .*facebook_purple.png\n/); expect(debugOutput.textContent).to.contain('hidden: true'); - expect(debugOutput.textContent).to.contain('icon-color: blue'); return true; }, @@ -417,9 +400,7 @@ step: 3`); '', xml: `setProperty("screen1", "image", "${flappyImage}"); - console.log("image: " + getProperty("screen1", "image")); - setProperty("screen1", "icon-color", "blue"); - console.log("icon-color: " + getProperty("screen1", "icon-color"));`, + console.log("image: " + getProperty("screen1", "image"));`, runBeforeClick: function (assert) { // add a completion on timeout since this is a freeplay level tickWrapper.runOnAppTick(Applab, 2, function () { @@ -429,14 +410,12 @@ step: 3`); console.log(screen.style.backgroundImage); assert(/url\(.*flappy_promo.png['"]?\)$/.test(screen.style.backgroundImage), 'screen background image should be flappy_promo.png. Instead: '+screen.style.backgroundImage); - assert(/blue/.test(screen.getAttribute('data-icon-color'))); Applab.onPuzzleComplete(); }); }, customValidator: function (assert) { var debugOutput = document.getElementById('debug-output'); - expect(debugOutput.textContent).to.match(/image: .*flappy_promo.png\n/); - expect(debugOutput.textContent).to.contain('icon-color: blue'); + expect(debugOutput.textContent).to.match(/image: .*flappy_promo.png$/); return true; }, expected: {