15 files changed, 459 insertions, 323 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index 5afff6e6..a4f957cf 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -37,11 +37,6 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
                        this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
                        this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
                        this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
-                        
-            
-            
-            
        }
    },
@@ -67,6 +62,7 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
    handleClick:{
        value:function(ev){
            this.selectKeyframe();
+            ev.stopPropagation();
        }
    },
    
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 9288d718..c7e7b575 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -19,7 +19,6 @@
                                                "dynamicLayerTag" : {"@": "dtext2"},
                                                "mainCollapser" : {"@" : "mainCollapser"},
                                                "positionCollapser" : {"@" : "positionCollapser"},
-                                                "transformCollapser" : {"@" : "transformCollapser"},
                                                "styleCollapser" : {"@" : "styleCollapser"},
                                                "clickerMain" : {"#" : "clicker-main"},
                                                "myLabel" : {"#" : "myLabel"}
@@ -180,60 +179,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",
@@ -275,26 +220,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" : {
@@ -331,7 +256,7 @@
                        </div>
                        <div class="collapsible-content content-layer collapsible-collapsed" data-montage-id="content-main">
                                <div class="label-position">
-                                        <span class="collapsible-label">Position</span>
+                                        <span class="collapsible-label">Position and Size</span>
                                        <span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span>
                                </div>
                                <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position">
@@ -344,37 +269,16 @@
                                                        <div class="cell-property">Top</div>
                                                        <div class="cell-value"><div data-montage-id="position-y"></div></div>
                                                </div>
+                        <div class="container-row">
+                            <div class="cell-property">Width</div>
+                            <div class="cell-value"><div data-montage-id="scale-x"></div></div>
+                        </div>
+                        <div class="container-row">
+                            <div class="cell-property">Height</div>
+                            <div class="cell-value"><div data-montage-id="scale-y"></div></div>
+                        </div>
                                        </div>
                                </div>
-                                <div class="label-transform">
-                                        <span class="collapsible-label">Transform</span>
-                                        <span class="clicker-transform collapsible-clicker collapsible-collapsed" data-montage-id="clicker-transform"></span>
-                                </div>
-                                <div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform">
-                                        <div class="layout-tablew">
-                                                <div class="container-row">
-                                                        <div class="cell-property">Width</div>
-                                                        <div class="cell-value"><div data-montage-id="scale-x"></div></div>
-                                                </div>
-                                                <div class="container-row">
-                                                        <div class="cell-property">Height</div>
-                                                        <div class="cell-value"><div data-montage-id="scale-y"></div></div>
-                                                </div>
-                                                <div class="container-row">
-                                                        <div class="cell-property">Skew X</div>
-                                                        <div class="cell-value"><div data-montage-id="skew-x"></div></div>
-                                                </div>
-                                                <div class="container-row">
-                                                        <div class="cell-property">Skew Y</div>
-                                                        <div class="cell-value"><div data-montage-id="skew-y"></div></div>

diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js index 5afff6e6..a4f957cf 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.js +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -37,11 +37,6 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
37	this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);	37	this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
38	this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);	38	this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
39	this.element.addEventListener("dragend", this.handleDragend.bind(this), false);	39	this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
40
41
42
43
44
45	}	40	}
46	},	41	},
47		42
@@ -67,6 +62,7 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
67	handleClick:{	62	handleClick:{
68	value:function(ev){	63	value:function(ev){
69	this.selectKeyframe();	64	this.selectKeyframe();
		65	ev.stopPropagation();
70	}	66	}
71	},	67	},
72		68


diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 9288d718..c7e7b575 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -19,7 +19,6 @@
19	"dynamicLayerTag" : {"@": "dtext2"},	19	"dynamicLayerTag" : {"@": "dtext2"},
20	"mainCollapser" : {"@" : "mainCollapser"},	20	"mainCollapser" : {"@" : "mainCollapser"},
21	"positionCollapser" : {"@" : "positionCollapser"},	21	"positionCollapser" : {"@" : "positionCollapser"},
22	"transformCollapser" : {"@" : "transformCollapser"},
23	"styleCollapser" : {"@" : "styleCollapser"},	22	"styleCollapser" : {"@" : "styleCollapser"},
24	"clickerMain" : {"#" : "clicker-main"},	23	"clickerMain" : {"#" : "clicker-main"},
25	"myLabel" : {"#" : "myLabel"}	24	"myLabel" : {"#" : "myLabel"}
@@ -180,60 +179,6 @@
180	}	179	}
181	}	180	}
182	},	181	},
183	"dtext_skew_x" : {
184	"prototype": "js/components/hottextunit.reel[HotTextUnit]",
185	"properties": {
186	"element": {"#": "skew-x"},
187	"maxValue" : 100,
188	"minValue" : 0,
189	"acceptableUnits" : "%",
190	"units" : "%",
191	"value" : 0
192	},
193	"bindings": {
194	"value": {
195	"boundObject": {"@": "owner"},
196	"boundObjectPropertyPath": "dtextSkewX",
197	"oneway": false
198	}
199	}
200	},
201	"dtext_skew_y" : {
202	"prototype": "js/components/hottextunit.reel[HotTextUnit]",
203	"properties": {
204	"element": {"#": "skew-y"},
205	"maxValue" : 100,
206	"minValue" : 0,
207	"acceptableUnits" : "%",
208	"units" : "%",
209	"value" : 0
210	},
211	"bindings": {
212	"value": {
213	"boundObject": {"@": "owner"},
214	"boundObjectPropertyPath": "dtextSkewY",
215	"oneway": false
216	}
217	}
218	},
219	"dtext_rotate" : {
220	"prototype": "js/components/hottextunit.reel[HotTextUnit]",
221	"properties": {
222	"element": {"#": "rotation"},
223	"maxValue" : 360,
224	"minValue" : -360,
225	"acceptableUnits" : "degrees",
226	"units" : "degrees",
227	"value" : 0
228	},
229	"bindings": {
230	"value": {
231	"boundObject": {"@": "owner"},
232	"boundObjectPropertyPath": "dtextRotate",
233	"oneway": false
234	}
235	}
236	},
237		182
238	"mainCollapser" : {	183	"mainCollapser" : {
239	"prototype" : "js/panels/timeline/Collapser",	184	"prototype" : "js/panels/timeline/Collapser",
@@ -275,26 +220,6 @@
275	}	220	}
276	},	221	},
277		222
278	"transformCollapser" : {
279	"prototype" : "js/panels/timeline/Collapser",
280	"properties" : {
281	"element" : {"#" : "content-transform"},
282	"myContent" : {"#":"content-transform"},
283	"contentHeight" : 60,
284	"isLabelClickable" : true,
285	"clicker" : {"#" : "clicker-transform"},
286	"isCollapsed" : true,
287	"isAnimated" : true
288	},
289	"bindings" : {
290	"isToggling" : {
291	"boundObject" : {"@" : "owner" },
292	"boundObjectPropertyPath" : "isTransformCollapsed",
293	"oneway" : false
294	}
295	}
296	},
297
298	"styleCollapser" : {	223	"styleCollapser" : {
299	"prototype" : "js/panels/timeline/Collapser",	224	"prototype" : "js/panels/timeline/Collapser",
300	"properties" : {	225	"properties" : {
@@ -331,7 +256,7 @@
331	</div>	256	</div>
332	<div class="collapsible-content content-layer collapsible-collapsed" data-montage-id="content-main">	257	<div class="collapsible-content content-layer collapsible-collapsed" data-montage-id="content-main">
333	<div class="label-position">	258	<div class="label-position">
334	<span class="collapsible-label">Position</span>	259	<span class="collapsible-label">Position and Size</span>
335	<span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span>	260	<span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span>
336	</div>	261	</div>
337	<div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position">	262	<div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position">
@@ -344,37 +269,16 @@
344	<div class="cell-property">Top</div>	269	<div class="cell-property">Top</div>
345	<div class="cell-value"><div data-montage-id="position-y"></div></div>	270	<div class="cell-value"><div data-montage-id="position-y"></div></div>
346	</div>	271	</div>
		272	<div class="container-row">
		273	<div class="cell-property">Width</div>
		274	<div class="cell-value"><div data-montage-id="scale-x"></div></div>
		275	</div>
		276	<div class="container-row">
		277	<div class="cell-property">Height</div>
		278	<div class="cell-value"><div data-montage-id="scale-y"></div></div>
		279	</div>
347	</div>	280	</div>
348	</div>	281	</div>
349	<div class="label-transform">
350	<span class="collapsible-label">Transform</span>
351	<span class="clicker-transform collapsible-clicker collapsible-collapsed" data-montage-id="clicker-transform"></span>
352	</div>
353	<div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform">
354	<div class="layout-tablew">
355	<div class="container-row">
356	<div class="cell-property">Width</div>
357	<div class="cell-value"><div data-montage-id="scale-x"></div></div>
358	</div>
359	<div class="container-row">
360	<div class="cell-property">Height</div>
361	<div class="cell-value"><div data-montage-id="scale-y"></div></div>
362	</div>
363	<div class="container-row">
364	<div class="cell-property">Skew X</div>
365	<div class="cell-value"><div data-montage-id="skew-x"></div></div>
366	</div>
367	<div class="container-row">
368	<div class="cell-property">Skew Y</div>
369	<div class="cell-value"><div data-montage-id="skew-y"></div></div>