aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-27 10:50:17 -0800
committerValerio Virgillito2012-02-27 10:50:17 -0800
commita5d635a29de97a7daa93b9036d7a7dce48f07670 (patch)
tree0199d2ed21ab474b88302abf57cb8b14a200f4fa /js/controllers
parentd392751242f9a4aad4199c941fd416c19c422ee1 (diff)
parentc65eb4b983e8020346cda4dc7bcb050cb1a410e1 (diff)
downloadninja-a5d635a29de97a7daa93b9036d7a7dce48f07670.tar.gz
Merge branch 'FileIO-Build-Candidate' of https://github.com/joseeight/ninja-internal into integration-candidate
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js72
-rwxr-xr-xjs/controllers/elements/element-controller.js6
-rwxr-xr-xjs/controllers/selection-controller.js9
-rwxr-xr-xjs/controllers/styles-controller.js44
4 files changed, 90 insertions, 41 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 1c9d9d59..02031922 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -58,6 +58,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
58 this.eventManager.addEventListener("executeFileOpen", this, false); 58 this.eventManager.addEventListener("executeFileOpen", this, false);
59 this.eventManager.addEventListener("executeNewFile", this, false); 59 this.eventManager.addEventListener("executeNewFile", this, false);
60 this.eventManager.addEventListener("executeSave", this, false); 60 this.eventManager.addEventListener("executeSave", this, false);
61 this.eventManager.addEventListener("executeSaveAs", this, false);
62 this.eventManager.addEventListener("executeSaveAll", this, false);
61 63
62 this.eventManager.addEventListener("recordStyleChanged", this, false); 64 this.eventManager.addEventListener("recordStyleChanged", this, false);
63 65
@@ -87,11 +89,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
87 //Checking for app to be loaded through extension 89 //Checking for app to be loaded through extension
88 var check; 90 var check;
89 if (chrome && chrome.app) { 91 if (chrome && chrome.app) {
90 check = chrome.app.getDetails(); 92 check = chrome.app.getDetails();
91 } 93 }
92 if (check !== null) { 94 if (check !== null) {
93 //Adding an intercept to resources loaded to ensure user assets load from cloud simulator 95 //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
94 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]); 96 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
95 } 97 }
96 } 98 }
97 }, 99 },
@@ -107,33 +109,57 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
107 handleExecuteFileOpen: { 109 handleExecuteFileOpen: {
108 value: function(event) { 110 value: function(event) {
109 var pickerSettings = event._event.settings || {}; 111 var pickerSettings = event._event.settings || {};
110 pickerSettings.callback = this.openFileWithURI.bind(this); 112 if (this.application.ninja.coreIoApi.cloudAvailable()) {
111 pickerSettings.pickerMode = "read"; 113 pickerSettings.callback = this.openFileWithURI.bind(this);
112 pickerSettings.inFileMode = true; 114 pickerSettings.pickerMode = "read";
113 this.application.ninja.filePickerController.showFilePicker(pickerSettings); 115 pickerSettings.inFileMode = true;
116 this.application.ninja.filePickerController.showFilePicker(pickerSettings);
117 }
114 } 118 }
115 }, 119 },
116 120
117 handleExecuteNewFile: { 121 handleExecuteNewFile: {
118 value: function(event) { 122 value: function(event) {
119 var newFileSettings = event._event.settings || {}; 123 var newFileSettings = event._event.settings || {};
120 newFileSettings.callback = this.createNewFile.bind(this); 124 if (this.application.ninja.coreIoApi.cloudAvailable()) {
121 this.application.ninja.newFileController.showNewFileDialog(newFileSettings); 125 newFileSettings.callback = this.createNewFile.bind(this);
126 this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
127 }
122 } 128 }
123 }, 129 },
124
125
126 //////////////////////////////////////////////////////////////////// 130 ////////////////////////////////////////////////////////////////////
127 //TODO: Check for appropiate structures 131 //TODO: Check for appropiate structures
128 handleExecuteSave: { 132 handleExecuteSave: {
129 value: function(event) { 133 value: function(event) {
130 if(!!this.activeDocument){ 134 if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
131 //Text and HTML document classes should return the same save object for fileSave 135 //Text and HTML document classes should return the same save object for fileSave
132 this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this)); 136 this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
137 }
133 } 138 }
139 },
140 ////////////////////////////////////////////////////////////////////
141 //TODO: Check for appropiate structures
142 handleExecuteSaveAll: {
143 value: function(event) {
144 if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
145 //Text and HTML document classes should return the same save object for fileSave
146 this.application.ninja.ioMediator.fileSave(this.activeDocument.saveAll(), this.fileSaveResult.bind(this));
147 }
134 } 148 }
135 }, 149 },
136 //////////////////////////////////////////////////////////////////// 150 ////////////////////////////////////////////////////////////////////
151 handleExecuteSaveAs: {
152 value: function(event) {
153 var saveAsSettings = event._event.settings || {};
154 if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){
155 saveAsSettings.fileName = this.activeDocument.name;
156 saveAsSettings.folderUri = this.activeDocument.uri.substring(0, this.activeDocument.uri.lastIndexOf("/"));
157 //add callback
158 this.application.ninja.newFileController.showSaveAsDialog(saveAsSettings);
159 }
160 }
161 },
162
137 // 163 //
138 fileSaveResult: { 164 fileSaveResult: {
139 value: function (result) { 165 value: function (result) {
@@ -169,6 +195,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
169 value:function(doc){ 195 value:function(doc){
170 var response = doc || null;//default just for testing 196 var response = doc || null;//default just for testing
171 if(!!response && response.success && (response.status!== 500) && !!response.uri){ 197 if(!!response && response.success && (response.status!== 500) && !!response.uri){
198 this.creatingNewFile = true;//flag for timeline to identify new file flow
172 this.application.ninja.ioMediator.fileOpen(response.uri, this.openFileCallback.bind(this)); 199 this.application.ninja.ioMediator.fileOpen(response.uri, this.openFileCallback.bind(this));
173 }else if(!!response && !response.success){ 200 }else if(!!response && !response.success){
174 //Todo: restrict directory path to the sandbox, in the dialog itself 201 //Todo: restrict directory path to the sandbox, in the dialog itself
@@ -196,6 +223,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
196 value:function(response){ 223 value:function(response){
197 //TODO: Add UI to handle error codes, shouldn't be alert windows 224 //TODO: Add UI to handle error codes, shouldn't be alert windows
198 if(!!response && (response.status === 204)) { 225 if(!!response && (response.status === 204)) {
226
227 if((typeof this.creatingNewFile === 'undefined') || (this.creatingNewFile !== true)){//not from new file flow
228 this.creatingNewFile = false;
229 }
230
199 //Sending full response object 231 //Sending full response object
200 this.openDocument(response); 232 this.openDocument(response);
201 } else if (!!response && (response.status === 404)){ 233 } else if (!!response && (response.status === 404)){
@@ -292,7 +324,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
292 if(this.activeDocument.uuid === id && this._documents.length > 0) {//closing the active document tab 324 if(this.activeDocument.uuid === id && this._documents.length > 0) {//closing the active document tab
293 var nextDocumentIndex = -1 ; 325 var nextDocumentIndex = -1 ;
294 if((this._documents.length > 0) && (closeDocumentIndex === 0)){ 326 if((this._documents.length > 0) && (closeDocumentIndex === 0)){
295 nextDocumentIndex = 1; 327 nextDocumentIndex = 0;
296 }else if((this._documents.length > 0) && (closeDocumentIndex > 0)){ 328 }else if((this._documents.length > 0) && (closeDocumentIndex > 0)){
297 nextDocumentIndex = closeDocumentIndex - 1; 329 nextDocumentIndex = closeDocumentIndex - 1;
298 } 330 }
@@ -306,6 +338,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
306 338
307 this.application.ninja.stage.hideCanvas(true); 339 this.application.ninja.stage.hideCanvas(true);
308 } 340 }
341
342 NJevent("closeDocument", doc.uri);
343
344 doc=null;
309 } 345 }
310 }, 346 },
311 347
@@ -313,7 +349,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
313 // Event Detail: Contains the current ActiveDocument 349 // Event Detail: Contains the current ActiveDocument
314 _onOpenDocument: { 350 _onOpenDocument: {
315 value: function(doc){ 351 value: function(doc){
316 //var data = DocumentManager.activeDocument; 352 this.application.ninja.currentDocument = doc;
317 this._hideCurrentDocument(); 353 this._hideCurrentDocument();
318 this.application.ninja.stage.stageView.hideOtherDocuments(doc.uuid); 354 this.application.ninja.stage.stageView.hideOtherDocuments(doc.uuid);
319 355
@@ -397,7 +433,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
397 value: function() { 433 value: function() {
398 if(this.activeDocument) { 434 if(this.activeDocument) {
399 if(this.activeDocument.currentView === "design"){ 435 if(this.activeDocument.currentView === "design"){
400 this.application.ninja.stage.saveScroll(); 436 this.activeDocument.saveAppState();
401 this.activeDocument.container.parentNode.style["display"] = "none"; 437 this.activeDocument.container.parentNode.style["display"] = "none";
402 this.application.ninja.stage.hideCanvas(true); 438 this.application.ninja.stage.hideCanvas(true);
403 this.application.ninja.stage.stageView.hideRulers(); 439 this.application.ninja.stage.stageView.hideRulers();
@@ -414,7 +450,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
414 this.activeDocument.container.style["display"] = "block"; 450 this.activeDocument.container.style["display"] = "block";
415 if(this.activeDocument.currentView === "design"){ 451 if(this.activeDocument.currentView === "design"){
416 this.activeDocument.container.parentNode.style["display"] = "block"; 452 this.activeDocument.container.parentNode.style["display"] = "block";
417 this.application.ninja.stage.restoreScroll(); 453 this.activeDocument.restoreAppState();
418 this.application.ninja.stage.hideCanvas(false); 454 this.application.ninja.stage.hideCanvas(false);
419 this.application.ninja.stage.stageView.showRulers(); 455 this.application.ninja.stage.stageView.showRulers();
420 }else{ 456 }else{
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 46e82ace..ec0335b4 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -27,7 +27,11 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
27 27
28 getProperty: { 28 getProperty: {
29 value: function(el, prop, fallbackOnComputed, isStageElement) { 29 value: function(el, prop, fallbackOnComputed, isStageElement) {
30 return this.application.ninja.stylesController.getElementStyle(el, prop, fallbackOnComputed, isStageElement); 30 if(el.nodeType !== 3){
31 return this.application.ninja.stylesController.getElementStyle(el, prop, fallbackOnComputed, isStageElement);
32 }else{