Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Element.createShadowRoot with Element.attachShadow #1139

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace Element.createShadowRoot with Element.attachShadow #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
addCssLink('{{{appRoot}}}/styleguide-app.css', {noReload: true});

// Use Shadow DOM but fallback to global styles if shadow DOM is not supported
if (typeof head.createShadowRoot !== 'function' || _styleguideConfig.disableEncapsulation) {
if (typeof head.attachShadow !== 'function' || _styleguideConfig.disableEncapsulation) {
userStyleFiles.forEach(addCssLink);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/app/js/directives/shadowDom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ angular.module('sgApp')
scope.$watch(function() {
return Styleguide.config;
}, function() {
if (typeof element[0].createShadowRoot === 'function' && (Styleguide.config && Styleguide.config.data && !Styleguide.config.data.disableEncapsulation)) {
if (typeof element[0].attachShadow === 'function' && (Styleguide.config && Styleguide.config.data && !Styleguide.config.data.disableEncapsulation)) {
angular.element(element[0]).empty();
var root = angular.element(element[0].createShadowRoot());
var root = angular.element(element[0].attachShadow({
mode: 'open'
}));
root.append($templateCache.get(USER_STYLES_TEMPLATE));
transclude(function(clone) {
root.append(clone);
Expand Down
37 changes: 20 additions & 17 deletions test/angular/unit/directives/shadowDom.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe('shadowDom directive', function() {

var $scope, elem, shadowRoot, originalCreateShadowRoot, result,
var $scope, elem, shadowRoot, originalAttachShadow, result,
styleguideMock,
userStyleTemplate = '<style>@import(\'style.css\');</style>',
html = '<shadow-dom><p>hi!</p></shadow-dom>';
Expand All @@ -16,9 +16,9 @@ describe('shadowDom directive', function() {
$provide.value('Styleguide', styleguideMock);
}));

describe('when Element.createShadowRoot is a function', function() {
before(mockCreateShadowRoot);
after(restoreCreateShadowRoot);
describe('when Element.attachShadow is a function', function() {
before(mockAttachShadow);
after(restoreAttachShadow);
beforeEach(create);

it('creates a shadow root', function() {
Expand All @@ -34,9 +34,9 @@ describe('shadowDom directive', function() {
});
});

describe('when Element.createShadowRoot is a not a function', function() {
before(disableCreateShadowRoot);
after(restoreCreateShadowRoot);
describe('when Element.attachShadow is a not a function', function() {
before(disableAttachShadow);
after(restoreAttachShadow);
beforeEach(create);

it('does not create a shadow root', function() {
Expand Down Expand Up @@ -71,23 +71,26 @@ describe('shadowDom directive', function() {
});
});

function mockCreateShadowRoot() {
originalCreateShadowRoot = Element.prototype.createShadowRoot;
if (typeof Element.prototype.createShadowRoot !== 'function') {
Element.prototype.createShadowRoot = function() {
function mockAttachShadow() {
originalAttachShadow = Element.prototype.attachShadow;
if (typeof Element.prototype.attachShadow !== 'function') {
Element.prototype.attachShadow = function(shadowRootInit) {
shadowRoot = document.createElement('div');
return shadowRoot;
if (shadowRootInit.mode === 'open') {
return shadowRoot;
}
return null;
};
}
}

function disableCreateShadowRoot() {
originalCreateShadowRoot = Element.prototype.createShadowRoot;
Element.prototype.createShadowRoot = undefined;
function disableAttachShadow() {
originalAttachShadow = Element.prototype.attachShadow;
Element.prototype.attachShadow = undefined;
}

function restoreCreateShadowRoot() {
Element.prototype.createShadowRoot = originalCreateShadowRoot;
function restoreAttachShadow() {
Element.prototype.attachShadow = originalAttachShadow;
}

function create() {
Expand Down