diff options
author | Jose Antonio Marquez Russo | 2012-03-08 16:22:31 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-08 16:22:31 -0800 |
commit | b752f7fced5dfb5d16b6f32fadb48bc7e7fdbc28 (patch) | |
tree | 8a25f983cf5fc9eb8aab34a11fe8c90e8604bed3 /js/controllers | |
parent | 4bdb951f2dab6d132ed28ab17888cc819ed811ee (diff) | |
parent | 50e5491f44e577c66dfefb5d22815ef20ea5c1b1 (diff) | |
download | ninja-b752f7fced5dfb5d16b6f32fadb48bc7e7fdbc28.tar.gz |
Merge pull request #30 from ananyasen/FileIO-ananya
FileIO branch pull request
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/document-controller.js | 59 | ||||
-rwxr-xr-x | js/controllers/selection-controller.js | 19 | ||||
-rwxr-xr-x | js/controllers/styles-controller.js | 10 |
3 files changed, 73 insertions, 15 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 194496a6..87e93465 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -60,8 +60,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
60 | this.eventManager.addEventListener("executeSave", this, false); | 60 | this.eventManager.addEventListener("executeSave", this, false); |
61 | this.eventManager.addEventListener("executeSaveAs", this, false); | 61 | this.eventManager.addEventListener("executeSaveAs", this, false); |
62 | this.eventManager.addEventListener("executeSaveAll", this, false); | 62 | this.eventManager.addEventListener("executeSaveAll", this, false); |
63 | this.eventManager.addEventListener("executeFileClose", this, false); | ||
63 | 64 | ||
64 | this.eventManager.addEventListener("recordStyleChanged", this, false); | 65 | this.eventManager.addEventListener("styleSheetDirty", this, false); |
65 | 66 | ||
66 | } | 67 | } |
67 | }, | 68 | }, |
@@ -157,17 +158,29 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
157 | if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){ | 158 | if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){ |
158 | saveAsSettings.fileName = this.activeDocument.name; | 159 | saveAsSettings.fileName = this.activeDocument.name; |
159 | saveAsSettings.folderUri = this.activeDocument.uri.substring(0, this.activeDocument.uri.lastIndexOf("/")); | 160 | saveAsSettings.folderUri = this.activeDocument.uri.substring(0, this.activeDocument.uri.lastIndexOf("/")); |
160 | //add callback | 161 | saveAsSettings.callback = this.saveAsCallback.bind(this); |
161 | this.application.ninja.newFileController.showSaveAsDialog(saveAsSettings); | 162 | this.application.ninja.newFileController.showSaveAsDialog(saveAsSettings); |
162 | } | 163 | } |
163 | } | 164 | } |
164 | }, | 165 | }, |
165 | 166 | //////////////////////////////////////////////////////////////////// | |
167 | handleExecuteFileClose:{ | ||
168 | value: function(event) { | ||
169 | if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){ | ||
170 | this.closeDocument(this.activeDocument.uuid); | ||
171 | } | ||
172 | } | ||
173 | }, | ||
174 | //////////////////////////////////////////////////////////////////// | ||
166 | // | 175 | // |
167 | fileSaveResult: { | 176 | fileSaveResult: { |
168 | value: function (result) { | 177 | value: function (result) { |
169 | if(result.status === 204){ | 178 | if((result.status === 204) || (result.status === 404)){//204=>existing file || 404=>new file... saved |
170 | this.activeDocument.needsSave = false; | 179 | this.activeDocument.needsSave = false; |
180 | if(this.application.ninja.currentDocument !== null){ | ||
181 | //clear Dirty StyleSheets for the saved document | ||
182 | this.application.ninja.stylesController.clearDirtyStyleSheets(this.application.ninja.currentDocument); | ||
183 | } | ||
171 | } | 184 | } |
172 | } | 185 | } |
173 | }, | 186 | }, |
@@ -249,6 +262,29 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
249 | }, | 262 | }, |
250 | //////////////////////////////////////////////////////////////////// | 263 | //////////////////////////////////////////////////////////////////// |
251 | // | 264 | // |
265 | saveAsCallback:{ | ||
266 | value:function(saveAsDetails){ | ||
267 | var fileUri = null, filename = saveAsDetails.filename, destination = saveAsDetails.destination; | ||
268 | //update document metadata | ||
269 | this.activeDocument.name = ""+filename; | ||
270 | //prepare new file uri | ||
271 | if(destination && (destination.charAt(destination.length -1) !== "/")){ | ||
272 | destination = destination + "/"; | ||
273 | } | ||
274 | fileUri = destination+filename; | ||
275 | |||
276 | this.activeDocument.uri = fileUri; | ||
277 | //save a new file | ||
278 | //use the ioMediator.fileSaveAll when implemented | ||
279 | this.activeDocument._userDocument.name=filename; | ||
280 | this.activeDocument._userDocument.root=destination; | ||
281 | this.activeDocument._userDocument.uri=fileUri; | ||
282 | this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this)); | ||
283 | // | ||
284 | } | ||
285 | }, | ||
286 | |||
287 | //////////////////////////////////////////////////////////////////// | ||
252 | openDocument: { | 288 | openDocument: { |
253 | value: function(doc) { | 289 | value: function(doc) { |
254 | 290 | ||
@@ -336,14 +372,23 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
336 | nextDocumentIndex = closeDocumentIndex - 1; | 372 | nextDocumentIndex = closeDocumentIndex - 1; |
337 | } | 373 | } |
338 | this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]); | 374 | this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]); |
375 | if(typeof this.activeDocument.stopVideos !== "undefined"){doc.stopVideos();} | ||
339 | this._removeDocumentView(doc.container); | 376 | this._removeDocumentView(doc.container); |
340 | }else if(this._documents.length === 0){ | 377 | }else if(this._documents.length === 0){ |
378 | if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){ | ||
379 | this.activeDocument.pauseAndStopVideos(); | ||
380 | } | ||
341 | this.activeDocument = null; | 381 | this.activeDocument = null; |
342 | this._removeDocumentView(doc.container); | 382 | this._removeDocumentView(doc.container); |
343 | this.application.ninja.stage.stageView.hideRulers(); | 383 | this.application.ninja.stage.stageView.hideRulers(); |
344 | document.getElementById("iframeContainer").style.display="block"; | 384 | document.getElementById("iframeContainer").style.display="block"; |
345 | 385 | ||
346 | this.application.ninja.stage.hideCanvas(true); | 386 | this.application.ninja.stage.hideCanvas(true); |
387 | }else{//closing inactive document tab - just clear DOM | ||
388 | if(typeof doc.pauseAndStopVideos !== "undefined"){ | ||
389 | doc.pauseAndStopVideos(); | ||
390 | } | ||
391 | this._removeDocumentView(doc.container); | ||
347 | } | 392 | } |
348 | 393 | ||
349 | NJevent("closeDocument", doc.uri); | 394 | NJevent("closeDocument", doc.uri); |
@@ -506,5 +551,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
506 | value: function() { | 551 | value: function() { |
507 | return "userDocument_" + (this._iframeCounter++); | 552 | return "userDocument_" + (this._iframeCounter++); |
508 | } | 553 | } |
554 | }, | ||
555 | |||
556 | handleStyleSheetDirty:{ | ||
557 | value:function(){ | ||
558 | this.activeDocument.needsSave = true; | ||
509 | } | 559 | } |
560 | } | ||
510 | }); | 561 | }); |
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index 75968d4a..c713b6e5 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -48,6 +48,7 @@ exports.SelectionController = Montage.create(Component, { | |||
48 | this.eventManager.addEventListener("selectAll", this, false); | 48 | this.eventManager.addEventListener("selectAll", this, false); |
49 | this.eventManager.addEventListener("deleteSelection", this, false); | 49 | this.eventManager.addEventListener("deleteSelection", this, false); |
50 | this.eventManager.addEventListener("switchDocument", this, false); | 50 | this.eventManager.addEventListener("switchDocument", this, false); |
51 | this.eventManager.addEventListener("closeDocument", this, false); | ||
51 | // defaultEventManager.addEventListener( "undo", this, false); | 52 | // defaultEventManager.addEventListener( "undo", this, false); |
52 | // defaultEventManager.addEventListener( "redo", this, false); | 53 | // defaultEventManager.addEventListener( "redo", this, false); |
53 | } | 54 | } |
@@ -89,17 +90,17 @@ exports.SelectionController = Montage.create(Component, { | |||
89 | } | 90 | } |
90 | }, | 91 | }, |
91 | 92 | ||
92 | handleSwitchDocument: { | 93 | handleSwitchDocument: { |
93 | value: function() { | 94 | value: function() { |
94 | this._selectedItems = this.application.ninja.selectedElements.slice(0); | 95 | if(this.application.ninja.documentController.activeDocument.currentView === "design"){ |
95 | if(this._selectedItems.length === 0) { | 96 | this._selectedItems = this.application.ninja.selectedElements.slice(0); |
96 | this._isDocument = true; | 97 | if(this._selectedItems.length === 0 ){ |
97 | } else { | 98 | this._isDocument = true; |
98 | this._isDocument = false; | 99 | }else{ |
100 | this._isDocument = false; | ||
101 | } | ||
102 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); | ||
99 | } | 103 | } |
100 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument}); | ||
101 | |||
102 | this._selectionContainer = this.application.ninja.currentSelectedContainer; | ||
103 | } | 104 | } |
104 | }, | 105 | }, |
105 | 106 | ||
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index 662816f5..addfc24e 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
@@ -1236,11 +1236,17 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1236 | 1236 | ||
1237 | clearDirtyStyleSheets : { | 1237 | clearDirtyStyleSheets : { |
1238 | value: function(doc) { | 1238 | value: function(doc) { |
1239 | if(!doc) { | 1239 | this.dirtyStyleSheets.length = 0; |
1240 | |||
1241 | if(doc) { | ||
1242 | var stillDirty = this.dirtyStyleSheets.filter(function(sheet) { | ||
1243 | return sheet.document !== doc; | ||
1244 | }); | ||
1240 | this.dirtyStyleSheets = null; | 1245 | this.dirtyStyleSheets = null; |
1241 | this.dirtyStyleSheets = []; | 1246 | this.dirtyStyleSheets = stillDirty; |
1242 | } | 1247 | } |
1243 | 1248 | ||
1249 | |||
1244 | } | 1250 | } |
1245 | }, | 1251 | }, |
1246 | 1252 | ||