Merge branch 'refs/heads/master' into nested-selection

18 files changed, 353 insertions, 47 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index b1a22c1b..1f339fe7 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,38 @@ 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 +210,9 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
         //
         openDocument: {
                 value: function(doc) {
+                        
+                        //
+                        this.documentHackReference = doc;
                         //
                         switch (doc.extension) {
                                 case 'html': case 'html':
@@ -277,7 +310,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/data/menu-data.js b/js/data/menu-data.js
index 6503e776..7c3ca5d4 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -140,6 +140,15 @@ exports.MenuData = Montage.create( Montage, {
                         }
                     },
                     {
+                        "displayText" : "Chrome Preview",
+                        "hasSubMenu" : false,
+                        "enabled": true,
+                        "checked": {
+                            "value": false,
+                            "boundProperty": "chromePreview"
+                        }
+                    },
+                    {
                         "displayText" : "Layout View",
                         "hasSubMenu" : false,
                         "enabled": true,
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 0c8695fb..77cc711d 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,19 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     },
     
     
+    
+    
+    
         
         ////////////////////////////////////////////////////////////////////
         //
     handleEvent: {
         value: function(event){
+                //TODO: Remove
+                window.hackPreview = this.livePreview.bind(this);
+        
+                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 +398,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 +451,9 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 }
 
                 // Remving this callback and using the callback from the css load
-                // this.callback(this);
+                //this.callback(this);
+                
+                
             
             }
     },
@@ -461,6 +474,48 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         }
     },
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+