From 10620ff1a9b42528d84f2c6cc4f64a1790a0d8b7 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Mon, 4 Jun 2012 10:13:30 -0700 Subject: LC Signed-off-by: Kruti Shah --- js/panels/Timeline/Layer.reel/Layer.js | 21 ++++++++------------- js/panels/Timeline/Style.reel/Style.js | 8 ++++++-- 2 files changed, 14 insertions(+), 15 deletions(-) (limited to 'js/panels') 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, { this.heightControl.addEventListener("changing",this,false); this.heightControl.addEventListener("change",this,false); - el=this.layerData.stageElement; - debugger; - - this.dtextPositionX = parseFloat(ElementsMediator.getProperty(el, "left")); - this.dtextPositionY = parseFloat(ElementsMediator.getProperty(el, "top")); - this.dtextScaleY = parseFloat(ElementsMediator.getProperty(el, "height")); - this.dtextScaleX= parseFloat(ElementsMediator.getProperty(el, "width")); +// el=this.layerData.stageElement; +// debugger; +// +// this.dtextPositionX = parseFloat(ElementsMediator.getProperty(el, "left")); +// this.dtextPositionY = parseFloat(ElementsMediator.getProperty(el, "top")); +// this.dtextScaleY = parseFloat(ElementsMediator.getProperty(el, "height")); +// this.dtextScaleX= parseFloat(ElementsMediator.getProperty(el, "width")); } }, @@ -916,7 +916,7 @@ var Layer = exports.Layer = Montage.create(Component, { }, handleLeftChange:{ - value:function(){ + value:function(event){ debugger; this.application.ninja.elementMediator.setProperty(this.layerData.stageElement, "left", [this.dtextPositionX + "px"] , "Change", "timeline"); } @@ -1003,11 +1003,6 @@ var Layer = exports.Layer = Montage.create(Component, { } }, - handleChanging:{ - value:function(){ - console.log("in layer.js") - } - }, /* End: Event handlers */ 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, { // First, get the appropriate editor type from the data structure. var tweenable = {}, i = 0; + + if (this.ruleTweener === true) { + return; + } else { + this.ruleTweener = true; + } tweenable.tweener = "input"; @@ -358,8 +364,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { // this._strokeColorCtrl.color(this._stroke.colorMode, this._stroke.color); } - - // TODO: set up color chip here. } else if (tweenable.tweener === "input"){ this.editorInputContainer.classList.remove("hidden"); -- cgit v1.2.3