aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-13 14:00:31 -0700
committerPushkar Joshi2012-06-13 14:00:31 -0700
commit596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch)
tree480f42ffc0782ca768284c1208a8f99adb5636a2 /js/ninja.reel
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html7
-rwxr-xr-xjs/ninja.reel/ninja.js163
2 files changed, 159 insertions, 11 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 38b956bd..405f57da 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
@@ -291,8 +291,7 @@
291 "selectionController": { 291 "selectionController": {
292 "prototype": "js/controllers/selection-controller", 292 "prototype": "js/controllers/selection-controller",
293 "bindings" : { 293 "bindings" : {
294 "currentDocument": {"<-": "@documentList.selectedObjects.0"}, 294 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
295 "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"}
296 } 295 }
297 }, 296 },
298 297
@@ -309,7 +308,7 @@
309 "selectObjectsOnAddition": true 308 "selectObjectsOnAddition": true
310 }, 309 },
311 "bindings": { 310 "bindings": {
312 "content": {"<<->": "@documentController.documents"} 311 "content": {"<->": "@documentController.documents"}
313 } 312 }
314 }, 313 },
315 314
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 2d43af7a..61cd2487 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -15,22 +15,172 @@ var NjUtils = require("js/lib/NJUtils").NJUtils;
15 15
16exports.Ninja = Montage.create(Component, { 16exports.Ninja = Montage.create(Component, {
17 17
18 ninjaVersion: { 18 // SERIALIZABLE Properties
19 value: null 19 //////////////////////////////
20 rulerTop: {
21 value: null,
22 serializable: true
23 },
24
25 rulerLeft: {
26 value: null,
27 serializable: true
28 },
29
30 appModel: {
31 value: null,
32 serializable: true
20 }, 33 },
21 34
22 toolsData: { 35 toolsData: {
23 value: null 36 value: null,
37 serializable: true
24 }, 38 },
25 39
26 appData: { 40 toolsList: {
27 value: AppData 41 value: null,
42 serializable: true
43 },
44
45 toolsProperties: {
46 value: null,
47 serializable: true
48 },
49
50 stage: {
51 value: null,
52 serializable: true
53 },
54
55 elementMediator: {
56 value: null,
57 serializable: true
58 },
59
60 dragDropMediator: {
61 value: null,
62 serializable: true
63 },
64
65 undocontroller: {
66 value: null,
67 serializable: true
68 },
69
70 selectionController: {
71 value: null,
72 serializable: true
73 },
74
75 documentController: {
76 value: null,
77 serializable: true
78 },
79
80 popupManager: {
81 value: null,
82 serializable: true
83 },
84
85 colorController: {
86 value: null,
87 serializable: true
88 },
89
90 stylesController: {
91 value: null,
92 serializable: true
93 },
94
95 presetsController: {
96 value: null,
97 serializable: true
98 },
99
100 filePickerController: {
101 value: null,
102 serializable: true
103 },
104
105 newFileController: {
106 value: null,
107 serializable: true
108 },
109
110 coreIoApi: {
111 value: null,
112 serializable: true
113 },
114
115 documentBar: {
116 value: null,
117 serializable: true
118 },
119
120 editorViewOptions: {
121 value: null,
122 serializable: true
123 },
124
125 ioMediator: {
126 value: null,
127 serializable: true
128 },
129
130 timeline: {
131 value: null,
132 serializable: true
133 },
134
135 mainMenuController: {
136 value: null,
137 serializable: true
138 },
139
140 codeEditorController: {
141 value: null,
142 serializable: true
143 },
144
145 rightPanelContainer: {
146 value: null,
147 serializable: true
148 },
149
150 panelSplitter: {
151 value: null,
152 serializable: true
153 },
154
155 timelineSplitter: {
156 value: null,
157 serializable: true
158 },
159
160 toolsSplitter: {
161 value: null,
162 serializable: true
163 },
164
165 optionsSplitter: {
166 value: null,
167 serializable: true
28 }, 168 },
29 169
30 documentList: { 170 documentList: {
171 value: null,
172 serializable: true
173 },
174 //////////////////////////////
175
176 ninjaVersion: {
31 value: null 177 value: null
32 }, 178 },
33 179
180 appData: {
181 value: AppData
182 },
183
34 currentDocument: { 184 currentDocument: {
35 get: function() { 185 get: function() {
36 if(this.documentList.selectedObjects) { 186 if(this.documentList.selectedObjects) {
@@ -306,8 +456,7 @@ exports.Ninja = Montage.create(Component, {
306 openDocument: { 456 openDocument: {
307 value: function(doc) { 457 value: function(doc) {
308 this.documentList.content.push(doc); 458 this.documentList.content.push(doc);
309 // This is not needed with the latest 0.10 montage. 459 // TODO: Check why this is still needed
310 // TODO: Remove this when integrating the next montage
311 this.documentList.selectedObjects = [doc]; 460 this.documentList.selectedObjects = [doc];
312 461
313 } 462 }