aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-27 15:05:38 -0700
committerPushkar Joshi2012-04-27 15:05:38 -0700
commitc8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch)
tree74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/panels/Timeline/Style.reel
parent28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Timeline/Style.reel')
-rw-r--r--js/panels/Timeline/Style.reel/Style.html14
1 files changed, 5 insertions, 9 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index 48714432..9fb098de 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module": "js/panels/Timeline/Style.reel", 14 "prototype": "js/panels/Timeline/Style.reel",
15 "name": "Style",
16 "properties": { 15 "properties": {
17 "element": {"#": "style-container"}, 16 "element": {"#": "style-container"},
18 "styleContainer" : {"#" : "style-container"}, 17 "styleContainer" : {"#" : "style-container"},
@@ -24,8 +23,7 @@
24 } 23 }
25 }, 24 },
26 "dtext1" : { 25 "dtext1" : {
27 "module" : "montage/ui/dynamic-text.reel", 26 "prototype" : "montage/ui/dynamic-text.reel",
28 "name" : "DynamicText",
29 "properties" : { 27 "properties" : {
30 "element" : {"#" : "container-property"} 28 "element" : {"#" : "container-property"}
31 }, 29 },
@@ -38,8 +36,7 @@
38 } 36 }
39 }, 37 },
40 "hottextunit" : { 38 "hottextunit" : {
41 "module" : "js/components/hottextunit.reel", 39 "prototype" : "js/components/hottextunit.reel[HotTextUnit]",
42 "name" : "HotTextUnit",
43 "properties" : { 40 "properties" : {
44 "element" : {"#":"value-editor-hottext"} 41 "element" : {"#":"value-editor-hottext"}
45 }, 42 },
@@ -52,8 +49,7 @@
52 } 49 }
53 }, 50 },
54 "hintable" : { 51 "hintable" : {
55 "module" : "js/components/hintable.reel", 52 "prototype" : "js/components/hintable.reel",
56 "name" : "Hintable",
57 "properties" : { 53 "properties" : {
58 "element" : {"#":"style-hintable"} 54 "element" : {"#":"style-hintable"}
59 }, 55 },