4 files changed, 100 insertions, 101 deletions

diff --git a/js/io/document/document-controller.js b/js/controllers/document-controller.js
index c2a2dab6..22467b44 100755
--- a/js/io/document/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -4,21 +4,17 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (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, {
+////////////////////////////////////////////////////////////////////////
+//
+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,
+    DocumentController;
+////////////////////////////////////////////////////////////////////////
+//
+DocumentController = exports.DocumentController = Montage.create(Component, {
     hasTemplate: {
         value: false
     },
@@ -152,67 +148,52 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
-    /**
-     * 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)){
+            //TODO: Add UI to handle error codes, shouldn't be alert windows
+            if(!!response && (response.status === 204)) {
+                //Sending full response object
+                this.openDocument(response);   
+            } else if (!!response && (response.status === 404)){
                 alert("Unable to open file.\n [Error: File does not exist]");
-            }else if(!!response && (response.status === 500)){
+            } else if (!!response && (response.status === 500)){
                 alert("Unable to open file.\n Check if Ninja Local Cloud is running.");
-            }else{
+            } else{
                 alert("Unable to open file.");
             }
 
         }
     },
-
-    openProjectWithURI: {
-        value: function(uri) {
-            console.log("URI is: ", uri);
-
-        }
-    },
-
-    /** Open a Document **/
-    openDocument: {
-        value: function(doc) {
+        ////////////////////////////////////////////////////////////////////
+        //
+        openDocument: {
+                value: function(doc) {
+                        //
+                        switch (doc.extension) {
+                                case 'html': case 'html':
+                                        //Open in designer view
+                                        Montage.create(HTMLDocument).initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument);
+                                        break;
+                                default:
+                                        //Open in code view
+                                        break;
+                        }
+                        
+                        return;
+            
+            
+            
+            
+            
             var newDoc;
 
             if(!doc) return false;
 
            // try {
                 if (doc.type === 'html' || doc.type === 'htm') {
+                        console.log('hello');
                     newDoc = Montage.create(HTMLDocument);
                     newDoc.initialize(doc, Uuid.generate(), this._createIframeElement(), this._onOpenDocument);
                 } else {
@@ -235,7 +216,14 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
            // }
         }
     },
-
+        ////////////////////////////////////////////////////////////////////
+        
+        openProjectWithURI: {
+        value: function(uri) {
+            console.log("URI is: ", uri);
+        }
+    },
+    
     textDocumentOpened: {
        value: function(doc) {
 
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: {