diff options
author | Jon Reid | 2012-04-10 14:49:20 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-10 14:49:20 -0700 |
commit | 4c492e2f9d01a699aba8ccdd1a2b04238749ea3c (patch) | |
tree | 070749003be8889daca52350e2b64625a2757d1d /js/panels/Timeline/Layer.reel/Layer.html | |
parent | d343c7b3f482c17176cca3ddb6e7f8753169ad48 (diff) | |
download | ninja-4c492e2f9d01a699aba8ccdd1a2b04238749ea3c.tar.gz |
Timeline: New Features: Tag name now present in each layer. Configuration
dropdown in Master Layer; Show Only Animated Layers toggle.
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index eb9ff3a9..9a9623b8 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
@@ -17,6 +17,7 @@ | |||
17 | "element": {"#": "layer"}, | 17 | "element": {"#": "layer"}, |
18 | "styleRepetition" : {"@":"repetition1"}, | 18 | "styleRepetition" : {"@":"repetition1"}, |
19 | "dynamicLayerName" : {"@":"dtext1"}, | 19 | "dynamicLayerName" : {"@":"dtext1"}, |
20 | "dynamicLayerTag" : {"@": "dtext2"}, | ||
20 | "slotStyle" : {"@":"slot1"}, | 21 | "slotStyle" : {"@":"slot1"}, |
21 | "mainCollapser" : {"@" : "mainCollapser"}, | 22 | "mainCollapser" : {"@" : "mainCollapser"}, |
22 | "positionCollapser" : {"@" : "positionCollapser"}, | 23 | "positionCollapser" : {"@" : "positionCollapser"}, |
@@ -41,6 +42,20 @@ | |||
41 | } | 42 | } |
42 | } | 43 | } |
43 | }, | 44 | }, |
45 | "dtext2" : { | ||
46 | "module" : "montage/ui/dynamic-text.reel", | ||
47 | "name" : "DynamicText", | ||
48 | "properties" : { | ||
49 | "element" : {"#" : "layer-tag"} | ||
50 | }, | ||
51 | "bindings" : { | ||
52 | "value" : { | ||
53 | "boundObject" : {"@": "owner"}, | ||
54 | "boundObjectPropertyPath" : "layerTag", | ||
55 | "oneway" : false | ||
56 | } | ||
57 | } | ||
58 | }, | ||
44 | "repetition1": { | 59 | "repetition1": { |
45 | "module": "montage/ui/repetition.reel", | 60 | "module": "montage/ui/repetition.reel", |
46 | "name": "Repetition", | 61 | "name": "Repetition", |
@@ -326,6 +341,7 @@ | |||
326 | 341 | ||
327 | <div data-montage-id="layer" class="container-layer"> | 342 | <div data-montage-id="layer" class="container-layer"> |
328 | <div class="label-layer" data-montage-id="myLabel"> | 343 | <div class="label-layer" data-montage-id="myLabel"> |
344 | <span data-montage-id="layer-tag" class="layer-tag"></span> | ||
329 | <span class="collapsible-label" data-montage-id="layer-label-text" spellcheck="false">Label</span> | 345 | <span class="collapsible-label" data-montage-id="layer-label-text" spellcheck="false">Label</span> |
330 | <span class="collapsible-clicker collapsible-collapsed" data-montage-id="clicker-main"></span> | 346 | <span class="collapsible-clicker collapsible-collapsed" data-montage-id="clicker-main"></span> |
331 | <div class="cssbutton button-lock"></div> | 347 | <div class="cssbutton button-lock"></div> |