aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-08 12:00:51 -0700
committerValerio Virgillito2012-05-08 12:00:51 -0700
commitcb9e4b68b307f3bbc898fd482eb2668120cd4d18 (patch)
tree8d27fd93d7a7350f74b7085012be51e27b27bf55 /js/controllers
parent7cdf8b969bf932ddf0604855abe106ef635f901b (diff)
parent53747ce689ddcdc19e586b30d6f356b3b0539731 (diff)
downloadninja-cb9e4b68b307f3bbc898fd482eb2668120cd4d18.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/document-controller.js4
-rwxr-xr-xjs/controllers/styles-controller.js2
2 files changed, 1 insertions, 5 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 6a25420a..cf96208f 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -429,10 +429,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
429 429
430 closeDocument: { 430 closeDocument: {
431 value: function(id) { 431 value: function(id) {
432 if(this.activeDocument.needsSave === true){
433 //if file dirty then alert user to save
434 }
435
436 var doc = this._findDocumentByUUID(id); 432 var doc = this._findDocumentByUUID(id);
437 433
438 var closeDocumentIndex = this._findIndexByUUID(id); 434 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;