diff options
| author | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
| commit | e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch) | |
| tree | e84d2dc5033c1b5c1b993662660a90af12584b69 /js/panels/presets/style-presets.reel | |
| parent | ba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz | |
Merge branch 'master' into pentool
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 |