diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index b83ae170..1318a9b3 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js @@ -320,18 +320,18 @@ exports.Properties = Montage.create(Component, { // Root element color chip if(isRoot) { - // + // var rootBackgroundColor, backgroundChip = this.customSections[0].content.controls["background"]; // if (ElementsMediator.getProperty(el, "background-image")) { - rootBackgroundColor = ElementsMediator.getProperty(el, "background-image"); - if (!rootBackgroundColor.mode) rootBackgroundColor = null; + rootBackgroundColor = ElementsMediator.getProperty(el, "background-image"); + if (!rootBackgroundColor.mode) rootBackgroundColor = null; } else if (ElementsMediator.getProperty(el, "background-color")){ - rootBackgroundColor = ElementsMediator.getProperty(el, "background-color"); - if (!rootBackgroundColor.mode) rootBackgroundColor = null; + rootBackgroundColor = ElementsMediator.getProperty(el, "background-color"); + if (!rootBackgroundColor.mode) rootBackgroundColor = null; } else if (ElementsMediator.getProperty(el, "background")){ - rootBackgroundColor = ElementsMediator.getProperty(el, "background"); - if (!rootBackgroundColor.mode) rootBackgroundColor = null; + rootBackgroundColor = ElementsMediator.getProperty(el, "background"); + if (!rootBackgroundColor.mode) rootBackgroundColor = null; } // if(rootBackgroundColor) { @@ -344,7 +344,7 @@ exports.Properties = Montage.create(Component, { - var previousInput = this.application.ninja.colorController.colorModel.input; + var previousInput = this.application.ninja.colorController.colorModel.input; customPI = PiData[this.customPi]; // Get all the custom section for the custom PI for(var i = 0, customSec; customSec = customPI[i]; i++) { @@ -411,31 +411,31 @@ exports.Properties = Montage.create(Component, { if (previousInput === 'chip') return; this.application.ninja.colorController.colorModel.input = previousInput; var color = this.application.ninja.colorController.colorModel.colorHistory[previousInput][this.application.ninja.colorController.colorModel.colorHistory[previousInput].length-1]; - color.c.wasSetByCode = true; - color.c.type = 'change'; - switch (color.m) { - case 'rgb': - this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'}; - this.application.ninja.colorController.colorModel.rgb = color.c; - break; - case 'hsl': - this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'}; - this.application.ninja.colorController.colorModel.hsl = color.c; - break; - case 'hex': - //TODO: Check if anything needed here - break; - case 'gradient': - this.application.ninja.colorController.colorModel.gradient = color.c; - break; - case 'hsv': - this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'}; - this.application.ninja.colorController.colorModel.hsv = color.c; - break; - default: - this.application.ninja.colorController.colorModel.applyNoColor(true); - break; - } + color.c.wasSetByCode = true; + color.c.type = 'change'; + switch (color.m) { + case 'rgb': + this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'}; + this.application.ninja.colorController.colorModel.rgb = color.c; + break; + case 'hsl': + this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'}; + this.application.ninja.colorController.colorModel.hsl = color.c; + break; + case 'hex': + //TODO: Check if anything needed here + break; + case 'gradient': + this.application.ninja.colorController.colorModel.gradient = color.c; + break; + case 'hsv': + this.application.ninja.colorController.colorModel.alpha = {value: color.a, wasSetByCode: true, type: 'change'}; + this.application.ninja.colorController.colorModel.hsv = color.c; + break; + default: + this.application.ninja.colorController.colorModel.applyNoColor(true); + break; + } } } }, diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 0616da59..17b64dc2 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js @@ -117,20 +117,20 @@ exports.CustomSection = Montage.create(Component, { }, handleChanging: { - value:function(event) { + value:function(event) { var obj = event.currentTarget; this._dispatchPropEvent({"type": "changing", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); - } - }, + } + }, handleChange: { - value:function(event) { + value:function(event) { if(event._event.wasSetByCode) return; var obj = event.currentTarget; this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); - } - }, + } + }, /** * Color change handler. Hard coding the stage for now since only the stage PI uses this color chip @@ -141,21 +141,21 @@ exports.CustomSection = Montage.create(Component, { //console.log(this, event); if (event._event.colorMode !== 'gradient' && event._event.color) { - ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', [event._event.color.css], "Change", "pi", ''); - ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); + ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', [event._event.color.css], "Change", "pi", ''); + ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); } else if (event._event.color) { - ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', [event._event.color.css], "Change", "pi", ''); - ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); + ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', [event._event.color.css], "Change", "pi", ''); + ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); } else { - ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); - ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); + ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); + ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); } /* if (event._event.color && event._event.color.css) { - ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); + ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); } else { - ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", ''); + ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", ''); } */ /* -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/panels/properties.reel/properties.js | 4 ++-- js/panels/properties.reel/sections/custom.reel/custom.js | 4 ++-- js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'js/panels/properties.reel') diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index 1318a9b3..070f6f87 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js @@ -163,12 +163,12 @@ exports.Properties = Montage.create(Component, { NJevent("updatedID",this.application.ninja.selectedElements[0]); } }, - + handleKeyup: { value: function(event) { if(event.keyCode === 13) { event.target.blur(); - } + } } }, diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 17b64dc2..411de2f6 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js @@ -139,7 +139,7 @@ exports.CustomSection = Montage.create(Component, { value: function(event) { // Change the stage color for now //console.log(this, event); - + if (event._event.colorMode !== 'gradient' && event._event.color) { ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', [event._event.color.css], "Change", "pi", ''); ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); @@ -150,7 +150,7 @@ exports.CustomSection = Montage.create(Component, { ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); } - + /* if (event._event.color && event._event.color.css) { ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js index 52750f13..88c2f522 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js @@ -49,7 +49,7 @@ exports.ThreeD = Montage.create(Component, { }, set: function(value) { this._axisMode = value; - + if(value === 0) { this.inGlobalMode = false; this.x3D = 0; -- cgit v1.2.3 From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- js/panels/properties.reel/properties.css | 2 +- .../properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | 2 +- .../sections/custom-rows/single-row.reel/single-row.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'js/panels/properties.reel') diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index e5d698b3..67884628 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css @@ -121,7 +121,7 @@ padding-right:6px; .propertiesPanel .fieldRow.twoCol label { width:74px; display: inline-block; - + } .propertiesPanel .fieldRow.oneCol label { diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html index 5110b654..8c66a15c 100755 --- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html +++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html @@ -67,7 +67,7 @@ POSSIBILITY OF SUCH DAMAGE.

- +

diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html index dfcab8aa..539431a8 100755 --- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html +++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html @@ -60,7 +60,7 @@ POSSIBILITY OF SUCH DAMAGE.

- +