aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-11 08:55:46 -0700
committerPushkar Joshi2012-05-11 08:55:46 -0700
commitd7d6f03257f9e938321cfea0e9f98e99cca7c397 (patch)
tree05f89cf903b26cab6233dc6dfa7c6f18b5947c2c /js/controllers
parentde9f718b739ef2b31a161d9dac6e81d614fab853 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-d7d6f03257f9e938321cfea0e9f98e99cca7c397.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js4
-rwxr-xr-xjs/controllers/styles-controller.js6
2 files changed, 4 insertions, 6 deletions
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,
427 427
428 closeDocument: { 428 closeDocument: {
429 value: function(id) { 429 value: function(id) {
430 if(this.activeDocument.needsSave === true){
431 //if file dirty then alert user to save
432 }
433
434 var doc = this._findDocumentByUUID(id); 430 var doc = this._findDocumentByUUID(id);
435 431
436 var closeDocumentIndex = this._findIndexByUUID(id); 432 var closeDocumentIndex = this._findIndexByUUID(id);
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index ec4314f9..2ff3e235 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -795,7 +795,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
795 ///// method to apply/test the new value 795 ///// method to apply/test the new value
796 dec.setProperty(property, value, priority); 796 dec.setProperty(property, value, priority);
797 797
798 this.styleSheetModified(rule.parentStyleSheet); 798 if(rule.parentStyleSheet) {
799 this.styleSheetModified(rule.parentStyleSheet);
800 }
799 801
800 ///// Return browser value for value we just set 802 ///// Return browser value for value we just set
801 return dec.getPropertyValue(property); 803 return dec.getPropertyValue(property);
@@ -1102,7 +1104,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
1102 ///// The dominant rule might not have the style property defined - why? 1104 ///// The dominant rule might not have the style property defined - why?
1103 ///// If no rules have the property defined, we can use the 1105 ///// If no rules have the property defined, we can use the
1104 ///// most-specific single-target rule as the dominant rule (for setting styles) 1106 ///// most-specific single-target rule as the dominant rule (for setting styles)
1105 return element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property); 1107 return (element.ownerDocument.defaultView ? element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property) : null);
1106 } 1108 }
1107 1109
1108 return value; 1110 return value;