12 files changed, 256 insertions, 20 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index b1a22c1b..5e2a6461 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -14,7 +14,7 @@ var Montage = 		require("montage/core/core").Montage,
     DocumentController;
 ////////////////////////////////////////////////////////////////////////
 //
-DocumentController = exports.DocumentController = Montage.create(Component, {
+var DocumentController = exports.DocumentController = Montage.create(Component, {
     hasTemplate: {
         value: false
     },
@@ -22,6 +22,10 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
     _documents: {
         value: []
     },
+    
+    _hackRootFlag: {
+        value: false
+    },
 
     _activeDocument: { value: null },
     _iframeCounter: { value: 1, enumerable: false },
@@ -56,12 +60,39 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
             this.eventManager.addEventListener("executeSave", this, false);
 
             this.eventManager.addEventListener("recordStyleChanged", this, false);
+            
+            
+            
         }
     },
+    
+    
+    handleWebRequest: {
+        value: function (request) {
+                if (request.url.indexOf('js/document/templates/montage-html') !== -1) {
+                        
+                        console.log(request);
+                        
+                        //TODO: Figure out why active document is not available here
+                        
+                                if (this._hackRootFlag) {
+                                        
+                                        //console.log(request.url.split('/')[request.url.split('/').length-1]);
+                                        //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]);
+                                        
+                                        return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
+                                }
+                        }
+        }
+    },
+    
 
     handleAppLoaded: {
         value: function() {
             //
+            
+            chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
+            
         }
     },
 
@@ -180,6 +211,9 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
         //
         openDocument: {
                 value: function(doc) {
+                        
+                        //
+                        this.documentHackReference = doc;
                         //
                         switch (doc.extension) {
                                 case 'html': case 'html':
@@ -277,7 +311,6 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
     _onOpenDocument: {
         value: function(doc){
             //var data = DocumentManager.activeDocument;
-
             this._hideCurrentDocument();
             this.application.ninja.stage.stageView.hideOtherDocuments(doc.uuid);
 
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 0c8695fb..ae2b4600 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -14,7 +14,7 @@ var Montage = 		require("montage/core/core").Montage,
 exports.HTMLDocument = Montage.create(TextDocument, {
     
     _selectionExclude: { value: null, enumerable: false },
-    _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
+    _htmlTemplateUrl: { value: "js/document/templates/montage-html/index.html", enumerable: false},
     _iframe: { value: null, enumerable: false },
     _server: { value: null, enumerable: false },
     _templateDocument: { value: null, enumerable: false },
@@ -235,6 +235,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         //
     initialize: {
                 value: function(file, uuid, iframe, callback) {
+                        this.application.ninja.documentController._hackRootFlag = false;
                         //
                         this._userDocument = file;
                         //
@@ -354,11 +355,16 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     },
     
     
+    
+    
+    
         
         ////////////////////////////////////////////////////////////////////
         //
     handleEvent: {
         value: function(event){
+                this.application.ninja.documentController._hackRootFlag = true;
+                        //console.log(this._userDocument.root, this);
                 //TODO: Clean up, using for prototyping save
                 this._templateDocument = {};
                 this._templateDocument.head = this.iframe.contentWindow.document.getElementById("userHead");;
@@ -389,6 +395,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         this._stylesheets = this._document.styleSheets; // Entire stlyesheets array
 
                         this.callback(this);
+                        
+                        //console.log('file content end');
                     }
                 }.bind(this), 50);
             
@@ -440,7 +448,9 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 }
 
                 // Remving this callback and using the callback from the css load
-                // this.callback(this);
+                //this.callback(this);
+                
+                
             
             }
     },
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
new file mode 100755
index 00000000..68300edf
--- /dev/null
+++ b/js/document/templates/montage-html/default_html.css
@@ -0,0 +1,75 @@
+/* <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> */
+
+* {
+    -webkit-transition-duration: 0s !important;
+    -webkit-animation-duration: 0s !important;
+    -webkit-animation-name: none !important;
+}
+
+html{
+    overflow:hidden;
+}
+
+body
+{
+        background: #808080;
+}
+
+#Viewport 
+{
+        margin: 0px;
+        padding: 0px;
+        top: 200px;
+        left: 700px;
+    /*position: absolute;*/
+        /*height: 600px;*/
+        /*width: 800px;*/
+        opacity: 0.99;
+        z-index:2;
+}
+
+#stageBG
+{
+        background: #ffffff;
+        top: 200px;
+        left: 700px;
+        z-index:1;
+}
+        
+.stageDimension