Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

9 files changed, 109 insertions, 29 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index df3c74f8..57289448 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -59,10 +59,12 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeNewFile", this, false);
             this.eventManager.addEventListener("executeSave", this, false);
 
-            this.eventManager.addEventListener("recordStyleChanged", this, false);           
+            this.eventManager.addEventListener("recordStyleChanged", this, false);
+            
         }
     },
     
+   
     
     handleWebRequest: {
         value: function (request) {
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 ae2b4600..77cc711d 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -363,6 +363,9 @@ 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
@@ -471,6 +474,48 @@ exports.HTMLDocument = Montage.create(TextDocument, {
         }
     },
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    ////////////////////////////////////////////////////////////////////
+        //
+    livePreview: {
+        enumerable: false,
+        value: function () {
+                //this.application.ninja.documentController
+                //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
+                        chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]});            
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    
+    
+    
+    
+    
+    
+    
+    
+    
         ////////////////////////////////////////////////////////////////////
         //
         save: {
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index c8e20def..a2fac34f 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -4,16 +4,16 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
-    snapManagerModule = require("js/helper-classes/3D/snap-manager"),
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component,
+    vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
     Rectangle = require("js/helper-classes/3D/rectangle").Rectangle,
     ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 ///////////////////////////////////////////////////////////////////////
 // Class ViewUtils
 //      Viewing Utility functions
 ///////////////////////////////////////////////////////////////////////
-var ViewUtils = exports.ViewUtils = Object.create(Object.prototype,
-{
+exports.ViewUtils = Montage.create(Component, {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
@@ -133,7 +133,7 @@ var ViewUtils = exports.ViewUtils = Object.create(Object.prototype,
             var xVec = [mat[0],  mat[1],  mat[2],  mat[3]];
             var yVec = [mat[4],  mat[5],  mat[6],  mat[7]];
 
-            var stage = snapManagerModule.SnapManager.getStage();
+            var stage = this.application.ninja.currentDocument.documentRoot;
             var stageMat = this.getMatrixFromElement(stage);
             var stagePlane = [stageMat[8],  stageMat[9],  stageMat[10],  stageMat[11]];
 
@@ -412,7 +412,7 @@ var ViewUtils = exports.ViewUtils = Object.create(Object.prototype,
             // get the four corners of the element in global space
             var bounds = this.getElementViewBounds3D( elt );
             var bounds3D = new Array();
-            var stage = snapManagerModule.SnapManager.getStage();
+            var stage = this.application.ninja.currentDocument.documentRoot;
             for (var i=0;  i<3;  i++)
             {
                 var gPt = this.localToGlobal( bounds[i],  elt );
@@ -789,7 +789,7 @@ var ViewUtils = exports.ViewUtils = Object.create(Object.prototype,
 
     getStageWorldToGlobalMatrix: {
         value: function() {
-            var stage = snapManagerModule.SnapManager.getStage();
+            var stage = this.application.ninja.currentDocument.documentRoot;
             this.pushViewportObj( stage );
 
                 // get the matrix to the parent
@@ -1190,12 +1190,7 @@ var ViewUtils = exports.ViewUtils = Object.create(Object.prototype,
 //      drawLayoutModule.drawLayout.redrawDocument()                                                    OR
 //      window.stageManager.drawSelectionRec(true)                      this.getStage().draw();
 //      drawLayoutModule.drawLayout.redrawDocument();
-//
-//      SNAP MANAGER
-//      snapManager:                                    snapManagerModule.SnapManager
-//      snapManagerModule:                              snapManagerModule = r_equire("js/helper-classes/3D/snap-manager")
-//      stage                                                   stage = snapManagerModule.SnapManager.getStage();
-//
+
 //      SELECTION MANAGER
 //      selected elements:                              this.application.ninja.selectedElements
 //      selectionManager                                this.application.ninja.selectionController
@@ -1213,10 +1208,10 @@ var ViewUtils = exports.ViewUtils = Object.create(Object.prototype,
 
     clearStageTranslation: {
         value: function() {
-            if (snapManagerModule.SnapManager.application.ninja.currentDocument)
+            if (this.application.ninja.currentDocument)
             {
                 // get the user content object
-                var userContent = snapManagerModule.SnapManager.application.ninja.currentDocument.documentRoot;
+                var userContent = this.application.ninja.currentDocument.documentRoot;
                 if (!userContent)  return;
                 this.setViewportObj( userContent );
 
@@ -1235,9 +1230,10 @@ var ViewUtils = exports.ViewUtils = Object.create(Object.prototype,
         value:function( globalPt,  zoomFactor ) {
             var localPt;
             var tmp1, tmp2, tmp3;
-            if (snapManagerModule.SnapManager.application.ninja.currentDocument)
+
+            if (this.application.ninja.currentDocument)