aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorEric Guzman2012-02-20 15:47:04 -0800
committerEric Guzman2012-02-20 15:47:04 -0800
commit27b1c2241a97472b4e3670080274767204955970 (patch)
tree2bba2a784924a47451dd60963a0c458a8b5f4a76 /js/controllers
parentc743b291e91b6de8440ecba0ddaf62546c1692f1 (diff)
parenta9f81445afbc10b246ebbbcf99a0db11a9679021 (diff)
downloadninja-27b1c2241a97472b4e3670080274767204955970.tar.gz
Merge branch 'StylesControllerUpdates' of github.com:ericguzman/ninja-internal into StylesControllerUpdates
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/styles-controller.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 7d5dc42b..885d710f 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -571,6 +571,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
571 rules = [], 571 rules = [],
572 win = element.ownerDocument.defaultView, 572 win = element.ownerDocument.defaultView,
573 self = this; 573 self = this;
574
575 if(!win) {
576 return null;
577 }
574 578
575 if(!omitPseudos) { 579 if(!omitPseudos) {
576 pseudos.concat(['link', 'visited', 'active', 'hover', 'focus', 'first-letter', 580 pseudos.concat(['link', 'visited', 'active', 'hover', 'focus', 'first-letter',