aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/controllers/color-controller.js5
-rwxr-xr-xjs/lib/drawing/world.js6
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
3 files changed, 4 insertions, 9 deletions
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index 53573baf..8e000b19 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -198,7 +198,6 @@ exports.ColorController = Montage.create(Component, {
198 handleChange: { 198 handleChange: {
199 enumerable: true, 199 enumerable: true,
200 value: function (e) { 200 value: function (e) {
201
202 // 201 //
203 var actionEvent, color, input = e._event.input, panelMode, mode = e._event.mode; 202 var actionEvent, color, input = e._event.input, panelMode, mode = e._event.mode;
204 if (this.colorView) { 203 if (this.colorView) {
@@ -228,14 +227,14 @@ exports.ColorController = Montage.create(Component, {
228 // 227 //
229 this.fill = color; 228 this.fill = color;
230 // 229 //
231 if(e._event.wasSetByCode) return; 230 if(e._event.wasSetByCode && mode !== 'nocolor') return;
232 // 231 //
233 this.setColor(mode, color, true); 232 this.setColor(mode, color, true);
234 } else if (input === 'stroke') { 233 } else if (input === 'stroke') {
235 // 234 //
236 this.stroke = color; 235 this.stroke = color;
237 // 236 //
238 if(e._event.wasSetByCode) return; 237 if(e._event.wasSetByCode && mode !== 'nocolor') return;
239 238
240 this.setColor(mode, color, false); 239 this.setColor(mode, color, false);
241 } 240 }
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index e3818178..ebeeeb20 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -239,7 +239,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
239 if (this._canvas.task) { 239 if (this._canvas.task) {
240 this._firstRender = false; 240 this._firstRender = false;
241 241
242 if (!this.hasAnimatedMaterials()) { 242 if (!this.hasAnimatedMaterials() || !this._previewAnimation) {
243 this._canvas.task.stop(); 243 this._canvas.task.stop();
244 //this._renderCount = 10; 244 //this._renderCount = 10;
245 } 245 }
@@ -479,10 +479,6 @@ World.prototype.restartRenderLoop = function() {
479 if (this._allMapsLoaded) { 479 if (this._allMapsLoaded) {
480 //console.log( "starting task" ); 480 //console.log( "starting task" );
481 this._canvas.task.start(); 481 this._canvas.task.start();
482 if(!this._previewAnimation) {
483 //render only once if authortime animation is turned off
484 this._canvas.task.stop();
485 }
486 } else { 482 } else {
487 //console.log( "stopping task" ); 483 //console.log( "stopping task" );
488 this._canvas.task.stop(); 484 this._canvas.task.stop();
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index a4c9a8c2..d6d94807 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -68,7 +68,7 @@ exports.ColorPopupManager = Montage.create(Component, {
68 this.application.ninja.colorController.colorPopupManager.hideColorPopup(); 68 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
69 }.bind(this)); 69 }.bind(this));
70 // 70 //
71 document.addEventListener('click', function (e) { 71 document.addEventListener('mousedown', function (e) {
72 // 72 //
73 if (e._event.srcElement.id === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.id === 'drawingCanvas') { 73 if (e._event.srcElement.id === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.id === 'drawingCanvas') {
74 this.application.ninja.colorController.colorPopupManager.hideColorPopup(); 74 this.application.ninja.colorController.colorPopupManager.hideColorPopup();