diff options
author | Kruti Shah | 2012-07-19 10:08:07 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-19 10:08:07 -0700 |
commit | 5741fbc0a2eb1a43017b76406056bc98cdf00297 (patch) | |
tree | c6b478666eab9e637039467d70e948e1e0e46882 /js/ninja.reel/ninja.html | |
parent | 0b899ad6cec5e4626dfa32230be7c04d22d4f820 (diff) | |
parent | 142dc59794769ad783ab050b27b4f56ac5773afb (diff) | |
download | ninja-5741fbc0a2eb1a43017b76406056bc98cdf00297.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 17726712..4f40a3f8 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -52,10 +52,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
52 | }, | 52 | }, |
53 | 53 | ||
54 | "appModel": { | 54 | "appModel": { |
55 | "prototype": "js/models/app-model", | 55 | "prototype": "js/models/app-model" |
56 | "bindings": { | ||
57 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} | ||
58 | } | ||
59 | }, | 56 | }, |
60 | 57 | ||
61 | "materialsModel": { | 58 | "materialsModel": { |
@@ -63,7 +60,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
63 | }, | 60 | }, |
64 | 61 | ||
65 | "menu": { | 62 | "menu": { |
66 | "prototype": "js/components/menu/menu.reel", | 63 | "prototype": "js/ui/menu/menu.reel", |
67 | "properties": { | 64 | "properties": { |
68 | "element": {"#": "mainMenuBar"} | 65 | "element": {"#": "mainMenuBar"} |
69 | }, | 66 | }, |
@@ -183,17 +180,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
183 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} | 180 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} |
184 | } | 181 | } |
185 | }, | 182 | }, |
186 | 183 | ||
187 | "stageMode": { | ||
188 | "prototype": "js/components/layout/stage-mode.reel", | ||
189 | "properties": { | ||
190 | "element": {"#": "stageMode"} | ||
191 | }, | ||
192 | "bindings" : { | ||
193 | "chromePreview": {"<->": "@appModel.chromePreview"} | ||
194 | } | ||
195 | }, | ||
196 | |||
197 | "toolsList": { | 184 | "toolsList": { |
198 | "prototype": "js/components/layout/tools-list.reel", | 185 | "prototype": "js/components/layout/tools-list.reel", |
199 | "properties": { | 186 | "properties": { |