1 files changed, 90 insertions, 44 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index cbc00676..534f77c7 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,10 +79,14 @@ 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) {
+            if(!document || document.currentView === "code") {
+                this._activeDocument   = null;
+                this._stageStylesheet  = null;
+                this.defaultStylesheet = null;
+                this.userStyleSheets   = [];
+                this.clearDirtyStyleSheets();
                 return false;
             }
 
@@ -95,7 +99,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             // Setter will handle null case
             this.defaultStylesheet = this.getSheetFromElement(this.CONST.DEFAULT_SHEET_ID);
 
-            this.userStyleSheets = nj.toArray(document._document.styleSheets).filter(function(sheet) {
+            this.userStyleSheets = nj.toArray(document.model.views.design.document.styleSheets).filter(function(sheet) {
                 return sheet !== this._stageStylesheet;
             }, this);
 
@@ -120,22 +124,27 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             if(sheet) {
                 this._defaultStylesheet = sheet;
             } else {
-                
-                ///// Use the last stylesheet in the document as the default
-                
-                var sheets = this._activeDocument._document.styleSheets,
-                    lastIndex = sheets.length-1;
-                
-                ///// If the only sheet is the stage stylesheet, this will be true
-                ///// in which case, we want to create a stylesheet to hold the 
-                ///// user's style rules
-                
-                if(sheets[lastIndex] === this._stageStyleSheet) {
-                    this._defaultStylesheet = this.createStylesheet('nj-default');
-                } else {
-                    this._defaultStylesheet = sheets[lastIndex];
+                if(sheet === null) {
+                    this._defaultStylesheet = null;
+                    return false;
                 }
+                //check that the document has a design view
+                else if(this._activeDocument.model && this._activeDocument.model.views && this._activeDocument.model.views.design){
+                    ///// Use the last stylesheet in the document as the default
+
+                    var sheets = this._activeDocument.model.views.design.document.styleSheets,
+                        lastIndex = sheets.length-1;
 
+                    ///// If the only sheet is the stage stylesheet, this will be true
+                    ///// in which case, we want to create a stylesheet to hold the
+                    ///// user's style rules
+
+                    if(sheets[lastIndex] === this._stageStyleSheet) {
+                        this._defaultStylesheet = this.createStylesheet('nj-default');
+                    } else {
+                        this._defaultStylesheet = sheets[lastIndex];
+                    }
+                }
             }
         }
     },
@@ -166,13 +175,17 @@ var stylesController = exports.StylesController = Montage.create(Component, {
     
     addRule : {
         value : function(selector, declaration, stylesheet, index) {
-            //console.log("Add rule");
+            stylesheet = stylesheet || this._defaultStylesheet;
+
+            if(stylesheet === null) {
+                stylesheet = this.defaultStylesheet = this.createStylesheet();
+            }
+
             var rulesLength = this._defaultStylesheet.rules.length,
                 argType     = (typeof declaration),
                 ruleText    = selector,
-                stylesheet  = stylesheet || this._defaultStylesheet,
-                property, rule;
-            
+                rule;
+
             index = index || (argType === 'number') ? declaration : rulesLength;
             
             if(argType === 'string') {
@@ -814,7 +827,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// method to apply/test the new value
             dec.setProperty(property, value, priority);
 
-            if(rule.parentStyleSheet) {
+            if(rule.type !== 'inline' && rule.parentStyleSheet) {
                 this.styleSheetModified(rule.parentStyleSheet);
             }
 
@@ -874,7 +887,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     getAnimationRuleWithName : {
         value: function(name, document) {
-            var doc = document || this._activeDocument._document,
+            var doc = document || this._activeDocument.model.views.design.document,
                 animRules = this.getDocumentAnimationRules(doc),
                 rule, i;
 
@@ -896,7 +909,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     getDocumentAnimationRules : {
         value: function(document) {
-            var sheets = (document) ? document.styleSheets : this._activeDocument._document.styleSheets,
+            var sheets = (document) ? document.styleSheets : this._activeDocument.model.views.design.document.styleSheets,
                 rules = [];
 
             nj.toArray(sheets).forEach(function(sheet) {
@@ -1159,6 +1172,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;
 
@@ -1192,6 +1206,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;
 
@@ -1257,7 +1272,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
     
     createStylesheet : {
         value: function(id, document) {
-            var doc = document || this._activeDocument._document,
+            var doc = document || this._activeDocument.model.views.design.document,
                 sheetElement, sheet;
             
             sheetElement = nj.make('style', {
@@ -1280,6 +1295,33 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             return sheet;
         }
     },
+
+    ///// Remove Style sheet
+    ///// Removes style sheet from document
+
+    removeStyleSheet : {
+        value: function(sheet) {
+            var sheetEl = sheet.ownerNode, sheetCount;
+
+            if(sheetEl) {
+                sheetEl.disabled = true;
+                this.userStyleSheets.splice(this.userStyleSheets.indexOf(sheet), 1);
+
+                ///// Check to see if we're removing the default style sheet
+                if(sheet === this._defaultStylesheet) {
+                    sheetCount = this.userStyleSheets.length;
+                    this.defaultStylesheet = (sheetCount) ? this.userStyleSheets[sheetCount-1] : null;
+                }
+
+                ///// Mark for removal for i/o
+                sheetEl.setAttribute('data-ninja-remove', 'true');
+
+                NJevent('removeStyleSheet', sheet);
+            }
+
+
+        }
+    },
     
     ///// Gets the stylesheet object associated with passed-in
     ///// element or element id, with option context (document)
@@ -1287,7 +1329,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
     
     getSheetFromElement : {