Merge pull request #536 from hannu/fix-fullscreen-encaps

Fix fullscreen mode when using disableEncapsulation option
SC5 · Mar 30, 2015 · 542935e · 542935e
2 parents 0d273b1 + 67fc5a6
commit 542935e
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/lib/app/js/directives/shadowDom.js b/lib/app/js/directives/shadowDom.js
@@ -9,17 +9,26 @@ angular.module('sgApp')
       restrict: 'E',
       transclude: true,
       link: function(scope, element, attrs, controller, transclude) {
-        if (typeof element[0].createShadowRoot === 'function' && !Styleguide.config.data.disableEncapsulation) {
-          var root = angular.element(element[0].createShadowRoot());
-          root.append($templateCache.get(USER_STYLES_TEMPLATE));
-          transclude(function(clone) {
-            root.append(clone);
-          });
-        } else {
-          transclude(function(clone) {
-            element.append(clone);
-          });
-        }
+
+        scope.$watch(function() {
+          return Styleguide.config;
+        }, function() {
+          if (typeof element[0].createShadowRoot === 'function' && (Styleguide.config && Styleguide.config.data && !Styleguide.config.data.disableEncapsulation)) {
+            angular.element(element[0]).empty();
+            var root = angular.element(element[0].createShadowRoot());
+            root.append($templateCache.get(USER_STYLES_TEMPLATE));
+            transclude(function(clone) {
+              root.append(clone);
+            });
+          } else {
+            transclude(function(clone) {
+              var root = angular.element(element[0]);
+              root.empty();
+              root.append(clone);
+            });
+          }
+        }, true);
+
       }
     };
   });