From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:52:06 -0700
Subject: Expand tabs
---
.../properties.reel/sections/custom.reel/custom.js | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
(limited to 'js/panels/properties.reel/sections')
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/sections/custom.reel/custom.js | 4 ++--
js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'js/panels/properties.reel/sections')
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
---
.../properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | 2 +-
.../sections/custom-rows/single-row.reel/single-row.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'js/panels/properties.reel/sections')
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.
-
+
--
cgit v1.2.3
From 40c6eb2c06b34f65a74d59ef9687251952858bab Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 12:47:27 -0700
Subject: Normalize HTML doctype
---
.../sections/custom-rows/color-select.reel/color-select.html | 2 +-
.../properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | 2 +-
.../sections/custom-rows/single-row.reel/single-row.html | 2 +-
js/panels/properties.reel/sections/custom.reel/custom.html | 2 +-
.../properties.reel/sections/position-size.reel/position-size.html | 2 +-
js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'js/panels/properties.reel/sections')
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
index e993475e..ca446a01 100755
--- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
+++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
@@ -1,4 +1,4 @@
-
+