aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/style-presets.reel
diff options
context:
space:
mode:
authorhwc4872012-04-27 14:35:46 -0700
committerhwc4872012-04-27 14:35:46 -0700
commit1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch)
tree3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/panels/presets/style-presets.reel
parent5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels/presets/style-presets.reel')
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html14
1 files changed, 5 insertions, 9 deletions
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html
index 0db4d3c0..7490a73b 100644
--- a/js/panels/presets/style-presets.reel/style-presets.html
+++ b/js/panels/presets/style-presets.reel/style-presets.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,16 +11,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module" : "js/panels/presets/style-presets.reel", 14 "prototype" : "js/panels/presets/style-presets.reel[StylesLibrary]",
15 "name" : "StylesLibrary",
16 "properties" : { 15 "properties" : {
17 "element" : {"#" : "stylesLibrary"}, 16 "element" : {"#" : "stylesLibrary"},
18 "treeList" : {"@" : "treeList"} 17 "treeList" : {"@" : "treeList"}
19 } 18 }
20 }, 19 },
21 "presetsController" : { 20 "presetsController" : {
22 "module": "js/controllers/tree-controller", 21 "prototype": "js/controllers/tree-controller",
23 "name": "TreeController",
24 "properties" : { 22 "properties" : {
25 "branchKey" : "children", 23 "branchKey" : "children",
26 "labelKey" : "text", 24 "labelKey" : "text",
@@ -34,8 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
34 } 32 }
35 }, 33 },
36 "presetsContainer" : { 34 "presetsContainer" : {
37 "module" : "js/components/treeview/treeview.reel", 35 "prototype" : "js/components/treeview/treeview.reel",
38 "name" : "Treeview",
39 "properties" : { 36 "properties" : {
40 "element" : {"#": "libraryContainer"}, 37 "element" : {"#": "libraryContainer"},
41 "branchComponent" : {"@": "branch" }, 38 "branchComponent" : {"@": "branch" },
@@ -45,8 +42,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
45 } 42 }
46 }, 43 },
47 "branch" : { 44 "branch" : {
48 "module" : "js/components/treeview/ninja-branch.reel", 45 "prototype" : "js/components/treeview/ninja-branch.reel[Branch]"
49 "name" : "Branch"
50 } 46 }
51 } 47 }
52 </script> 48 </script>