From c23e9b12c42c180cdeda76be67ae3a27833efc36 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Tue, 1 May 2012 16:26:51 -0700
Subject: Styles Controller - Fix error when trying dispatch stylesheet change
 event

---
 js/controllers/styles-controller.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'js/controllers')

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index ec4314f9..62cbb574 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -795,7 +795,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             ///// method to apply/test the new value
             dec.setProperty(property, value, priority);
 
-            this.styleSheetModified(rule.parentStyleSheet);
+            if(rule.parentStyleSheet) {
+                this.styleSheetModified(rule.parentStyleSheet);
+            }
 
             ///// Return browser value for value we just set
             return dec.getPropertyValue(property);
-- 
cgit v1.2.3


From a00be41613cb952470cc952aa63f67e61745379a Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 7 May 2012 17:19:19 -0700
Subject: fixed javascript errors

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/controllers/document-controller.js | 4 ----
 js/controllers/styles-controller.js   | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'js/controllers')

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 6d11bd0e..c6bf4c6b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -427,10 +427,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
     closeDocument: {
         value: function(id) {
-            if(this.activeDocument.needsSave === true){
-                //if file dirty then alert user to save
-        }
-
             var doc = this._findDocumentByUUID(id);
 
             var closeDocumentIndex = this._findIndexByUUID(id);
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index ec4314f9..647c0870 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -1102,7 +1102,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 ///// The dominant rule might not have the style property defined - why?
                 ///// If no rules have the property defined, we can use the
                 ///// most-specific single-target rule as the dominant rule (for setting styles)
-                return element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property);
+                return (element.ownerDocument.defaultView ? element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property) : null);
             }
 
             return value;
-- 
cgit v1.2.3