6 files changed, 81 insertions, 14 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7f4feff9..227b5462 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -97,13 +97,19 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
                 this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
             }
     },
-
+        
+        
+        ////////////////////////////////////////////////////////////////////
+        //TODO: Improve logic and make functions
     handleExecuteSave: {
-            value: function(event) {
-                this.activeDocument.save();
-            }
+        value: function(event) {
+                //
+                this.application.ninja.ioMediator.fileSave(this.activeDocument.save());
+                }
     },
-
+        ////////////////////////////////////////////////////////////////////
+        
+        
     createNewFile:{
         value:function(newFileObj){
             //console.log(newFileObj);//contains the template uri and the new file uri
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};
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 2f286e5e..deb748c7 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -138,6 +138,20 @@ exports.IoMediator = Montage.create(Component, {
         enumerable: false,
         value: function (file, callback) {
                 //
+                var contents, save;
+                //
+                switch (file.mode) {
+                        case 'html':
+                                file.document.content.document.body.innerHTML = file.body;
+                                file.document.content.document.head.innerHTML = file.head;
+                                contents = file.document.content.document.documentElement.outerHTML;
+                                break;
+                        default:
+                                break;
+                }
+                //
+                save = this.fio.saveFile({uri: file.document.uri, contents: contents})
+                console.log(save);
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/user-document-templates/montage-application-cloud/index.html b/user-document-templates/montage-application-cloud/index.html
index d1f9634d..63dd5926 100755
--- a/user-document-templates/montage-application-cloud/index.html
+++ b/user-document-templates/montage-application-cloud/index.html
@@ -4,6 +4,7 @@
  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> -->
+ 
 <html>
 
         <head>
@@ -34,15 +35,15 @@
 
         <body>
                 
-                <div id="userHead"></div>
+                <ninja-div id="userHead"></ninja-div>
                 
-                <div id="stageBG" class="stageDimension stageContentShadow"></div>
+                <ninja-div id="stageBG" class="stageDimension stageContentShadow"></ninja-div>
                 
-                <div id="Viewport" class="stageDimension">
+                <ninja-div id="Viewport" class="stageDimension">
                         
-                        <div id="UserContent" class="stageView stageDimension global3DSettings"></div>
+                        <ninja-div id="UserContent" class="stageView stageDimension global3DSettings"></ninja-div>
                         
-                </div>
+                </<