From eff40602cac6821f8272177c24b6bf3de399f8b1 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 17 May 2012 21:11:33 -0700 Subject: multiple documents - enable opening multiple documents and initial switching Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 71 +++++++++++++++++------------------ 1 file changed, 35 insertions(+), 36 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index cf46e73e..50874725 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -454,58 +454,57 @@ var DocumentController = exports.DocumentController = Montage.create(Component, // Open document callback _onOpenDocument: { value: function(doc){ - + var currentDocument; if(this.activeDocument) { // There is a document currently opened - - + currentDocument = this.activeDocument; //this.application.ninja.stage.stageView.showCodeViewBar(false); //this.application.ninja.stage.stageView.restoreAllPanels(); - // - /* - if(this.activeDocument.currentView === "design"){ - this.activeDocument.saveAppState(); - this.activeDocument.container.parentNode.style["display"] = "none"; - this.application.ninja.stage.hideCanvas(true); - this.application.ninja.stage.stageView.hideRulers(); - } + //this.activeDocument.saveAppState(); - this.activeDocument.container.style["display"] = "none"; - */ - - /* - this.activeDocument.container.style["display"] = "block"; - if(this.activeDocument.currentView === "design"){ - this.activeDocument.container.parentNode.style["display"] = "block"; - this.activeDocument.restoreAppState(); - }else{ - //hide the iframe when switching to code view - document.getElementById("iframeContainer").style.display = "none"; - } - - */ - // hide current document + // TODO: Do we need this? + //this.application.ninja.stage.hideCanvas(true); + //this.application.ninja.stage.stageView.hideRulers(); + + //this.activeDocument.restoreAppState(); } else { // There is no document opened - // Set the active document - this.activeDocument = doc; + // Show the rulers + // TODO: Move this indo design view + this.application.ninja.stage.stageView.showRulers(); // Show the canvas this.application.ninja.stage.hideCanvas(false); + } - // Show the rulers - // TODO: Move this indo design view - this.application.ninja.stage.stageView.showRulers(); - // Initialize the documentRoot styles - this.initializeRootStyles(doc.documentRoot); - // Flag to stop stylesheet dirty event - this._hackInitialStyles = false; + // Set the active document + this.activeDocument = doc; + + // Initialize the documentRoot styles + this.initializeRootStyles(doc.documentRoot); + // Flag to stop stylesheet dirty event + this._hackInitialStyles = false; + + this.switchDocuments(currentDocument, doc); + + NJevent("onOpenDocument", doc); + + //Setting opacity to be viewable after load + //doc.model.views.design.iframe.style.opacity = 1; + + } + }, + + switchDocuments: { + value: function(current, newDocument) { + newDocument.model.views.design.iframe.style.opacity = 1; - NJevent("onOpenDocument", doc); + if(current) { + current.model.views.design.hide(); } } }, -- cgit v1.2.3 From 7a94696e19b14e15261df516e2ba75e693b1313d Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 18 May 2012 00:21:56 -0700 Subject: enabling basic document switching Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 37 +++++++++++++++-------------------- 1 file changed, 16 insertions(+), 21 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 50874725..fc1f2c0f 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -459,16 +459,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, // There is a document currently opened currentDocument = this.activeDocument; - //this.application.ninja.stage.stageView.showCodeViewBar(false); //this.application.ninja.stage.stageView.restoreAllPanels(); - - //this.activeDocument.saveAppState(); - - // TODO: Do we need this? - //this.application.ninja.stage.hideCanvas(true); - //this.application.ninja.stage.stageView.hideRulers(); - - //this.activeDocument.restoreAppState(); } else { // There is no document opened @@ -480,7 +471,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.application.ninja.stage.hideCanvas(false); } - // Set the active document this.activeDocument = doc; @@ -489,22 +479,27 @@ var DocumentController = exports.DocumentController = Montage.create(Component, // Flag to stop stylesheet dirty event this._hackInitialStyles = false; - this.switchDocuments(currentDocument, doc); - - NJevent("onOpenDocument", doc); - - //Setting opacity to be viewable after load - //doc.model.views.design.iframe.style.opacity = 1; - + this.switchDocuments(currentDocument, doc, true); } }, switchDocuments: { - value: function(current, newDocument) { - newDocument.model.views.design.iframe.style.opacity = 1; + value: function(currentDocument, newDocument, didCreate) { + + if(currentDocument) { + currentDocument.serializeDocument(); - if(current) { - current.model.views.design.hide(); + currentDocument.model.views.design.hide(); + } + + if(didCreate) { + newDocument.model.views.design.iframe.style.opacity = 1; + NJevent("onOpenDocument", newDocument); + } else { + this.activeDocument = newDocument; + newDocument.model.views.design.show(); + newDocument.deserializeDocument(); + NJevent("switchDocument"); } } }, -- cgit v1.2.3 From e9dddef38507cafcf5702ce6a512b4005609acef Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 18 May 2012 01:14:41 -0700 Subject: Fixing the save as paths Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index fc1f2c0f..ea4022b8 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -177,8 +177,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component, value: function(event) { var saveAsSettings = event._event.settings || {}; if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){ - saveAsSettings.fileName = this.activeDocument.name; - saveAsSettings.folderUri = this.activeDocument.uri.substring(0, this.activeDocument.uri.lastIndexOf("/")); + saveAsSettings.fileName = this.activeDocument.model.file.name; + saveAsSettings.folderUri = this.activeDocument.model.file.uri.substring(0, this.activeDocument.model.file.uri.lastIndexOf("/")); saveAsSettings.callback = this.saveAsCallback.bind(this); this.application.ninja.newFileController.showSaveAsDialog(saveAsSettings); } -- cgit v1.2.3 From 24d1873302b2fffc25d254e15e8aa36f59eedb88 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 18 May 2012 01:36:05 -0700 Subject: fixed a switch documents bug where the layout was getting called before setting the container. Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 4 +++- 1 file changed, 3 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 ea4022b8..f1523d87 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -492,6 +492,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component, currentDocument.model.views.design.hide(); } + this.application.ninja.stage.clearAllCanvas(); + if(didCreate) { newDocument.model.views.design.iframe.style.opacity = 1; NJevent("onOpenDocument", newDocument); @@ -499,7 +501,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.activeDocument = newDocument; newDocument.model.views.design.show(); newDocument.deserializeDocument(); - NJevent("switchDocument"); + NJevent("onSwitchDocument"); } } }, -- cgit v1.2.3 From d878aa470074d5698a316512b513949fa22073f2 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 18 May 2012 15:23:15 -0700 Subject: Fixing save logic Moved dirty marker clearing code to model. --- js/controllers/document-controller.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index f1523d87..cf618360 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -145,18 +145,19 @@ var DocumentController = exports.DocumentController = Montage.create(Component, value: function(event) { // if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){ - // - this.activeDocument.model.save(this.testCallback.bind(this)); //this.fileSaveResult.bind(this) + //Currently we don't need a callback handler + //this.activeDocument.model.save(this.saveExecuted.bind(this)); + this.activeDocument.model.save(); } else { - //Error: + //Error: cloud not available and/or no active document } } }, - testCallback: { + //////////////////////////////////////////////////////////////////// + // + saveExecuted: { value: function (value) { - console.log(value); - //TODO: Move this to the model.save() - this.activeDocument.model.needsSave = false; + //File saved, any callbacks or events should go here } }, //////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From fdfba499f0b84360b96096fa866a981e96e8756c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 18 May 2012 16:35:56 -0700 Subject: fixing the color chip for the document root Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index f1523d87..7721d32d 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -489,6 +489,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component, if(currentDocument) { currentDocument.serializeDocument(); + this.application.ninja.selectionController._selectionContainer = null; + currentDocument.model.views.design.propertiesPanel.clear(); currentDocument.model.views.design.hide(); } -- cgit v1.2.3 From 7a22f7b368ef549a5b30c58a0f3900685b764bdb Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Fri, 18 May 2012 16:56:16 -0700 Subject: integrated open code view document in new dom architecture Signed-off-by: Ananya Sen --- js/controllers/document-controller.js | 65 +++++++++++++---------------------- 1 file changed, 24 insertions(+), 41 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index cf46e73e..a795d652 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -13,7 +13,8 @@ var Montage = require("montage/core/core").Montage, TextDocument = require("js/document/text-document").TextDocument; // New Document Objects -var Document = require("js/document/document-html").HtmlDocument; +var Document_HTML = require("js/document/document-html").HtmlDocument; +var Document_Text = require("js/document/document-text").TextDocument; //////////////////////////////////////////////////////////////////////// // var DocumentController = exports.DocumentController = Montage.create(Component, { @@ -320,32 +321,30 @@ var DocumentController = exports.DocumentController = Montage.create(Component, //////////////////////////////////////////////////////////////////// openDocument: { - value: function(doc) { + value: function(file) { var template, dimensions; - if (doc.content.body.indexOf('Ninja-Banner Dimensions@@@') !== -1) { - dimensions = (doc.content.body.split('Ninja-Banner Dimensions@@@'))[1].split('-->')[0].split('x'); - dimensions = {width: parseInt(dimensions[0]), height: parseInt(dimensions[1])}; - template = {type: 'banner', size: dimensions}; - } + // TODO: HACKS to remove - this.documentHackReference = doc; + this.documentHackReference = file; document.getElementById("iframeContainer").style.overflow = "hidden"; // - switch (doc.extension) { + switch (file.extension) { case 'html': + + if (file.content.body.indexOf('Ninja-Banner Dimensions@@@') !== -1) { + dimensions = (file.content.body.split('Ninja-Banner Dimensions@@@'))[1].split('-->')[0].split('x'); + dimensions = {width: parseInt(dimensions[0]), height: parseInt(dimensions[1])}; + template = {type: 'banner', size: dimensions}; + } + //Open in designer view this._hackRootFlag = false; - Montage.create(Document).init(doc, this, this._onOpenDocument, 'design', template); + Montage.create(Document_HTML).init(file, this, this._onOpenDocument, 'design', template); break; default: - //Open in code view - var code = Montage.create(TextDocument, {"source": {value: doc.content}}), docuuid = Uuid.generate(), textArea; - textArea = this.application.ninja.stage.stageView.createTextAreaElement(docuuid); - code.initialize(doc, docuuid, textArea, textArea.parentNode); - //code.init(doc.name, doc.uri, doc.extension, null, docuuid); - code.textArea.value = doc.content; - this.application.ninja.stage.stageView.createTextView(code); - break; + //Open in code view + Montage.create(Document_Text).init(file, this, this._onOpenTextDocument, 'code'); + break; } } }, @@ -514,9 +513,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component, _onOpenTextDocument: { value: function(doc) { if(this.activeDocument) { + if(this.activeDocument.currentView === "design"){ this.activeDocument.saveAppState(); - this.activeDocument.container.parentNode.style["display"] = "none"; + this.activeDocument.parentContainer.style["display"] = "none"; this.application.ninja.stage.hideCanvas(true); this.application.ninja.stage.stageView.hideRulers(); } @@ -526,28 +526,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.application.ninja.stage._scrollFlag = false; // TODO HACK to prevent type error on Hide/Show Iframe this.activeDocument = doc; - - var type; - - switch(doc.documentType) { - case "css" : - type = "css"; - break; - case "js" : - type = "javascript"; - break; - } - - DocumentController._codeEditor.editor = CodeMirror.fromTextArea(doc.textArea, { - lineNumbers: true, - mode: type, - onCursorActivity: function() { - DocumentController._codeEditor.editor.setLineClass(DocumentController._codeEditor.hline, null); - DocumentController._codeEditor.hline = DocumentController._codeEditor.editor.setLineClass(DocumentController._codeEditor.editor.getCursor().line, "activeline"); - } - }); - DocumentController._codeEditor.hline = DocumentController._codeEditor.editor.setLineClass(0, "activeline"); - + //hide the iframe when switching to code view + document.getElementById("iframeContainer").style.display = "none"; + doc.model.views.code.showCodeViewBar(true); + this.application.ninja.codeEditorController.applySettings(); + doc.model.views.code.collapseAllPanels(); } }, -- cgit v1.2.3 From 6f5ffa17c72dd0aef7a02e3496154514750143c2 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Fri, 18 May 2012 18:38:09 -0700 Subject: save for code view documents in the new dom architecture Signed-off-by: Ananya Sen --- js/controllers/document-controller.js | 8 +++++++- 1 file changed, 7 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 86b1d057..814a30e1 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -356,7 +356,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component, console.log("URI is: ", uri); } }, - + + //todo: remove this funciton as it is not used textDocumentOpened: { value: function(doc) { @@ -413,6 +414,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.application.ninja.stage.hideCanvas(true); + if(this._documents.length === 0){ + document.getElementById("iframeContainer").style.display="block"; + document.getElementById("codeViewContainer").style.display="block"; + } + NJevent("closeDocument", doc.model.file.uri); //TODO: Delete object here -- cgit v1.2.3 From 2cc8e58f6bb9f64a7473e62aecd013fa55167231 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 21 May 2012 16:42:26 -0700 Subject: - added opening multiple code and design view documents - switching between multiple code and design view documents - Note: closing of documents, when multiple documents are open, is not yet implemented Signed-off-by: Ananya Sen --- js/controllers/document-controller.js | 105 +++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 41 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 814a30e1..26c3ebaa 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -52,10 +52,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component, if(!!this._activeDocument){ if(this._documents.indexOf(doc) === -1) this._documents.push(doc); this._activeDocument.isActive = true; - - if(!!this._activeDocument.editor){ - this._activeDocument.editor.focus(); - } } } }, @@ -312,10 +308,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.activeDocument.uri = fileUri; //save a new file //use the ioMediator.fileSaveAll when implemented - this.activeDocument._userDocument.name=filename; - this.activeDocument._userDocument.root=destination; - this.activeDocument._userDocument.uri=fileUri; - this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this)); + this.activeDocument.model.file.name=filename; + this.activeDocument.model.file.uri=fileUri; + this.activeDocument.model.save(); // } }, @@ -408,7 +403,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this._activeDocument = null; - this.application.ninja.stage.stageView.hideRulers(); + this.application.ninja.stage.hideRulers(); // document.getElementById("iframeContainer").style.display="block"; @@ -471,7 +466,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, // Show the rulers // TODO: Move this indo design view - this.application.ninja.stage.stageView.showRulers(); + this.application.ninja.stage.showRulers(); // Show the canvas this.application.ninja.stage.hideCanvas(false); @@ -489,53 +484,81 @@ var DocumentController = exports.DocumentController = Montage.create(Component, } }, + + _onOpenTextDocument: { + value: function(doc) { + var currentDocument=null; + if(this.activeDocument) { + // There is a document currently opened + currentDocument = this.activeDocument; + } + + this.application.ninja.stage._scrollFlag = false; // TODO HACK to prevent type error on Hide/Show Iframe + this.activeDocument = doc; + document.getElementById("iframeContainer").style.display = "none"; + this.application.ninja.codeEditorController.applySettings(); + this.switchDocuments(currentDocument, doc, true); + } + }, + switchDocuments: { value: function(currentDocument, newDocument, didCreate) { - if(currentDocument) { + if(currentDocument && currentDocument.currentView === "design") { currentDocument.serializeDocument(); - this.application.ninja.selectionController._selectionContainer = null; currentDocument.model.views.design.propertiesPanel.clear(); - currentDocument.model.views.design.hide(); } - this.application.ninja.stage.clearAllCanvas(); + if(currentDocument) { + currentDocument.model.currentView.hide(); + currentDocument.model.isActive = false; + } + if(currentDocument && newDocument && (currentDocument.model.parentContainer !== newDocument.model.parentContainer)){ + currentDocument.model.parentContainer.style["display"] = "none"; + } - if(didCreate) { - newDocument.model.views.design.iframe.style.opacity = 1; - NJevent("onOpenDocument", newDocument); - } else { - this.activeDocument = newDocument; - newDocument.model.views.design.show(); - newDocument.deserializeDocument(); - NJevent("onSwitchDocument"); + if(newDocument && 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(); + + newDocument.model.views.code.editor.focus(); + + }else if(currentDocument && newDocument && newDocument.currentView === "design"){ + this.application.ninja.stage.showCodeViewBar(false); + this.application.ninja.stage.restoreAllPanels(); + this.application.ninja.stage.hideCanvas(false); + this.application.ninja.stage.showRulers(); } - } - }, + this.application.ninja.stage.clearAllCanvas(); - _onOpenTextDocument: { - value: function(doc) { - if(this.activeDocument) { + if(didCreate) { + newDocument.model.currentView.show(); + newDocument.model.parentContainer.style["display"] = "block"; + if(newDocument.currentView === "design") { + newDocument.model.views.design.iframe.style.opacity = 1; + NJevent("onOpenDocument", newDocument); + } + } + else { + this.activeDocument = newDocument; - if(this.activeDocument.currentView === "design"){ - this.activeDocument.saveAppState(); - this.activeDocument.parentContainer.style["display"] = "none"; - this.application.ninja.stage.hideCanvas(true); - this.application.ninja.stage.stageView.hideRulers(); + newDocument.model.currentView.show(); + if(currentDocument && newDocument && (currentDocument.model.parentContainer !== newDocument.model.parentContainer)){ + newDocument.model.parentContainer.style["display"] = "block"; } - this.activeDocument.container.style["display"] = "none"; + if(newDocument.currentView === "design") { + newDocument.deserializeDocument(); + NJevent("onSwitchDocument"); + }else{ + newDocument.model.isActive = true; + this.application.ninja.codeEditorController.applySettings();//should be called after activeDocument is updated + } } - - this.application.ninja.stage._scrollFlag = false; // TODO HACK to prevent type error on Hide/Show Iframe - this.activeDocument = doc; - //hide the iframe when switching to code view - document.getElementById("iframeContainer").style.display = "none"; - doc.model.views.code.showCodeViewBar(true); - this.application.ninja.codeEditorController.applySettings(); - doc.model.views.code.collapseAllPanels(); } }, -- cgit v1.2.3 From 58df45d43614b5364aa84832c7c0aa06a9d086fc Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 21 May 2012 16:46:45 -0700 Subject: - fixed save as Signed-off-by: Ananya Sen --- js/controllers/document-controller.js | 1 - 1 file changed, 1 deletion(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 26c3ebaa..b4aff2f0 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -311,7 +311,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.activeDocument.model.file.name=filename; this.activeDocument.model.file.uri=fileUri; this.activeDocument.model.save(); - // } }, -- cgit v1.2.3 From 9b6da637d9654727426c6d78f17e3804bbd84ce5 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 22 May 2012 14:42:43 -0700 Subject: fixing a few document switching issues. Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 90 ++++++++++++++++------------------- 1 file changed, 42 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 b4aff2f0..d99fadbb 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -9,12 +9,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot var Montage = require("montage/core/core").Montage, Component = require("montage/ui/component").Component, Uuid = require("montage/core/uuid").Uuid, - HTMLDocument = require("js/document/html-document").HTMLDocument, - TextDocument = require("js/document/text-document").TextDocument; - - // New Document Objects -var Document_HTML = require("js/document/document-html").HtmlDocument; -var Document_Text = require("js/document/document-text").TextDocument; + HTMLDocument = require("js/document/document-html").HtmlDocument, + TextDocument = require("js/document/document-text").TextDocument; //////////////////////////////////////////////////////////////////////// // var DocumentController = exports.DocumentController = Montage.create(Component, { @@ -308,8 +304,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.activeDocument.uri = fileUri; //save a new file //use the ioMediator.fileSaveAll when implemented - this.activeDocument.model.file.name=filename; - this.activeDocument.model.file.uri=fileUri; + this.activeDocument.model.file.name = filename; + this.activeDocument.model.file.uri = fileUri; this.activeDocument.model.save(); } }, @@ -334,11 +330,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component, //Open in designer view this._hackRootFlag = false; - Montage.create(Document_HTML).init(file, this, this._onOpenDocument, 'design', template); + Montage.create(HTMLDocument).init(file, this, this._onOpenDocument, 'design', template); break; default: //Open in code view - Montage.create(Document_Text).init(file, this, this._onOpenTextDocument, 'code'); + Montage.create(TextDocument).init(file, this, this._onOpenTextDocument, 'code'); break; } } @@ -404,17 +400,16 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.application.ninja.stage.hideRulers(); -// document.getElementById("iframeContainer").style.display="block"; - this.application.ninja.stage.hideCanvas(true); + //TODO: Use references for those instead of calling getElementById if(this._documents.length === 0){ document.getElementById("iframeContainer").style.display="block"; document.getElementById("codeViewContainer").style.display="block"; } - NJevent("closeDocument", doc.model.file.uri); + //TODO: Delete object here } }, @@ -458,8 +453,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component, if(this.activeDocument) { // There is a document currently opened currentDocument = this.activeDocument; - - //this.application.ninja.stage.stageView.restoreAllPanels(); } else { // There is no document opened @@ -486,16 +479,17 @@ var DocumentController = exports.DocumentController = Montage.create(Component, _onOpenTextDocument: { value: function(doc) { - var currentDocument=null; + var currentDocument = null; if(this.activeDocument) { // There is a document currently opened currentDocument = this.activeDocument; } - this.application.ninja.stage._scrollFlag = false; // TODO HACK to prevent type error on Hide/Show Iframe - this.activeDocument = doc; + this.application.ninja.currentDocument = this.activeDocument = doc; + document.getElementById("iframeContainer").style.display = "none"; this.application.ninja.codeEditorController.applySettings(); + this.switchDocuments(currentDocument, doc, true); } }, @@ -503,57 +497,57 @@ var DocumentController = exports.DocumentController = Montage.create(Component, switchDocuments: { value: function(currentDocument, newDocument, didCreate) { - if(currentDocument && currentDocument.currentView === "design") { - currentDocument.serializeDocument(); - this.application.ninja.selectionController._selectionContainer = null; - currentDocument.model.views.design.propertiesPanel.clear(); - } - if(currentDocument) { - currentDocument.model.currentView.hide(); + if(currentDocument.currentView === "design") { + currentDocument.serializeDocument(); + this.application.ninja.selectionController._selectionContainer = null; + currentDocument.model.views.design.propertiesPanel.clear(); + } + currentDocument.model.isActive = false; - } - if(currentDocument && newDocument && (currentDocument.model.parentContainer !== newDocument.model.parentContainer)){ - currentDocument.model.parentContainer.style["display"] = "none"; - } - if(newDocument && 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(); + currentDocument.model.currentView.hide(); - newDocument.model.views.code.editor.focus(); + if(currentDocument.model.parentContainer !== newDocument.model.parentContainer) { + currentDocument.model.parentContainer.style["display"] = "none"; + newDocument.model.parentContainer.style["display"] = "block"; + } - }else if(currentDocument && newDocument && newDocument.currentView === "design"){ - this.application.ninja.stage.showCodeViewBar(false); - this.application.ninja.stage.restoreAllPanels(); - this.application.ninja.stage.hideCanvas(false); - this.application.ninja.stage.showRulers(); + if(currentDocument.currentView === "code" && newDocument.currentView === "design") { + this.application.ninja.stage.showCodeViewBar(false); + 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(); + } } this.application.ninja.stage.clearAllCanvas(); if(didCreate) { newDocument.model.currentView.show(); - newDocument.model.parentContainer.style["display"] = "block"; + if(newDocument.currentView === "design") { - newDocument.model.views.design.iframe.style.opacity = 1; NJevent("onOpenDocument", newDocument); + } else { + newDocument.model.parentContainer.style["display"] = "block"; } - } - else { + } else { this.activeDocument = newDocument; newDocument.model.currentView.show(); - if(currentDocument && newDocument && (currentDocument.model.parentContainer !== newDocument.model.parentContainer)){ - newDocument.model.parentContainer.style["display"] = "block"; - } if(newDocument.currentView === "design") { newDocument.deserializeDocument(); NJevent("onSwitchDocument"); - }else{ + } else { + this.application.ninja.currentDocument = newDocument; + newDocument.model.views.code.editor.focus(); + newDocument.model.isActive = true; this.application.ninja.codeEditorController.applySettings();//should be called after activeDocument is updated } -- cgit v1.2.3 From 2b207ef8b2594927f8cd6cd63a8483d205cb86c4 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 22 May 2012 15:41:51 -0700 Subject: fixing the selection in multiple documents and some code cleanup Signed-off-by: Valerio Virgillito --- 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 d99fadbb..7758f346 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -500,7 +500,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, if(currentDocument) { if(currentDocument.currentView === "design") { currentDocument.serializeDocument(); - this.application.ninja.selectionController._selectionContainer = null; + this.application.ninja._currentSelectedContainer = this.application.ninja.selectionController._selectionContainer = null; currentDocument.model.views.design.propertiesPanel.clear(); } -- cgit v1.2.3 From ee54342b5f4fdd41c46543d6402e649e4b3d57cb Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Tue, 22 May 2012 17:58:23 -0700 Subject: - don't redraw stage for code document - fixes a switching bug - fix for ctrl+S for code document - disallow opening the panels while in code document Signed-off-by: Ananya Sen --- js/controllers/document-controller.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index d99fadbb..91f4753d 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -524,6 +524,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component, this.application.ninja.stage.hideCanvas(true); this.application.ninja.stage.hideRulers(); } + }else if(!currentDocument && 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(); } this.application.ninja.stage.clearAllCanvas(); -- cgit v1.2.3 From 108764dbdaa0c040de9146c2d722b6e53830cd54 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 23 May 2012 13:27:14 -0700 Subject: improve the closing of documents. Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'js/controllers/document-controller.js') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index 7758f346..dadfaf05 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -393,14 +393,20 @@ var DocumentController = exports.DocumentController = Montage.create(Component, onCloseFile: { value: function(doc) { + var previousFocusedDocument; - this._documents.splice(this._documents.indexOf(doc), 1); + this._documents.splice(this._documents.indexOf(doc), 1); - this._activeDocument = null; - - this.application.ninja.stage.hideRulers(); + if(this._documents.length > 0) { + previousFocusedDocument = this._documents[this._documents.length - 1]; + this._activeDocument = previousFocusedDocument; + this.switchDocuments(this.activeDocument, previousFocusedDocument, true); + } else { + this._activeDocument = null; + this.application.ninja.stage.hideRulers(); - this.application.ninja.stage.hideCanvas(true); + this.application.ninja.stage.hideCanvas(true); + } //TODO: Use references for those instead of calling getElementById if(this._documents.length === 0){ -- cgit v1.2.3