From 632a5daca17acb774b9344ccc0e9107f1643924c Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 10 Feb 2012 15:29:12 -0800
Subject: File Open

Adding the functionality to open a basic file.
---
 js/io/document/document-controller.js  | 452 ---------------------------------
 js/io/document/html-document.js        |  84 +++---
 js/io/ui/cloudpopup.reel/cloudpopup.js |   3 +
 3 files changed, 49 insertions(+), 490 deletions(-)
 delete mode 100755 js/io/document/document-controller.js

(limited to 'js/io')

diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js
deleted file mode 100755
index c2a2dab6..00000000
--- a/js/io/document/document-controller.js
+++ /dev/null
@@ -1,452 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-/**
-@module js/document/documentManager
-@requires montage/core/core
-@requires montage/ui/component
-@requires js/document/html-document
-@requires js/document/text-document
-*/
-
-var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component,
-    Uuid = require("montage/core/uuid").Uuid,
-    HTMLDocument = require("js/io/document/html-document").HTMLDocument,
-    TextDocument = require("js/io/document/text-document").TextDocument;
-
-var DocumentController = exports.DocumentController = Montage.create(Component, {
-    hasTemplate: {
-        value: false
-    },
-
-    _documents: {
-        value: []
-    },
-
-    _activeDocument: { value: null },
-    _iframeCounter: { value: 1, enumerable: false },
-    _iframeHolder: { value: null, enumerable: false },
-    _textHolder: { value: null, enumerable: false },
-    _codeMirrorCounter: {value: 1, enumerable: false},
-
-    tmpSourceForTesting: {
-        value: "function CodeMirror(place, givenOptions) {" +
-                "// Determine effective options based on given values and defaults." +
-                "var options = {}, defaults = CodeMirror.defaults; }"
-            },
-
-    activeDocument: {
-        get: function() {
-            return this._activeDocument;
-        },
-        set: function(doc) {
-            if(this._activeDocument)  this._activeDocument.isActive = false;
-                
-            if(this._documents.indexOf(doc) === -1) this._documents.push(doc);
-
-            this._activeDocument = doc;
-            this._activeDocument.isActive = true;
-
-            if(!!this._activeDocument.editor){
-                this._activeDocument.editor.focus();
-            }
-
-        }
-    },
-
-    deserializedFromTemplate: {
-        value: function() {
-            this.eventManager.addEventListener("appLoaded", this, false);
-            this.eventManager.addEventListener("executeFileOpen", this, false);
-            this.eventManager.addEventListener("executeNewFile", this, false);
-            this.eventManager.addEventListener("executeSave", this, false);
-
-            this.eventManager.addEventListener("recordStyleChanged", this, false);
-
-			// Temporary testing opening a new file after Ninja has loaded
-			this.eventManager.addEventListener("executeNewProject", this, false);
-        }
-    },
-
-    handleAppLoaded: {
-        value: function() {
-            //this.openDocument({"type": "html"});
-        }
-    },
-	
-	handleExecuteNewProject: {
-        value: function() {
-            this.openDocument({"type": "html"});
-        }
-    },
-
-    handleExecuteFileOpen: {
-        value: function(event) {
-            var pickerSettings = event._event.settings || {};
-            pickerSettings.callback = this.openFileWithURI.bind(this);
-            pickerSettings.pickerMode = "read";
-            pickerSettings.inFileMode = true;
-            this.application.ninja.filePickerController.showFilePicker(pickerSettings);
-        }
-    },
-
-    handleExecuteNewFile: {
-            value: function(event) {
-                var newFileSettings = event._event.settings || {};
-                newFileSettings.callback = this.createNewFile.bind(this);
-                this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
-            }
-    },
-
-    handleExecuteSave: {
-            value: function(event) {
-                this.activeDocument.save();
-            }
-    },
-
-    createNewFile:{
-        value:function(newFileObj){
-            //console.log(newFileObj);//contains the template uri and the new file uri
-            if(!newFileObj) return;
-            this.application.ninja.ioMediator.fileNew(newFileObj.newFilePath, newFileObj.fileTemplateUri, this.openNewFileCallback.bind(this));
-
-            if((newFileObj.fileExtension !== ".html") && (newFileObj.fileExtension !== ".htm")){//open code view
-
-                } else {
-                //open design view
-                }
-        }
-    },
-
-    /**
-     * Public method
-     * doc contains:
-     *      type : file type, like js, css, etc
-     *      name : file name
-     *      source : file content
-     *      uri : file uri
-     */
-    openNewFileCallback:{
-        value:function(doc){
-            var response = doc || null;//default just for testing
-            if(!!response && response.success && !!response.uri){
-                this.application.ninja.ioMediator.fileOpen(response.uri, this.openFileCallback.bind(this));
-            }
-        }
-    },
-
-    openFileWithURI: {
-        value: function(uriArrayObj) {
-            var uri = "", fileContent = "", response=null, filename="", fileType="js";
-            if(!!uriArrayObj && !!uriArrayObj.uri && (uriArrayObj.uri.length > 0)){
-                uri = uriArrayObj.uri[0];
-            }
-            //console.log("URI is: ", uri);
-            if(!!uri){
-                this.application.ninja.ioMediator.fileOpen(uri, this.openFileCallback.bind(this));
-            }
-        }
-    },
-
-    /**
-     * Public method
-     */
-    openFileCallback:{
-        value:function(response){
-            //Return Object Description
-//            Object.status (Always presents for handling)
-//            204: File exists (Success)
-//            404: File does not exists (Failure)
-//            500: Unknown (Probably cloud API not running)
-//
-//            (Below only present if succesfull 204)
-//
-//            Object.content
-//            Object.extension
-//            Object.name
-//            Object.uri
-//            Object.creationDate
-//            Object.modifiedDate
-//            Object.readOnly
-//            Object.size
-
-            var fileDetails = {};
-            if(!!response && (response.status === 204)){
-                /**
-                 * fileDetails format:
-                 * {"type": "js", "name": "test", "source": fileContent, "uri": uri}
-                 */
-                fileDetails.type = response.extension;
-                fileDetails.source = response.content;
-                fileDetails.name = response.name;
-                fileDetails.uri = response.uri;
-
-                this.openDocument(fileDetails);
-            }else if(!!response && (response.status === 404)){
-                alert("Unable to open file.\n [Error: File does not exist]");
-            }else if(!!response && (response.status === 500)){
-                alert("Unable to open file.\n Check if Ninja Local Cloud is running.");
-            }else{
-                alert("Unable to open file.");
-            }
-
-        }
-    },
-
-    openProjectWithURI: {
-        value: function(uri) {
-            console.log("URI is: ", uri);
-
-        }
-    },
-
-    /** Open a Document **/
-    openDocument: {
-        value: function(doc) {
-            var newDoc;
-
-            if(!doc) return false;
-
-           // try {
-                if (doc.type === 'html' || doc.type === 'htm') {
-                    newDoc = Montage.create(HTMLDocument);
-                    newDoc.initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument);
-                } else {
-                    newDoc = Montage.create(TextDocument, {
-                        "source": { value: doc.source }
-                    });
-                    var docUuid = Uuid.generate();
-                    var textArea = this.application.ninja.stage.stageView.createTextAreaElement(docUuid);
-                    newDoc.initialize(doc, docUuid, textArea, textArea.parentNode);
-
-                    // Tmp this will be filled with the real content
-                    newDoc.textArea.value = doc.source; //this.tmpSourceForTesting;
-
-                    this.textDocumentOpened(newDoc);
-
-            }
-
-           // } catch (err) {
-           //     console.log("Could not open Document ",  err);
-           // }
-        }
-    },
-
-    textDocumentOpened: {
-       value: function(doc) {
-
-
-
-           this.application.ninja.stage.stageView.createTextView(doc);
-
-           /*
-           DocumentManager._hideCurrentDocument();
-           stageManagerModule.stageManager._scrollFlag = false;    // TODO HACK to prevent type error on Hide/Show Iframe
-           DocumentManager.activeDocument = doc;
-
-           var type;
-
-           switch(doc.documentType) {
-               case  "css" :
-                   type = "css";
-                   break;
-               case "js" :
-                   type = "javascript";
-                   break;
-           }
-
-           DocumentManager._codeEditor.editor = CodeMirror.fromTextArea(doc.textArea, {
-                            lineNumbers: true,
-                       mode: type,
-                            onCursorActivity: function() {
-                                DocumentManager._codeEditor.editor.setLineClass(DocumentManager._codeEditor.hline, null);
-                                DocumentManager._codeEditor.hline = DocumentManager._codeEditor.editor.setLineClass(DocumentManager._codeEditor.editor.getCursor().line, "activeline");
-                            }
-                });
-           DocumentManager._codeEditor.hline = DocumentManager._codeEditor.editor.setLineClass(0, "activeline");
-           */
-
-            }
-   },
-
-    closeDocument: {
-        value: function(id) {
-            if(this.activeDocument.dirtyFlag === true){
-                //if file dirty then alert user to save
-        }
-
-            var doc = this._findDocumentByUUID(id);
-            this._removeDocumentView(doc.container);
-
-            var closeDocumentIndex = this._findIndexByUUID(id);
-            this._documents.splice(this._findIndexByUUID(id), 1);
-
-            if(this.activeDocument.uuid === id && this._documents.length > 0) {
-                var nextDocumentIndex = -1 ;
-                if((this._documents.length > 0) && (closeDocumentIndex === 0)){
-                    nextDocumentIndex = 1;
-                }else if((this._documents.length > 0) && (closeDocumentIndex > 0)){
-                    nextDocumentIndex = closeDocumentIndex - 1;
-                }
-                this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
-            }
-        }
-    },
-
-    // Document has been loaded into the Iframe. Dispatch the event.
-    // Event Detail: Contains the current ActiveDocument
-    _onOpenDocument: {
-        value: function(doc){
-            //var data = DocumentManager.activeDocument;
-            //DocumentManager._hideCurrentDocument();
-
-            //stageManagerModule.stageManager.toggleCanvas();
-
-            DocumentController.activeDocument = doc;
-
-            NJevent("onOpenDocument", doc);
-//            appDelegateModule.MyAppDelegate.onSetActiveDocument();
-
-        }
-    },
-
-
-    _onOpenTextDocument: {
-        value: function(doc) {
-            this._hideCurrentDocument();
-            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");
-
-        }
-    },
-
-    /**
-     * VIEW Related Methods
-     */
-    // PUBLIC
-    ShowActiveDocument: {
-        value: function() {
-            this.activeDocument.iframe.style.opacity = 1.0;
-        }
-    },
-
-    // PRIVATE
-    _findDocumentByUUID: {
-        value: function(uuid) {
-            var len =  this._documents.length;
-            for(var i = 0; i < len; i++) {
-                if(this._documents[i].uuid === uuid) return this._documents[i];
-            }
-
-            return false;
-        }
-    },
-
-    _findIndexByUUID: {
-        value: function(uuid) {
-            var len =  this._documents.length;
-            for(var i = 0; i < len; i++) {
-                if(this._documents[i].uuid === uuid) return i;
-            }
-
-            return false;
-        }
-    },
-
-    _hideCurrentDocument: {
-        value: function() {
-            if(this.activeDocument) {
-                if(this.activeDocument.currentView === "design"){
-                    this.application.ninja.stage.saveScroll();
-                    this.activeDocument.container.parentNode.style["display"] = "none";
-                    this.application.ninja.stage.hideCanvas(true);
-                    this.application.ninja.stage.stageView.hideRulers();
-                }
-
-                this.activeDocument.container.style["display"] = "none";
-            }
-        }
-    },
-
-    _showCurrentDocument: {
-        value: function() {
-            if(this.activeDocument) {
-                this.activeDocument.container.style["display"] = "block";
-                if(this.activeDocument.currentView === "design"){
-                    this.activeDocument.container.parentNode.style["display"] = "block";
-                    this.application.ninja.stage.restoreScroll();
-                    this.application.ninja.stage.hideCanvas(false);
-                    this.application.ninja.stage.stageView.showRulers();
-                }else{
-                    //hide the iframe when switching to code view
-                    document.getElementById("iframeContainer").style.display="none";
-                }
-        }
-        }
-    },
-
-    _removeDocumentView: {
-        value: function(node) {
-            node.parentNode.removeChild(node);
-        }
-    },
-
-    reloadDocumentContent: {
-        value: function() {
-            this.activeDocument._window.location.reload();
-        }
-    },
-
-    /**
-     * Creates a new iFrame element using a new unique ID for it. Returns the iframe ID.
-     */
-    _createIframeElement: {
-        value: function() {
-            var e = document.createElement("iframe");
-            e.id = this._createIframeID();
-            e.style.border = "none";
-            e.style.opacity = 0;
-            e.height = 1000;
-            e.width = 2000;
-            e.src = "";
-
-            if(!this._iframeHolder) this._iframeHolder = document.getElementById("iframeContainer");
-            
-            this._iframeHolder.appendChild(e);
-
-            return e;
-        }
-    },
-
-
-    _createIframeID: {
-        value: function() {
-            return "userDocument_" + (this._iframeCounter++);
-        }
-        }
-});
diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index d51cd279..fbb34a1d 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -11,7 +11,7 @@ var Montage = require("montage/core/core").Montage,
 var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.BaseDocument, {
     // PRIVATE MEMBERS
     _selectionExclude: { value: null, enumerable: false },
-    _cloudTemplateUri: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
+    _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
     _iframe: { value: null, enumerable: false },
     _server: { value: null, enumerable: false },
     _selectionModel: { value: [], enumerable: false },
@@ -24,7 +24,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
     _styles: { value: null, enumerable: false },
     _stylesheets: { value: null, enumerable: false },
     _stageStyleSheetId : { value: 'nj-stage-stylesheet', enumerable: false },
-    _initialUserDocument: { value: null, enumerable: false },
+    _userDocument: { value: null, enumerable: false },
     _htmlSource: {value: "<html></html>", enumerable: false},
     _glData: {value: null, enumerable: false },
 
@@ -218,30 +218,27 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 
     //****************************************//
     // PUBLIC METHODS
-    initialize: {
-        value: function(doc, uuid, iframe, callback) {
-            // Shell mode is not used anymore
-            //if(!window.IsInShellMode()) {
-                if(!doc.name){doc.name = "index-cloud"};
-                if(!doc.uri){doc.uri = this._cloudTemplateUri};
-                this.init(doc.name, doc.uri, doc.type, iframe, uuid, callback);
-            /*
-            } else {
-                var tmpurl = doc.uri.split('\\');
-                var fileUrl =  doc.server.url + "/" + tmpurl[tmpurl.length -1] + "?fileio=true&template=/user-document-templates/montage-application/index.html";
-                this.init(name, fileUrl, doc.type, iframe, uuid, callback);
-                this.server = doc.server;
-                this._initialUserDocument = doc;
-            }
-            */
-            this.iframe = iframe;
-            this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"];
-            this.currentView = "design";
-
-            this._loadDocument(this.uri);
-
+    
+    
+    ////////////////////////////////////////////////////////////////////
+	//
+	initialize: {
+		value: function(file, uuid, iframe, callback) {
+			//
+			this._userDocument = file;
+			//
+			this.init(file.name, file.uri, file.extension, iframe, uuid, callback);
+			//
+			this.iframe = iframe;
+			this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"];
+			this.currentView = "design";
+			//
+			this.iframe.src = this._htmlTemplateUrl;
+            this.iframe.addEventListener("load", this, true);
         }
     },
+    ////////////////////////////////////////////////////////////////////
+
 
 	collectGLData: {
 		value: function( elt,  dataArray )
@@ -345,7 +342,8 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
         }
     },
 
-    // Private
+    /*
+// Private
     _loadDocument: {
         value: function(uri) {
             // Load the document into the Iframe
@@ -353,23 +351,32 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
             this.iframe.addEventListener("load", this, true);
         }
     },
-
+*/
+	
+	
+	
+	////////////////////////////////////////////////////////////////////
+	//
     handleEvent: {
         value: function(event){
-            this.documentRoot = this.iframe.contentWindow.document.getElementById("UserContent");
+        	//
+        	this.documentRoot = this.iframe.contentWindow.document.getElementById("UserContent");
             this.stageBG = this.iframe.contentWindow.document.getElementById("stageBG");
             this.stageBG.onclick = null;
             this._document = this.iframe.contentWindow.document;
             this._window = this.iframe.contentWindow;
-            if(!this.documentRoot.Ninja)
-            {
-                this.documentRoot.Ninja = {};
-            }
-
-            if(this._initialUserDocument) {
-                // Now load the user content
-                this.documentRoot.innerHTML = this._initialUserDocument.body;
-                this.iframe.contentWindow.document.getElementById("userHead").innerHTML = this._initialUserDocument.head;
+            //
+            if(!this.documentRoot.Ninja) this.documentRoot.Ninja = {};
+            //
+            
+            this.documentRoot.innerHTML = this._userDocument.content.body;
+            this.iframe.contentWindow.document.getElementById("userHead").innerHTML = this._userDocument.content.head;
+            
+          
+            
+            	
+            	
+            
 
                 this.cssLoadInterval = setInterval(function() {
                     if(this._document.styleSheets.length > 1) {
@@ -383,7 +390,8 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
                 
                 // TODO - Not sure where this goes
                 this._userComponentSet = {};
-            } else {
+
+            
                 this._styles = this._document.styleSheets[this._document.styleSheets.length - 1];
                 this._stylesheets = this._document.styleSheets; // Entire stlyesheets array
 
@@ -429,7 +437,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
                 }
 
                 this.callback(this);
-            }
+            
         }
     },
 
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index 1344661b..e5bad98e 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -51,6 +51,9 @@ exports.CloudPopup = Montage.create(Component, {
     			this._os = 'windows';
     		} else if (navigator.appVersion.indexOf("Mac")!=-1) {
     			this._os = 'mac';
+    		} else {
+    			//Alternate message for no OS detected (probably Linux)
+    			this.element.getElementsByTagName('section')[0].style.display = 'none';
     		}
     	}
     },
-- 
cgit v1.2.3


From b1fc4f84d92efeaa33ec239b662235c9e8218d0c Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sun, 12 Feb 2012 16:50:33 -0800
Subject: File Save (HTML only)

Added the ability to save an HTML file from design view, need to add CSS detection and saving (of styles in <style> only). Also need to add 'Save All' for all file attached to the HTML file.
---
 js/io/document/html-document.js | 24 ++++++++++++++++++++++--
 js/io/system/coreioapi.js       |  2 +-
 js/io/system/fileio.js          | 28 +++++++++++++++++++++++++++-
 3 files changed, 50 insertions(+), 4 deletions(-)

(limited to 'js/io')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index fbb34a1d..2ece76c5 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -14,6 +14,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
     _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
     _iframe: { value: null, enumerable: false },
     _server: { value: null, enumerable: false },
+    _templateDocument: { value: null, enumerable: false },
     _selectionModel: { value: [], enumerable: false },
     _undoModel: { value: { "queue" : [], "position" : 0 }, enumerable: false},
 
@@ -359,6 +360,10 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 	//
     handleEvent: {
         value: function(event){
+        	//TODO: Clean up, using for prototyping save
+        	this._templateDocument = {};
+        	this._templateDocument.head = this.iframe.contentWindow.document.getElementById("userHead");;
+        	this._templateDocument.body = this.iframe.contentWindow.document.getElementById("UserContent");;
         	//
         	this.documentRoot = this.iframe.contentWindow.document.getElementById("UserContent");
             this.stageBG = this.iframe.contentWindow.document.getElementById("stageBG");
@@ -373,7 +378,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
             this.iframe.contentWindow.document.getElementById("userHead").innerHTML = this._userDocument.content.head;
             
           
-            
+            //TODO: Look at code below and clean up
             	
             	
             
@@ -461,7 +466,21 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
      * public method
      *
      */
-    save:{
+	////////////////////////////////////////////////////////////////////
+	//
+	save: {
+		enumerable: false,
+    	value: function () {
+    		//TODO: Add code view logic
+    		return {mode: 'html', document: this._userDocument, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    	}
+	}
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	
+	
+    /*
+save:{
         value:function(){
             try{
                 if(this.currentView === "design"){
@@ -477,5 +496,6 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
             }
         }
     }
+*/
 
 });
\ No newline at end of file
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index b19f1e70..614b0850 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -450,7 +450,7 @@ window.hack = function (name, type) {
     	enumerable: false,
     	value: function(file) {
             var retValue = { success:null, status:null };
-            if(file && file.uri && file.uri.length && file.contents && file.contents.length) {
+            if(file && file.uri && file.uri.length && file.contents) {
                 try {
                     var serviceURL = this._prepareServiceURL(this.fileServiceURL, file.uri),
                     	xhr = new XMLHttpRequest();
diff --git a/js/io/system/fileio.js b/js/io/system/fileio.js
index 045fa2fd..f363ef9f 100755
--- a/js/io/system/fileio.js
+++ b/js/io/system/fileio.js
@@ -104,13 +104,39 @@ exports.FileIo = Montage.create(Component, {
     //
     saveFile: {
     	enumerable: true,
-    	value: function() {
+    	value: function(file) {
     		//Checking for API to be available
     		if (!this.application.ninja.coreIoApi.cloudAvailable()) {
     			//API not available, no IO action taken
     			return null;
     		}
+    		//Peforming check for file to exist
+    		var check = this.application.ninja.coreIoApi.fileExists({uri: file.uri}), status, result;
+    		//Upon successful check, handling results
+    		if (check.success) {
+    			//Handling status of check
+    			switch (check.status) {
+    				case 204:
+    					//File exists
+    					result = this.application.ninja.coreIoApi.updateFile(file);
+    					status = 204;
+    					break;
+    				case 404://createFile
+    					//File does not exists, ready to be created
+    					result = this.application.ninja.coreIoApi.createFile(file);
+    					status = 404;
+    					break;
+    				default:
+    					//Unknown Error
+    					status = 500;
+    					break;
+    			}
+	   		} else {
+	    		//Unknown Error
+	    		status = 500;
+    		}
     		//
+    		return {status: status, result: result};
     	}
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 1b84b4549934578caaad38ef14b34cba35e2622a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sun, 12 Feb 2012 21:03:39 -0800
Subject: File Save (with CSS styles)

Temp fix for saving styles in <style> of HTML document.
---
 js/io/document/html-document.js |   5 +-
 js/io/system/fileio.js          | 266 +++-------------------------------------
 2 files changed, 23 insertions(+), 248 deletions(-)

(limited to 'js/io')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index 2ece76c5..99bf4576 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -471,8 +471,9 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 	save: {
 		enumerable: false,
     	value: function () {
-    		//TODO: Add code view logic
-    		return {mode: 'html', document: this._userDocument, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    		//console.log(this._styles, this._stylesheets);
+    		//TODO: Add code view logic and also styles for HTML
+    		return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
     	}
 	}
 	////////////////////////////////////////////////////////////////////
diff --git a/js/io/system/fileio.js b/js/io/system/fileio.js
index f363ef9f..f78ad173 100755
--- a/js/io/system/fileio.js
+++ b/js/io/system/fileio.js
@@ -23,7 +23,7 @@ var Montage = 	require("montage/core/core").Montage,
 //Exporting as File I/O
 exports.FileIo = Montage.create(Component, {
 	////////////////////////////////////////////////////////////////////
-    //newFile Object (*required): {uri*, contents, contentType}
+    //Creating new file
     newFile: {
     	enumerable: true,
     	value: function(file) {
@@ -49,19 +49,21 @@ exports.FileIo = Montage.create(Component, {
     					break;
     				default:
     					//Unknown Error
+    					status = 500;
     					break;
     			}
 	   		} else {
 	    		//Unknown Error
+	    		status = 500;
     		}
     		//Returning resulting code
     		return status;
-		    //	204: File exists | 400: File exists | 404: File does not exists
-		    //	201: File succesfully created | 500: Unknown | undefined: Unknown
+		    //	204: File exists (not created) | 400: File exists | 404: File does not exists
+		    //	201: File succesfully created | 500: Unknown
     	}
     },
     ////////////////////////////////////////////////////////////////////
-    //
+    //Reading contents from file
     readFile: {
     	enumerable: true,
     	value: function(file) {
@@ -84,7 +86,7 @@ exports.FileIo = Montage.create(Component, {
     					status = check.status;
     					break;
     				case 404:
-    					//File does not exists, ready to be created
+    					//File does not exists
     					status = check.status;
     					break;
     				default:
@@ -96,12 +98,14 @@ exports.FileIo = Montage.create(Component, {
 	    		//Unknown Error
 	    		status = 500;
     		}
-    		//Returning resulting code
+    		//Returning status and result (null if none)
     		return {status: status, file: result};
+    		//Status Codes
+    		//	204: File exists | 404: File does not exists | 500: Unknown
     	}
     },
     ////////////////////////////////////////////////////////////////////
-    //
+    //Saving file (existing file or creates and saves if none exists)
     saveFile: {
     	enumerable: true,
     	value: function(file) {
@@ -121,7 +125,7 @@ exports.FileIo = Montage.create(Component, {
     					result = this.application.ninja.coreIoApi.updateFile(file);
     					status = 204;
     					break;
-    				case 404://createFile
+    				case 404:
     					//File does not exists, ready to be created
     					result = this.application.ninja.coreIoApi.createFile(file);
     					status = 404;
@@ -135,8 +139,10 @@ exports.FileIo = Montage.create(Component, {
 	    		//Unknown Error
 	    		status = 500;
     		}
-    		//
+    		//Returning status and result (null if none)
     		return {status: status, result: result};
+    		//Status Codes
+    		//	204: File exists | 404: File does not exists | 500: Unknown
     	}
     },
     ////////////////////////////////////////////////////////////////////
@@ -187,19 +193,20 @@ exports.FileIo = Montage.create(Component, {
     					details.uri = file.uri;
     					details.name = this.getFileNameFromPath(file.uri);
     					details.extension = details.name.split('.')[details.name.split('.').length-1];
+    					details.status = 204;
     					break;
     				case 404:
     					//File does not exists, ready to be created
-    					
+    					details = {status: 404, uri: file.uri, name: this.getFileNameFromPath(file.uri)};
     					break;
     				default:
     					//Unknown Error
-    					
+    					details = {status: 500, uri: file.uri, name: this.getFileNameFromPath(file.uri)};
     					break;
     			}
 	   		} else {
 	    		//Unknown Error
-	    		
+	    		details = {status: 500, uri: file.uri, name: this.getFileNameFromPath(file.uri)};
     		}
     		return details;
     	}
@@ -214,240 +221,7 @@ exports.FileIo = Montage.create(Component, {
         }
     }
     ////////////////////////////////////////////////////////////////////
-    ////////////////////////////////////////////////////////////////////
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    /*
-open: {
-    	enumerable: true,
-    	value: function(doc, type, uri, server) {
-    		//
-    		var file = {}, head, body, h, b;
-    		file.uri = uri;
-    		file.server = server;
-    		//
-    		if (doc.content) {
-    			if (type === 'html' || type === 'htm') {
-    				//
-    				h = doc.content.split('</head>');
-    				h = h[0].split('<head>');
-    				head = h[1];
-    				//
-    				b = doc.content.split('</body>');
-    				b = b[0].split('<body>');
-    				body = b[1];
-    				//
-    				file.type = 'html';
-    				file.head = head;
-    				file.body = body;
-    			} else {
-    				//TODO: Add other file type routines
-    				file.type = type;
-    				file.content = doc.content;
-    			}		
-    		} else {
-   				//TODO: File is empty
-   				if (type === 'html' || type === 'htm') {
-   					head = '';
-   					body = '';
-   					//
-   					file.type = 'html';
-    				file.head = head;
-    				file.body = body;
-   				} else {
-   					//TODO: Add other file type routines
-    				file.type = type;
-    				file.content = doc.content;
-   				}
-   			}
-   			//TODO: Load contents into App
-            //documentManagerModule.DocumentManager.openDocument(file);
-    	}
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    save: {
-    	enumerable: true,
-    	value: function(type, id, components) {
-    		
-    		
-    		
-    		//
-    		var contents, counter = 0;
-    		//Checking for document type to go through saving routine
-    		switch (type.toLowerCase()) {
-    			case 'html':
-    				//Checking for components in components panel
-    				if (components) {
-    					var comps = '', comp, html, mbind, hackParams = '', compSerializer = Serializer.create();
-    					//TODO: Check if this is needed since compSerializer was localized
-						compSerializer._serializedObjects = [];
-						//
-    					html = document.getElementById(id).contentDocument.getElementById('UserContent').innerHTML;
-    					//
-    					for(var i in components){
-    						//
-    						comp = compSerializer.serializeObject(components[i]);
-    						//TODO: Remove this HACK
-    						if (components[i]._montage_metadata.__proto__.objectName == 'PhotoEditor') {
-    							if (components[i].pathToJSON) {
-    								hackParams = '"pathToJSON": "'+components[i].pathToJSON+'",\n';
-    							}
-    						} else {
-    							
-    						}
-    						var split = comp.split('"element":U("m-obj://undefined/'+components[i]._element.uuid);
-    						comp = split[0]+hackParams+'\t"element":E("#'+components[i]._element.id+split[1];
-    						if (document.getElementById(id).contentDocument.getElementById(components[i]._originalElementId).innerHTML.length > 2) {
-    							split = html.split(document.getElementById(id).contentDocument.getElementById(components[i]._originalElementId).innerHTML);
-    							html = split[0]+split[1];
-    						}
-    						//
-    						if (counter > 0) {
-    							comps += ',\n'+comp;
-    						} else {
-    							comps += comp;
-    						}
-    						counter++;
-    	       			}
-            	
-            			for(var i in components){
-            				//
-            				if (components[i]._bindingDescriptors){
-            					var split = comps.split('U("m-obj://undefined/'+components[i]._bindingDescriptors.uuid+'", {\n    })');
-    							comps = split[0]+'\n'+
-    									'{\n'+
-                                    	'"'+components[i].binding.sourceProperty+'": {\n'+
-                                        '"boundObject": U("m-obj://'+components[i].binding.target._montage_metadata.__proto__.objectName+'/'+components[i].binding.target.uuid+'?mId='+components[i].binding.target._montage_metadata.__proto__.moduleId+'"),\n'+
-                                        '"boundObjectPropertyPath": "'+components[i].binding.targetProperty+'"\n'+
-                                    	'}\n'+
-                                		'}\n'+
-    									split[1];
-    						}
-            			}
-    					var montage = 	'<script type="text/m-objects">\n\t\t\t{\n'+
-    									'\t\t\t"$rootObject": U("m-obj://Application/application-uuid?mId=montage/application", {\n'+
-            							'\t\t\t\t"components": [\n'+
-           								comps+
-            							'\n\t\t\t\t]\n\t\t\t})\n\t\t\t}\n\t\t</script>';
-								    	
-    					contents = '<html>\n\t<head>'+document.getElementById(id).contentDocument.getElementById('userHead').innerHTML+'\n\t\t'+montage+'\n\t</head>\n\t<body>\n'+html+'\n\t</body>\n</html>';
-    				} else {
-    					//No m-js components in file, so saving plain document HTML
-    					contents = '<html>\n\t<head>'+document.getElementById(id).contentDocument.getElementById('userHead').innerHTML+'\n\t</head>\n\t<body>\n'+document.getElementById(id).contentDocument.getElementById('UserContent').innerHTML+'\n\t</body>\n</html>';
-    				}
-    				break;
-    			case 'css':
-    				contents = this.getCssFromRules(document.getElementById(id).contentDocument.styleSheets[document.getElementById(id).contentDocument.styleSheets.length-1].cssRules);
-    				break;
-    			case 'js':
-    				break;
-    			case 'text':
-    				break;
-    			default:
-    				break;
-    		}
-    		
-    		
-    		return contents;
-    		
-    		
-    		
-    	}
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    saveAs: {
-    	enumerable: true,
-    	value: function(e) {
-    		//TODO: Add functionality
-    		console.log('FileIO: saveFileAs');
-    	}
-    },
-    
-    
-    
-    
-    ////////////////////////////////////////////////////////////////////
-    //Method to return a string from CSS rules (to be saved to a file)
-    getCssFromRules: {
-    	enumerable: false,
-    	value: function (list) {
-    		//Variable to store CSS definitions
-    		var i, str, css = '';
-    		//Looping through list
-    		if (list && list.length > 0) {
-    			//Adding each list item to string and also adding breaks
-    			for (i = 0; list[i]; i++) {
-    				str = list[i].cssText+' ';
-    				str = str.replace( new RegExp( "{", "gi" ), "{\n\t" );
-    				str = str.replace( new RegExp( "}", "gi" ), "}\n" );
-    				str = str.replace( new RegExp( ";", "gi" ), ";\n\t" );
-    				css += '\n'+str;
-    			}
-    		}
-    		//Returning the CSS string
-    		return css;
-    	}
-    }
-*/
-    
-    
-    
-
-    
+    ////////////////////////////////////////////////////////////////////   
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
-- 
cgit v1.2.3


From 018a6132d93a73d28bd349122404c236e61cb765 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 13 Feb 2012 15:03:23 -0800
Subject: Save 'code' view files

Added functionality (temp) to save files in code view.
---
 js/io/document/html-document.js          |  7 +++-
 js/io/document/text-document.js          | 65 ++++++++++++++++++++++++--------
 js/io/ui/cloudpopup.reel/cloudpopup.html |  2 +-
 3 files changed, 55 insertions(+), 19 deletions(-)

(limited to 'js/io')

diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index 99bf4576..dfd8566a 100755
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -471,9 +471,12 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
 	save: {
 		enumerable: false,
     	value: function () {
-    		//console.log(this._styles, this._stylesheets);
     		//TODO: Add code view logic and also styles for HTML
-    		return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    		if (this.currentView === 'design') {
+    			return {mode: 'html', document: this._userDocument, style: this._styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+    		} else if(this.currentView === "code"){
+    			//TODO: Would this get call when we are in code of HTML?
+    		}
     	}
 	}
 	////////////////////////////////////////////////////////////////////
diff --git a/js/io/document/text-document.js b/js/io/document/text-document.js
index 81162eba..e149c479 100755
--- a/js/io/document/text-document.js
+++ b/js/io/document/text-document.js
@@ -4,11 +4,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var Montage = require("montage/core/core").Montage;
-var baseDocumentModule = require("js/io/document/base-document");
-
-
-var TextDocument = exports.TextDocument = Montage.create(baseDocumentModule.BaseDocument, {
+////////////////////////////////////////////////////////////////////////
+//
+var Montage = 		require("montage/core/core").Montage,
+	BaseDocument =	require("js/io/document/base-document").BaseDocument;
+////////////////////////////////////////////////////////////////////////
+//
+var TextDocument = exports.TextDocument = Montage.create(BaseDocument, {
     // PRIVATE MEMBERS
     _codeEditor: {
         value: {
@@ -21,7 +23,9 @@ var TextDocument = exports.TextDocument = Montage.create(baseDocumentModule.Base
     _hline: { value: null, enumerable: false },
 
     _textArea: {value: null, enumerable: false },
-
+	
+	_userDocument: {value: null, enumerable: false },
+	
     _source: { value: null, enumerable: false},
 
     source: {
@@ -65,19 +69,43 @@ var TextDocument = exports.TextDocument = Montage.create(baseDocumentModule.Base
     },
 
     
-    // PUBLIC METHODS
+    ////////////////////////////////////////////////////////////////////
+	//
     initialize: {
-        value: function(doc, uuid, textArea, container, callback) {
-            this.init(doc.name, doc.uri, doc.type, container, uuid);
-            this.currentView = "code";
-            this.textArea = textArea;
-
-//            this._loadContent();
-
+    	value: function(file, uuid, textArea, container, callback) {
+        	//
+			this._userDocument = file;
+			//
+			this.init(file.name, file.uri, file.extension, container, uuid, callback);
+	        //
+    	    this.currentView = "code";
+        	this.textArea = textArea;
         }
     },
+    ////////////////////////////////////////////////////////////////////
+    //
+	save: {
+		enumerable: false,
+    	value: function () {
+    		//TODO: Improve sequence
+    		this.editor.save();
+    		return {mode: this._userDocument.extension, document: this._userDocument, content: this.textArea.value};
+    	}
+	}
+	////////////////////////////////////////////////////////////////////
+
+
+
+
+
+
+
+
+
+
 
-    // PRIVATE METHODS
+    /*
+// PRIVATE METHODS
     _loadContent: {
         value: function() {
             // Start and AJAX call to load the HTML Document as a String
@@ -104,11 +132,15 @@ var TextDocument = exports.TextDocument = Montage.create(baseDocumentModule.Base
             xhr.send('');
         }
     },
+*/
+    ////////////////////////////////////////////////////////////////////
+	
 
     /**
      * public method
      */
-    save:{
+    /*
+save:{
         value:function(){
             try{
                 this.editor.save();
@@ -120,4 +152,5 @@ var TextDocument = exports.TextDocument = Montage.create(baseDocumentModule.Base
             }
         }
     }
+*/
 });
\ No newline at end of file
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index 8e65a705..2c1c169a 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -50,7 +50,7 @@
 	    			
 	    			<h4>Install Ninja Cloud App</h4>
 	    			
-	    			<p>Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu ullamcorper orci. Quisque eget odio ac lectus.</p>
+	    			<p>The Local Cloud App is required to run Ninja. Please download and unzip the file. Start the Local Cloud and copy/paste the server URL into the field above. Click the ‘Test’ button to verify the connection.</p>
 	    			
 	    			<div class="cloud_icon"></div>
 	    			
-- 
cgit v1.2.3