From 4f1693b953befabf4495df668f542c7f52270864 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Tue, 8 May 2012 13:42:04 -0700 Subject: Change sub property track arrays Remove transform section and move width and height into Position section. rename position section Position and Size. additional support for generic prop tweens Signed-off-by: Jonathan Duran --- js/panels/Timeline/Layer.reel/Layer.html | 114 +++---------------------------- 1 file changed, 9 insertions(+), 105 deletions(-) (limited to 'js/panels/Timeline/Layer.reel/Layer.html') diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 10334b31..ba7c18c3 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html @@ -20,7 +20,6 @@ "slotStyle" : {"@":"slot1"}, "mainCollapser" : {"@" : "mainCollapser"}, "positionCollapser" : {"@" : "positionCollapser"}, - "transformCollapser" : {"@" : "transformCollapser"}, "styleCollapser" : {"@" : "styleCollapser"}, "clickerMain" : {"#" : "clicker-main"}, "myLabel" : {"#" : "myLabel"}, @@ -182,60 +181,6 @@ } } }, - "dtext_skew_x" : { - "prototype": "js/components/hottextunit.reel[HotTextUnit]", - "properties": { - "element": {"#": "skew-x"}, - "maxValue" : 100, - "minValue" : 0, - "acceptableUnits" : "%", - "units" : "%", - "value" : 0 - }, - "bindings": { - "value": { - "boundObject": {"@": "owner"}, - "boundObjectPropertyPath": "dtextSkewX", - "oneway": false - } - } - }, - "dtext_skew_y" : { - "prototype": "js/components/hottextunit.reel[HotTextUnit]", - "properties": { - "element": {"#": "skew-y"}, - "maxValue" : 100, - "minValue" : 0, - "acceptableUnits" : "%", - "units" : "%", - "value" : 0 - }, - "bindings": { - "value": { - "boundObject": {"@": "owner"}, - "boundObjectPropertyPath": "dtextSkewY", - "oneway": false - } - } - }, - "dtext_rotate" : { - "prototype": "js/components/hottextunit.reel[HotTextUnit]", - "properties": { - "element": {"#": "rotation"}, - "maxValue" : 360, - "minValue" : -360, - "acceptableUnits" : "degrees", - "units" : "degrees", - "value" : 0 - }, - "bindings": { - "value": { - "boundObject": {"@": "owner"}, - "boundObjectPropertyPath": "dtextRotate", - "oneway": false - } - } - }, "mainCollapser" : { "prototype" : "js/panels/timeline/Collapser", @@ -277,26 +222,6 @@ } }, - "transformCollapser" : { - "prototype" : "js/panels/timeline/Collapser", - "properties" : { - "element" : {"#" : "content-transform"}, - "myContent" : {"#":"content-transform"}, - "contentHeight" : 60, - "isLabelClickable" : true, - "clicker" : {"#" : "clicker-transform"}, - "isCollapsed" : true, - "isAnimated" : true - }, - "bindings" : { - "isToggling" : { - "boundObject" : {"@" : "owner" }, - "boundObjectPropertyPath" : "isTransformCollapsed", - "oneway" : false - } - } - }, - "styleCollapser" : { "prototype" : "js/panels/timeline/Collapser", "properties" : { @@ -333,7 +258,7 @@
- Position + Position and Size
@@ -346,37 +271,16 @@
Top
+
+
Width
+
+
+
+
Height
+
+
-
- Transform - -
-
-
-
-
Width
-
-
-
-
Height
-
-
-
-
Skew X
-
-
-
-
Skew Y
-
-
-
-
Rotation
-
-
-
- -
Style -- cgit v1.2.3 From f1387bc995766b8d941f93e605a91c49c8931645 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 22 May 2012 10:28:41 -0700 Subject: Layer Control Signed-off-by: Kruti Shah --- js/panels/Timeline/Layer.reel/Layer.html | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'js/panels/Timeline/Layer.reel/Layer.html') diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index c7e7b575..c4aa6e29 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html @@ -21,7 +21,12 @@ "positionCollapser" : {"@" : "positionCollapser"}, "styleCollapser" : {"@" : "styleCollapser"}, "clickerMain" : {"#" : "clicker-main"}, - "myLabel" : {"#" : "myLabel"} + "myLabel" : {"#" : "myLabel"}, + "leftControl": {"@" : "dtext_position_x"}, + "topControl": {"@" : "dtext_position_y"}, + "widthControl": {"@" : "dtext_scale_x"}, + "heightControl": {"@" : "dtext_scale_y"}, + "styleType":{"@" : "style"} } }, "dtext1" : { @@ -147,10 +152,10 @@ "prototype": "js/components/hottextunit.reel[HotTextUnit]", "properties": { "element": {"#": "scale-x"}, - "maxValue" : 100, - "minValue" : 0, - "acceptableUnits" : "%", - "units" : "%", + "maxValue" : 100000, + "minValue" : -100000, + "acceptableUnits" : "px", + "units" : "px", "value" : 0 }, "bindings": { @@ -165,10 +170,10 @@ "prototype": "js/components/hottextunit.reel[HotTextUnit]", "properties": { "element": {"#": "scale-y"}, - "maxValue" : 100, - "minValue" : 0, - "acceptableUnits" : "%", - "units" : "%", + "maxValue" : 100000, + "minValue" : -100000, + "acceptableUnits" : "px", + "units" : "px", "value" : 0 }, "bindings": { -- cgit v1.2.3 From 811ce7a7cdec18f304c6660a70012960e61d967a Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Thu, 24 May 2012 17:46:47 -0700 Subject: Timeline: bug fix "Layer name gets doubled" (Spreadsheet) --- js/panels/Timeline/Layer.reel/Layer.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/panels/Timeline/Layer.reel/Layer.html') diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index c7e7b575..44022211 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html @@ -17,6 +17,7 @@ "styleRepetition" : {"@":"repetition1"}, "dynamicLayerName" : {"@":"dtext1"}, "dynamicLayerTag" : {"@": "dtext2"}, + "layer_label_text" : {"#": "layer-label-text"}, "mainCollapser" : {"@" : "mainCollapser"}, "positionCollapser" : {"@" : "positionCollapser"}, "styleCollapser" : {"@" : "styleCollapser"}, @@ -33,7 +34,7 @@ "value" : { "boundObject" : {"@": "owner"}, "boundObjectPropertyPath" : "layerName", - "oneway" : false + "oneway" : true } } }, -- cgit v1.2.3 From 8986b9f78174b10790ad00e5a28122cb0879e5e3 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Thu, 7 Jun 2012 21:22:41 -0700 Subject: Sub property Signed-off-by: Kruti Shah --- js/panels/Timeline/Layer.reel/Layer.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'js/panels/Timeline/Layer.reel/Layer.html') diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 717306a0..fe3f49d2 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html @@ -110,7 +110,12 @@ "boundObject" : {"@": "repetition1"}, "boundObjectPropertyPath" : "objectAtCurrentIteration.ruleTweener", "oneway" : false - } + }, + "abcelement" : { + "boundObject" : {"@": "repetition1"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.abcelement", + "oneway" : false + } } }, "dtext_position_x" : { -- cgit v1.2.3 From bedb38e14887b29eae3cdf1c8d435259c920257c Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 12 Jun 2012 13:05:12 -0700 Subject: Sub Props Signed-off-by: Kruti Shah --- js/panels/Timeline/Layer.reel/Layer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/panels/Timeline/Layer.reel/Layer.html') diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index fe3f49d2..3648cbbb 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html @@ -111,9 +111,9 @@ "boundObjectPropertyPath" : "objectAtCurrentIteration.ruleTweener", "oneway" : false }, - "abcelement" : { + "colorelement" : { "boundObject" : {"@": "repetition1"}, - "boundObjectPropertyPath" : "objectAtCurrentIteration.abcelement", + "boundObjectPropertyPath" : "objectAtCurrentIteration.colorelement", "oneway" : false } } -- cgit v1.2.3 From a822b95a035715e21d994f6a4c96c3e784107bea Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 19 Jun 2012 15:34:35 -0700 Subject: LockedElements - Layers Signed-off-by: Kruti Shah --- js/panels/Timeline/Layer.reel/Layer.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'js/panels/Timeline/Layer.reel/Layer.html') diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 3648cbbb..5ee50491 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html @@ -27,7 +27,9 @@ "topControl": {"@" : "dtext_position_y"}, "widthControl": {"@" : "dtext_scale_x"}, "heightControl": {"@" : "dtext_scale_y"}, - "styleType":{"@" : "style"} + "styleType":{"@" : "style"}, + "layerLock":{"#" : "layerLock"}, + "visibilityButton":{"#" : "visibilityButton"} } }, "dtext1" : { @@ -262,8 +264,8 @@ Label -
-
+
+
-- cgit v1.2.3