diff options
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/document-controller.js | 4 | ||||
-rwxr-xr-x | js/controllers/styles-controller.js | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index ed4d33eb..17ae8cc3 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -440,10 +440,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
440 | 440 | ||
441 | closeDocument: { | 441 | closeDocument: { |
442 | value: function(id) { | 442 | value: function(id) { |
443 | if(this.activeDocument.needsSave === true){ | ||
444 | //if file dirty then alert user to save | ||
445 | } | ||
446 | |||
447 | var doc = this._findDocumentByUUID(id); | 443 | var doc = this._findDocumentByUUID(id); |
448 | 444 | ||
449 | var closeDocumentIndex = this._findIndexByUUID(id); | 445 | 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, { | |||
1102 | ///// The dominant rule might not have the style property defined - why? | 1102 | ///// The dominant rule might not have the style property defined - why? |
1103 | ///// If no rules have the property defined, we can use the | 1103 | ///// If no rules have the property defined, we can use the |
1104 | ///// most-specific single-target rule as the dominant rule (for setting styles) | 1104 | ///// most-specific single-target rule as the dominant rule (for setting styles) |
1105 | return element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property); | 1105 | return (element.ownerDocument.defaultView ? element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property) : null); |
1106 | } | 1106 | } |
1107 | 1107 | ||
1108 | return value; | 1108 | return value; |