From 75fe4f36a6768d688792bc1925cfa4bfa508ac3e Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 22 May 2012 18:02:01 -0700 Subject: Adding redirect from app folder in templates This doesn't resolve the issue of XHR requests made in Montage. --- js/controllers/document-controller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index d99fadbb..2eba556e 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -80,6 +80,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component, return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/banner/'))[1]}; } else if (request.url.indexOf('js/document/templates/html') !== -1) { return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/html/'))[1]}; + } else if (request.url.indexOf('js/document/templates/app') !== -1) { + return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/app/'))[1]}; } else { //Error, not a valid folder } @@ -103,7 +105,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component, }, //////////////////////////////////////////////////////////////////// - -- cgit v1.2.3 From d5b36812ba84e49aa8b597eea9f75bf36ddcb571 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 23 May 2012 15:24:25 -0700 Subject: fixing the styles manager to open code view files and closing the last document. Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 3e15511d..aa037bd4 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -399,10 +399,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component, if(this._documents.length > 0) { previousFocusedDocument = this._documents[this._documents.length - 1]; - this._activeDocument = previousFocusedDocument; - this.switchDocuments(this.activeDocument, previousFocusedDocument, true); + this.activeDocument = previousFocusedDocument; + this.switchDocuments(this.activeDocument, previousFocusedDocument, false); } else { - this._activeDocument = null; + this.activeDocument = null; this.application.ninja.stage.hideRulers(); this.application.ninja.stage.hideCanvas(true); @@ -524,13 +524,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.application.ninja.stage.restoreAllPanels(); this.application.ninja.stage.hideCanvas(false); this.application.ninja.stage.showRulers(); - } else if(currentDocument.currentView === "design" && newDocument.currentView === "code") { - this.application.ninja.stage.showCodeViewBar(true); - this.application.ninja.stage.collapseAllPanels(); - this.application.ninja.stage.hideCanvas(true); - this.application.ninja.stage.hideRulers(); } - }else if(!currentDocument && newDocument.currentView === "code"){ + } + + if(newDocument.currentView === "code") { this.application.ninja.stage.showCodeViewBar(true); this.application.ninja.stage.collapseAllPanels(); this.application.ninja.stage.hideCanvas(true); -- cgit v1.2.3 From 5914c5b2209c4b8daac4249bb76cda5c9314c4e6 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 24 May 2012 00:07:23 -0700 Subject: Cleaning up referencing to 'documentRoot' and '_document' Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. --- js/controllers/document-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 4edcff48..f84e4da5 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -475,7 +475,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.activeDocument = doc; // Initialize the documentRoot styles - this.initializeRootStyles(doc.documentRoot); + this.initializeRootStyles(doc.model.documentRoot); // Flag to stop stylesheet dirty event this._hackInitialStyles = false; -- cgit v1.2.3 From 36c7e9a31e5197fee6824ffe746d715b24bcadcb Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 24 May 2012 00:25:14 -0700 Subject: Renaming variable as it will now be used This is no longer a temp fix, it might be a permanent boolean to open/close web-request API gates. --- js/controllers/document-controller.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index f84e4da5..c61441b7 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -22,7 +22,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, value: [] }, - _hackRootFlag: { + redirectRequests: { value: false }, @@ -74,7 +74,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, handleWebRequest: { value: function (request) { //TODO: Check if frameId is proper - if (this._hackRootFlag && request.parentFrameId !== -1) { + if (this.redirectRequests && request.parentFrameId !== -1) { //Checking for proper URL redirect (from different directories) if (request.url.indexOf('js/document/templates/banner') !== -1) { return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/banner/'))[1]}; @@ -330,7 +330,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, } //Open in designer view - this._hackRootFlag = false; + this.redirectRequests = false; Montage.create(HTMLDocument).init(file, this, this._onOpenDocument, 'design', template); break; default: -- cgit v1.2.3 From d57cd68741f340a45be780675ed79b5caf2094e9 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 24 May 2012 00:43:51 -0700 Subject: Some clean up, adding comments This obviously needs much work and reworking... --- js/controllers/document-controller.js | 73 ++++++++++++----------------------- 1 file changed, 25 insertions(+), 48 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index c61441b7..eecf9146 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -13,24 +13,14 @@ var Montage = require("montage/core/core").Montage, TextDocument = require("js/document/document-text").TextDocument; //////////////////////////////////////////////////////////////////////// // -var DocumentController = exports.DocumentController = Montage.create(Component, { - hasTemplate: { - value: false - }, - - _documents: { - value: [] - }, - - redirectRequests: { - value: false - }, - - _hackInitialStyles: { - value: true - }, - +exports.DocumentController = Montage.create(Component, { + // + hasTemplate: {value: false}, + _documents: {value: []}, + //TODO: what is this?!?! + _hackInitialStyles: {value: true}, _activeDocument: { value: null }, + //TODO: Are any of these needed? _iframeCounter: { value: 1, enumerable: false }, _iframeHolder: { value: null, enumerable: false }, _textHolder: { value: null, enumerable: false }, @@ -41,7 +31,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, return this._activeDocument; }, set: function(doc) { -// if(!!this._activeDocument){ this._activeDocument.isActive = false;} + //if(!!this._activeDocument){ this._activeDocument.isActive = false;} this._activeDocument = doc; @@ -53,7 +43,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, }, deserializedFromTemplate: { - value: function() { + value: function() { //TODO: Add event naming consistency (save, fileOpen and newFile should be consistent, all file events should be executeFile[operation name]) this.eventManager.addEventListener("appLoaded", this, false); this.eventManager.addEventListener("executeFileOpen", this, false); this.eventManager.addEventListener("executeNewFile", this, false); @@ -69,6 +59,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component, //TODO: Ensure these APIs are not needed + redirectRequests: { + value: false + }, //////////////////////////////////////////////////////////////////// // handleWebRequest: { @@ -151,7 +144,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, // saveExecuted: { value: function (value) { - //File saved, any callbacks or events should go here + //File saved, any callbacks or events should go here (must be added in handleExecuteSave passed as callback) } }, //////////////////////////////////////////////////////////////////// @@ -161,9 +154,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component, // if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){ // - this.activeDocument.model.saveAll(this.testCallback.bind(this)); //this.fileSaveResult.bind(this) + this.activeDocument.model.saveAll(); } else { - //Error: + //TODO: Add error handling } } }, @@ -183,38 +176,22 @@ var DocumentController = exports.DocumentController = Montage.create(Component, handleExecuteFileClose:{ value: function(event) { if (this.activeDocument) { -// this.activeDocument.closeDocument(); this.closeFile(this.activeDocument); } } }, //////////////////////////////////////////////////////////////////// + //TODO: Is this used, should be cleaned up handleExecuteFileCloseAll:{ - value: function(event) { - var i=0; - if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){ - while(this._documents.length > 0){ - this.closeDocument(this._documents[this._documents.length -1].uuid); - } - } - } - }, - //////////////////////////////////////////////////////////////////// - // - fileSaveResult: { - value: function (result) { - if((result.status === 204) || (result.status === 404)){//204=>existing file || 404=>new file... saved - this.activeDocument.model.needsSave = false; - if(this.application.ninja.currentDocument !== null){ - //clear Dirty StyleSheets for the saved document - this.application.ninja.stylesController.clearDirtyStyleSheets(this.application.ninja.currentDocument); - } - } - } - }, - - - + value: function(event) { + var i=0;//TODO: who is using this?? + if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){ + while(this._documents.length > 0){ + this.closeDocument(this._documents[this._documents.length -1].uuid); + } + } + } + }, //////////////////////////////////////////////////////////////////// // createNewFile:{ -- cgit v1.2.3