aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js21
-rw-r--r--js/panels/Timeline/Style.reel/Style.js8
2 files changed, 14 insertions, 15 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index e01e5b75..da9845d6 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -543,13 +543,13 @@ var Layer = exports.Layer = Montage.create(Component, {
543 this.heightControl.addEventListener("changing",this,false); 543 this.heightControl.addEventListener("changing",this,false);
544 this.heightControl.addEventListener("change",this,false); 544 this.heightControl.addEventListener("change",this,false);
545 545
546 el=this.layerData.stageElement; 546// el=this.layerData.stageElement;
547 debugger; 547// debugger;
548 548//
549 this.dtextPositionX = parseFloat(ElementsMediator.getProperty(el, "left")); 549// this.dtextPositionX = parseFloat(ElementsMediator.getProperty(el, "left"));
550 this.dtextPositionY = parseFloat(ElementsMediator.getProperty(el, "top")); 550// this.dtextPositionY = parseFloat(ElementsMediator.getProperty(el, "top"));
551 this.dtextScaleY = parseFloat(ElementsMediator.getProperty(el, "height")); 551// this.dtextScaleY = parseFloat(ElementsMediator.getProperty(el, "height"));
552 this.dtextScaleX= parseFloat(ElementsMediator.getProperty(el, "width")); 552// this.dtextScaleX= parseFloat(ElementsMediator.getProperty(el, "width"));
553 } 553 }
554 }, 554 },
555 555
@@ -916,7 +916,7 @@ var Layer = exports.Layer = Montage.create(Component, {
916 }, 916 },
917 917
918 handleLeftChange:{ 918 handleLeftChange:{
919 value:function(){ 919 value:function(event){
920 debugger; 920 debugger;
921 this.application.ninja.elementMediator.setProperty(this.layerData.stageElement, "left", [this.dtextPositionX + "px"] , "Change", "timeline"); 921 this.application.ninja.elementMediator.setProperty(this.layerData.stageElement, "left", [this.dtextPositionX + "px"] , "Change", "timeline");
922 } 922 }
@@ -1003,11 +1003,6 @@ var Layer = exports.Layer = Montage.create(Component, {
1003 } 1003 }
1004 }, 1004 },
1005 1005
1006 handleChanging:{
1007 value:function(){
1008 console.log("in layer.js")
1009 }
1010 },
1011 1006
1012 /* End: Event handlers */ 1007 /* End: Event handlers */
1013 1008
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index 669091af..efc004e9 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -310,6 +310,12 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
310 // First, get the appropriate editor type from the data structure. 310 // First, get the appropriate editor type from the data structure.
311 var tweenable = {}, 311 var tweenable = {},
312 i = 0; 312 i = 0;
313
314 if (this.ruleTweener === true) {
315 return;
316 } else {
317 this.ruleTweener = true;
318 }
313 319
314 tweenable.tweener = "input"; 320 tweenable.tweener = "input";
315 321
@@ -358,8 +364,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
358 // this._strokeColorCtrl.color(this._stroke.colorMode, this._stroke.color); 364 // this._strokeColorCtrl.color(this._stroke.colorMode, this._stroke.color);
359 } 365 }
360 366
361
362
363 // TODO: set up color chip here. 367 // TODO: set up color chip here.
364 } else if (tweenable.tweener === "input"){ 368 } else if (tweenable.tweener === "input"){
365 this.editorInputContainer.classList.remove("hidden"); 369 this.editorInputContainer.classList.remove("hidden");