aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/ninja.reel/ninja.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html178
1 files changed, 76 insertions, 102 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index ead7f576..52a6daa2 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2 2
3<!-- <copyright> 3<!-- <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc. 4 This file contains proprietary software owned by Motorola Mobility, Inc.
@@ -17,36 +17,30 @@
17 <script type="text/montage-serialization"> 17 <script type="text/montage-serialization">
18 { 18 {
19 "localStorage": { 19 "localStorage": {
20 "module": "js/controllers/local-storage-controller", 20 "prototype": "js/controllers/local-storage-controller[LocalStorage]"
21 "name": "LocalStorage"
22 }, 21 },
23 22
24 "toolsData1": { 23 "toolsData1": {
25 "module": "js/data/tools-data", 24 "prototype": "js/data/tools-data"
26 "name": "ToolsData"
27 }, 25 },
28 26
29 "appModel": { 27 "appModel": {
30 "module": "js/models/app-model", 28 "prototype": "js/models/app-model"
31 "name": "AppModel"
32 }, 29 },
33 30
34 "materialsModel": { 31 "materialsModel": {
35 "module": "js/models/materials-model", 32 "prototype": "js/models/materials-model"
36 "name": "MaterialsModel"
37 }, 33 },
38 34
39 "menu": { 35 "menu": {
40 "module": "js/components/menu/menu.reel", 36 "prototype": "js/components/menu/menu.reel",
41 "name": "Menu",
42 "properties": { 37 "properties": {
43 "element": {"#": "mainMenuBar"} 38 "element": {"#": "mainMenuBar"}
44 } 39 }
45 }, 40 },
46 41
47 "splitter1": { 42 "splitter1": {
48 "module": "js/panels/Splitter", 43 "prototype": "js/panels/Splitter",
49 "name": "Splitter",
50 "properties": { 44 "properties": {
51 "element": {"#": "topSplitter"}, 45 "element": {"#": "topSplitter"},
52 "panel": {"#": "topPanelContainer"} 46 "panel": {"#": "topPanelContainer"}
@@ -54,8 +48,7 @@
54 }, 48 },
55 49
56 "splitter2": { 50 "splitter2": {
57 "module": "js/panels/Splitter", 51 "prototype": "js/panels/Splitter",
58 "name": "Splitter",
59 "properties": { 52 "properties": {
60 "element": {"#": "leftSplitter"}, 53 "element": {"#": "leftSplitter"},
61 "panel": {"#": "leftPanelContainer"} 54 "panel": {"#": "leftPanelContainer"}
@@ -63,8 +56,7 @@
63 }, 56 },
64 57
65 "splitter3": { 58 "splitter3": {
66 "module": "js/panels/Splitter", 59 "prototype": "js/panels/Splitter",
67 "name": "Splitter",
68 "properties": { 60 "properties": {
69 "element": {"#": "rightSplitter"}, 61 "element": {"#": "rightSplitter"},
70 "panel": {"#": "rightPanelContainer"}, 62 "panel": {"#": "rightPanelContainer"},
@@ -73,8 +65,7 @@
73 }, 65 },
74 66
75 "splitter4": { 67 "splitter4": {
76 "module": "js/panels/Splitter", 68 "prototype": "js/panels/Splitter",
77 "name": "Splitter",
78 "properties": { 69 "properties": {
79 "element": {"#": "bottomSplitter"}, 70 "element": {"#": "bottomSplitter"},
80 "panel": {"@": "timeline"} 71 "panel": {"@": "timeline"}
@@ -82,8 +73,7 @@
82 }, 73 },
83 74
84 "resizer1": { 75 "resizer1": {
85 "module": "js/panels/resize-composer", 76 "prototype": "js/panels/resize-composer",
86 "name": "ResizeComposer",
87 "properties": { 77 "properties": {
88 "element": {"#": "rightPanelResizer"}, 78 "element": {"#": "rightPanelResizer"},
89 "component": {"@": "owner"}, 79 "component": {"@": "owner"},
@@ -106,8 +96,7 @@
106 }, 96 },
107 97
108 "resizer2": { 98 "resizer2": {
109 "module": "js/panels/resize-composer", 99 "prototype": "js/panels/resize-composer",
110 "name": "ResizeComposer",
111 "properties": { 100 "properties": {
112 "element": {"#": "timelineResizer"}, 101 "element": {"#": "timelineResizer"},
113 "component": {"@": "owner"}, 102 "component": {"@": "owner"},
@@ -130,8 +119,7 @@
130 }, 119 },
131 120
132 "Resizer": { 121 "Resizer": {
133 "module": "js/panels/resize-composer", 122 "prototype": "js/panels/resize-composer",
134 "name": "ResizeComposer",
135 "properties": { 123 "properties": {
136 "element": {"#": "pasteboardResizer"}, 124 "element": {"#": "pasteboardResizer"},
137 "component": {"@": "owner"} 125 "component": {"@": "owner"}
@@ -157,8 +145,7 @@
157 }, 145 },
158 146
159 "stageMode": { 147 "stageMode": {
160 "module": "js/components/layout/stage-mode.reel", 148 "prototype": "js/components/layout/stage-mode.reel",
161 "name": "StageMode",
162 "properties": { 149 "properties": {
163 "element": {"#": "stageMode"} 150 "element": {"#": "stageMode"}
164 }, 151 },
@@ -172,8 +159,7 @@
172 }, 159 },
173 160
174 "toolsList1": { 161 "toolsList1": {
175 "module": "js/components/layout/tools-list.reel", 162 "prototype": "js/components/layout/tools-list.reel",
176 "name": "ToolsList",
177 "properties": { 163 "properties": {
178 "element": {"#": "toolsList"}, 164 "element": {"#": "toolsList"},
179 "toolsData": {"@": "toolsData1"} 165 "toolsData": {"@": "toolsData1"}
@@ -181,8 +167,7 @@
181 }, 167 },
182 168
183 "toolsProperties1": { 169 "toolsProperties1": {
184 "module": "js/components/layout/tools-properties.reel", 170 "prototype": "js/components/layout/tools-properties.reel",
185 "name": "ToolsProperties",
186 "properties": { 171 "properties": {
187 "element": {"#": "toolsProperties"}, 172 "element": {"#": "toolsProperties"},
188 "toolsData": {"@": "toolsData1"} 173 "toolsData": {"@": "toolsData1"}
@@ -190,16 +175,14 @@
190 }, 175 },
191 176
192 "documentsTab": { 177 "documentsTab": {
193 "module": "js/components/layout/documents-tab.reel", 178 "prototype": "js/components/layout/documents-tab.reel",
194 "name": "DocumentsTab",
195 "properties": { 179 "properties": {
196 "element": {"#": "openDocumentsTabComponent"} 180 "element": {"#": "openDocumentsTabComponent"}
197 } 181 }
198 }, 182 },
199 183
200 "stage1": { 184 "stage1": {
201 "module": "js/stage/stage.reel", 185 "prototype": "js/stage/stage.reel",
202 "name": "Stage",
203 "properties": { 186 "properties": {
204 "element": {"#": "stageAndScenesContainer"}, 187 "element": {"#": "stageAndScenesContainer"},
205 "appModel": {"@": "appModel"} 188 "appModel": {"@": "appModel"}
@@ -207,16 +190,21 @@
207 }, 190 },
208 191
209 "documentBar": { 192 "documentBar": {
210 "module": "js/components/layout/document-bar.reel", 193 "prototype": "js/components/layout/document-bar.reel",
211 "name": "DocumentBar",
212 "properties": { 194 "properties": {
213 "element": {"#": "documentBar"} 195 "element": {"#": "documentBar"}
214 } 196 }
215 }, 197 },
216 198
199 "editorViewOptions": {
200 "prototype": "js/code-editor/ui/code-editor-view-options.reel",
201 "properties": {
202 "element": {"#": "editorViewOptions"}
203 }
204 },
205
217 "panelContainer": { 206 "panelContainer": {
218 "module": "js/panels/PanelContainer.reel", 207 "prototype": "js/panels/PanelContainer.reel",
219 "name": "PanelContainer",
220 "properties": { 208 "properties": {
221 "element": {"#": "rightPanelContent"}, 209 "element": {"#": "rightPanelContent"},
222 "panelSplitter": {"@": "splitter3"}, 210 "panelSplitter": {"@": "splitter3"},
@@ -225,8 +213,7 @@
225 }, 213 },
226 214
227 "breadCrumb":{ 215 "breadCrumb":{
228 "module": "js/components/layout/bread-crumb.reel", 216 "prototype": "js/components/layout/bread-crumb.reel[Breadcrumb]",
229 "name": "Breadcrumb",
230 "properties":{ 217 "properties":{
231 "element":{"#" : "breadCrumbComponent"} 218 "element":{"#" : "breadCrumbComponent"}
232 }, 219 },
@@ -240,49 +227,41 @@
240 }, 227 },
241 228
242 "timeline": { 229 "timeline": {
243 "module": "js/panels/Timeline/TimelinePanel.reel",