1 files changed, 8 insertions, 7 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 2ff3e235..3a942364 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -53,11 +53,11 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// Bind app's activeDocument property to
             ///// styles controller's _activeDocument property
 
-            Object.defineBinding(this, "activeDocument", {
-                boundObject: this.application.ninja,
-                boundObjectPropertyPath: "currentDocument",
-                oneway: true
-            });
+//            Object.defineBinding(this, "activeDocument", {
+//                boundObject: this.application.ninja,
+//                boundObjectPropertyPath: "currentDocument",
+//                oneway: true
+//            });
         }
     },
 
@@ -79,7 +79,6 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             return this._activeDocument;
         },
         set : function(document) {
-
             ///// If the document is null set default stylesheets to null
 
             if(!document) {
@@ -112,7 +111,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
         set : function(sheet) {
             if(sheet) {
                 this._defaultStylesheet = sheet;
-            } else {
+            } else if(this._activeDocument.model && this._activeDocument.model.views && this._activeDocument.model.views.design){//check that the document has a design view
                 
                 ///// Use the last stylesheet in the document as the default
                 
@@ -1132,6 +1131,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     getMatrixFromElement : {
         value: function(element, isStage) {
+            isStage = false;
             var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage),
                 mat;
 
@@ -1165,6 +1165,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     getPerspectiveDistFromElement : {
         value: function(element, isStage) {
+            isStage = false;
             var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage),
                 dist;