aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.js4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js4
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js2
3 files changed, 5 insertions, 5 deletions
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, {
163 NJevent("updatedID",this.application.ninja.selectedElements[0]); 163 NJevent("updatedID",this.application.ninja.selectedElements[0]);
164 } 164 }
165 }, 165 },
166 166
167 handleKeyup: { 167 handleKeyup: {
168 value: function(event) { 168 value: function(event) {
169 if(event.keyCode === 13) { 169 if(event.keyCode === 13) {
170 event.target.blur(); 170 event.target.blur();
171 } 171 }
172 } 172 }
173 }, 173 },
174 174
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, {
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", '');
@@ -150,7 +150,7 @@ exports.CustomSection = Montage.create(Component, {
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", '');
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;