Squashed commit of the following:

merge master into timeline

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 662816f5..addfc24e 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -1236,11 +1236,17 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     clearDirtyStyleSheets : {
         value: function(doc) {
-            if(!doc) {
+            this.dirtyStyleSheets.length = 0;
+
+            if(doc) {
+                var stillDirty = this.dirtyStyleSheets.filter(function(sheet) {
+                    return sheet.document !== doc;
+                });
                 this.dirtyStyleSheets = null;
-                this.dirtyStyleSheets = [];
+                this.dirtyStyleSheets = stillDirty;
             }
 
+
         }
     },