diff options
author | Valerio Virgillito | 2012-06-06 00:25:27 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-06 00:25:27 -0700 |
commit | 0e1a276f19ea70009c5a649e9667861d7c346a7e (patch) | |
tree | 6db7675bbe89746ba47002bba306da42a7261312 /js/ninja.reel | |
parent | f7e4257745ccd44b8d24555f0ef787429d6e472c (diff) | |
download | ninja-0e1a276f19ea70009c5a649e9667861d7c346a7e.tar.gz |
first iteration of adding serializable to ninja plus other changes to run the latest montage
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.html | 4 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 160 |
2 files changed, 157 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index a98fca60..a63422fb 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -163,7 +163,7 @@ | |||
163 | "element": {"#": "stageMode"} | 163 | "element": {"#": "stageMode"} |
164 | }, | 164 | }, |
165 | "bindings" : { | 165 | "bindings" : { |
166 | "livePreview": {"<<->": "@appModel.livePreview"} | 166 | "livePreview": {"<->": "@appModel.livePreview"} |
167 | } | 167 | } |
168 | }, | 168 | }, |
169 | 169 | ||
@@ -310,7 +310,7 @@ | |||
310 | "selectObjectsOnAddition": true | 310 | "selectObjectsOnAddition": true |
311 | }, | 311 | }, |
312 | "bindings": { | 312 | "bindings": { |
313 | "content": {"<<->": "@documentController.documents"} | 313 | "content": {"<->": "@documentController.documents"} |
314 | } | 314 | } |
315 | }, | 315 | }, |
316 | 316 | ||
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index a12270a0..e4f447d2 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -14,22 +14,172 @@ var NjUtils = require("js/lib/NJUtils").NJUtils; | |||
14 | 14 | ||
15 | exports.Ninja = Montage.create(Component, { | 15 | exports.Ninja = Montage.create(Component, { |
16 | 16 | ||
17 | ninjaVersion: { | 17 | // SERIALIZABLE Properties |
18 | value: null | 18 | ////////////////////////////// |
19 | rulerTop: { | ||
20 | value: null, | ||
21 | serializable: true | ||
22 | }, | ||
23 | |||
24 | rulerLeft: { | ||
25 | value: null, | ||
26 | serializable: true | ||
27 | }, | ||
28 | |||
29 | appModel: { | ||
30 | value: null, | ||
31 | serializable: true | ||
19 | }, | 32 | }, |
20 | 33 | ||
21 | toolsData: { | 34 | toolsData: { |
22 | value: null | 35 | value: null, |
36 | serializable: true | ||
23 | }, | 37 | }, |
24 | 38 | ||
25 | appData: { | 39 | toolsList: { |
26 | value: AppData | 40 | value: null, |
41 | serializable: true | ||
42 | }, | ||
43 | |||
44 | toolsProperties: { | ||
45 | value: null, | ||
46 | serializable: true | ||
47 | }, | ||
48 | |||
49 | stage: { | ||
50 | value: null, | ||
51 | serializable: true | ||
52 | }, | ||
53 | |||
54 | elementMediator: { | ||
55 | value: null, | ||
56 | serializable: true | ||
57 | }, | ||
58 | |||
59 | dragDropMediator: { | ||
60 | value: null, | ||
61 | serializable: true | ||
62 | }, | ||
63 | |||
64 | undocontroller: { | ||
65 | value: null, | ||
66 | serializable: true | ||
67 | }, | ||
68 | |||
69 | selectionController: { | ||
70 | value: null, | ||
71 | serializable: true | ||
72 | }, | ||
73 | |||
74 | documentController: { | ||
75 | value: null, | ||
76 | serializable: true | ||
77 | }, | ||
78 | |||
79 | popupManager: { | ||
80 | value: null, | ||
81 | serializable: true | ||
82 | }, | ||
83 | |||
84 | colorController: { | ||
85 | value: null, | ||
86 | serializable: true | ||
87 | }, | ||
88 | |||
89 | stylesController: { | ||
90 | value: null, | ||
91 | serializable: true | ||
92 | }, | ||
93 | |||
94 | presetsController: { | ||
95 | value: null, | ||
96 | serializable: true | ||
97 | }, | ||
98 | |||
99 | filePickerController: { | ||
100 | value: null, | ||
101 | serializable: true | ||
102 | }, | ||
103 | |||
104 | newFileController: { | ||
105 | value: null, | ||
106 | serializable: true | ||
107 | }, | ||
108 | |||
109 | coreIoApi: { | ||
110 | value: null, | ||
111 | serializable: true | ||
112 | }, | ||
113 | |||
114 | documentBar: { | ||
115 | value: null, | ||
116 | serializable: true | ||
117 | }, | ||
118 | |||
119 | editorViewOptions: { | ||
120 | value: null, | ||
121 | serializable: true | ||
122 | }, | ||
123 | |||
124 | ioMediator: { | ||
125 | value: null, | ||
126 | serializable: true | ||
127 | }, | ||
128 | |||
129 | timeline: { | ||
130 | value: null, | ||
131 | serializable: true | ||
132 | }, | ||
133 | |||
134 | mainMenuController: { | ||
135 | value: null, | ||
136 | serializable: true | ||
137 | }, | ||
138 | |||
139 | codeEditorController: { | ||
140 | value: null, | ||
141 | serializable: true | ||
142 | }, | ||
143 | |||
144 | rightPanelContainer: { | ||
145 | value: null, | ||
146 | serializable: true | ||
147 | }, | ||
148 | |||
149 | panelSplitter: { | ||
150 | value: null, | ||
151 | serializable: true | ||
152 | }, | ||
153 | |||
154 | timelineSplitter: { | ||
155 | value: null, | ||
156 | serializable: true | ||
157 | }, | ||
158 | |||
159 | toolsSplitter: { | ||
160 | value: null, | ||
161 | serializable: true | ||
162 | }, | ||
163 | |||
164 | optionsSplitter: { | ||
165 | value: null, | ||
166 | serializable: true | ||
27 | }, | 167 | }, |
28 | 168 | ||
29 | documentList: { | 169 | documentList: { |
170 | value: null, | ||
171 | serializable: true | ||
172 | }, | ||
173 | ////////////////////////////// | ||
174 | |||
175 | ninjaVersion: { | ||
30 | value: null | 176 | value: null |
31 | }, | 177 | }, |
32 | 178 | ||
179 | appData: { | ||
180 | value: AppData | ||
181 | }, | ||
182 | |||
33 | currentDocument: { | 183 | currentDocument: { |
34 | get: function() { | 184 | get: function() { |
35 | if(this.documentList.selectedObjects) { | 185 | if(this.documentList.selectedObjects) { |