aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/properties.reel/sections
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/properties.reel/sections')
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html2
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html4
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html2
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js32
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js2
8 files changed, 25 insertions, 25 deletions
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 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
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..49c1af4f 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
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -67,7 +67,7 @@ POSSIBILITY OF SUCH DAMAGE.
67 <label class="lbl"></label> 67 <label class="lbl"></label>
68 <article class="fieldRow"> 68 <article class="fieldRow">
69 <div data-montage-id="slotElement" class="inputField"> 69 <div data-montage-id="slotElement" class="inputField">
70 70
71 </div> 71 </div>
72 </article> 72 </article>
73 <label class="lbl"></label> 73 <label class="lbl"></label>
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..74a00496 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
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -60,7 +60,7 @@ POSSIBILITY OF SUCH DAMAGE.
60 <label><span class="lbl"></span></label> 60 <label><span class="lbl"></span></label>
61 <article class="fieldRow"> 61 <article class="fieldRow">
62 <div data-montage-id="slotElement" class="inputField"> 62 <div data-montage-id="slotElement" class="inputField">
63 63
64 </div> 64 </div>
65 </article> 65 </article>
66 </section> 66 </section>
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.html b/js/panels/properties.reel/sections/custom.reel/custom.html
index 04777198..5b406a92 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.html
+++ b/js/panels/properties.reel/sections/custom.reel/custom.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index 0616da59..411de2f6 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, {
117 }, 117 },
118 118
119 handleChanging: { 119 handleChanging: {
120 value:function(event) { 120 value:function(event) {
121 var obj = event.currentTarget; 121 var obj = event.currentTarget;
122 this._dispatchPropEvent({"type": "changing", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); 122 this._dispatchPropEvent({"type": "changing", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj});
123 } 123 }
124 }, 124 },
125 125
126 handleChange: { 126 handleChange: {
127 value:function(event) { 127 value:function(event) {
128 if(event._event.wasSetByCode) return; 128 if(event._event.wasSetByCode) return;
129 129
130 var obj = event.currentTarget; 130 var obj = event.currentTarget;
131 this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); 131 this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj});
132 } 132 }
133 }, 133 },
134 134
135 /** 135 /**
136 * Color change handler. Hard coding the stage for now since only the stage PI uses this color chip 136 * Color change handler. Hard coding the stage for now since only the stage PI uses this color chip
@@ -139,23 +139,23 @@ exports.CustomSection = Montage.create(Component, {
139 value: function(event) { 139 value: function(event) {
140 // Change the stage color for now 140 // Change the stage color for now
141 //console.log(this, event); 141 //console.log(this, event);
142 142
143 if (event._event.colorMode !== 'gradient' && event._event.color) { 143 if (event._event.colorMode !== 'gradient' && event._event.color) {
144 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', [event._event.color.css], "Change", "pi", ''); 144 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', [event._event.color.css], "Change", "pi", '');
145 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); 145 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", '');
146 } else if (event._event.color) { 146 } else if (event._event.color) {
147 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', [event._event.color.css], "Change", "pi", ''); 147 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', [event._event.color.css], "Change", "pi", '');
148 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); 148 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", '');
149 } else { 149 } else {
150 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", ''); 150 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-image', ['none'], "Change", "pi", '');
151 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", ''); 151 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], 'background-color', ['none'], "Change", "pi", '');
152 } 152 }
153 153
154 /* 154 /*
155if (event._event.color && event._event.color.css) { 155if (event._event.color && event._event.color.css) {
156 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); 156 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", '');
157 } else { 157 } else {
158 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", ''); 158 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", '');
159 } 159 }
160*/ 160*/
161 /* 161 /*
diff --git a/js/panels/properties.reel/sections/position-size.reel/position-size.html b/js/panels/properties.reel/sections/position-size.reel/position-size.html
index 3dca14bd..46d8d068 100755
--- a/js/panels/properties.reel/sections/position-size.reel/position-size.html
+++ b/js/panels/properties.reel/sections/position-size.reel/position-size.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
index 86e5d79b..22a786df 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
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, {
49 }, 49 },
50 set: function(value) { 50 set: function(value) {
51 this._axisMode = value; 51 this._axisMode = value;
52 52
53 if(value === 0) { 53 if(value === 0) {
54 this.inGlobalMode = false; 54 this.inGlobalMode = false;
55 this.x3D = 0; 55 this.x3D = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 00:35:53 +0000