diff options
author | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
commit | e377a8dc0b0e34905782ed867acb5fe725ae0131 (patch) | |
tree | 6931311aabd7a4e366df195a168d437f1d0d8465 /js/panels/presets/style-presets.reel | |
parent | 8be6e94b57f4bd6e28754a6113b4d6a401365e13 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-e377a8dc0b0e34905782ed867acb5fe725ae0131.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/presets/style-presets.reel')
-rw-r--r-- | js/panels/presets/style-presets.reel/style-presets.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html index 7490a73b..a3d718bb 100644 --- a/js/panels/presets/style-presets.reel/style-presets.html +++ b/js/panels/presets/style-presets.reel/style-presets.html | |||
@@ -13,8 +13,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
13 | "owner": { | 13 | "owner": { |
14 | "prototype" : "js/panels/presets/style-presets.reel[StylesLibrary]", | 14 | "prototype" : "js/panels/presets/style-presets.reel[StylesLibrary]", |
15 | "properties" : { | 15 | "properties" : { |
16 | "element" : {"#" : "stylesLibrary"}, | 16 | "element" : {"#" : "stylesLibrary"} |
17 | "treeList" : {"@" : "treeList"} | ||
18 | } | 17 | } |
19 | }, | 18 | }, |
20 | "presetsController" : { | 19 | "presetsController" : { |
@@ -48,8 +47,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
48 | </script> | 47 | </script> |
49 | </head> | 48 | </head> |
50 | <body> | 49 | <body> |
51 | <section id="stylesLibrary" class="stylesLibrary"> | 50 | <section data-montage-id="stylesLibrary" class="stylesLibrary"> |
52 | <div id="libraryContainer"></div> | 51 | <div data-montage-id="libraryContainer"></div> |
53 | </section> | 52 | </section> |
54 | </body> | 53 | </body> |
55 | </html> \ No newline at end of file | 54 | </html> \ No newline at end of file |