-
Notifications
You must be signed in to change notification settings - Fork 130
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.
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
clone global stylesheet elements into root for shadowdom support #223
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -312,31 +312,10 @@ | |
this.$.loader.create(this.type, this.$.chartdiv) | ||
.then(function(chart) { | ||
|
||
// get all gchart stylesheets | ||
var stylesheets = | ||
Polymer.dom(document.head) | ||
.querySelectorAll('link[rel="stylesheet"][type="text/css"]'); | ||
var gchartStylesheets = Array.from(stylesheets).filter( | ||
function(element) { | ||
return element.id.indexOf('load-css-') == 0; | ||
}); | ||
|
||
// clone necessary attributes | ||
var clonedSheets = gchartStylesheets.map( | ||
function(stylesheet) { | ||
var link = document.createElement('link'); | ||
link.setAttribute('rel', 'stylesheet'); | ||
link.setAttribute('type', 'text/css'); | ||
link.setAttribute('href', stylesheet.getAttribute('href')); | ||
return link; | ||
} | ||
); | ||
|
||
// append them to this local dom (for sdom support) | ||
clonedSheets.forEach( | ||
function(stylesheet) { | ||
Polymer.dom(this.$.styles).appendChild(stylesheet); | ||
}.bind(this)); | ||
// only add link stylesheet elements if there are none already | ||
if (!this.$.styles.children.length) { | ||
this._localizeGlobalStylesheets(); | ||
} | ||
|
||
var loader = this.$.loader; | ||
Object.keys(this.events.concat(['select', 'ready']) | ||
|
@@ -497,6 +476,33 @@ | |
.then(function(dataView) { | ||
this._dataView = dataView; | ||
}.bind(this)); | ||
}, | ||
|
||
/** | ||
* Queries global document head for google charts link#load-css-* and clones | ||
* them into the local root's div#styles element for shadow dom support. | ||
*/ | ||
_localizeGlobalStylesheets: function() { | ||
// get all gchart stylesheets | ||
var stylesheets = Polymer.dom(document.head) | ||
.querySelectorAll('link[rel="stylesheet"][type="text/css"]'); | ||
|
||
var stylesheetsArray = Array.from(stylesheets); | ||
|
||
for (var i = 0; i < stylesheetsArray.length; i++) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. .forEach should be safe for both Array and NodeList There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh not for IE11 though maybe? |
||
var sheetLinkEl = stylesheetsArray[i]; | ||
var isGchartStylesheet = sheetLinkEl.id.indexOf('load-css-') == 0; | ||
|
||
if (isGchartStylesheet) { | ||
// clone necessary stylesheet attributes | ||
var clonedLinkEl = document.createElement('link'); | ||
clonedLinkEl.setAttribute('rel', 'stylesheet'); | ||
clonedLinkEl.setAttribute('type', 'text/css'); | ||
clonedLinkEl.setAttribute('href', sheetLinkEl.getAttribute('href')); | ||
|
||
Polymer.dom(this.$.styles).appendChild(clonedLinkEl); | ||
} | ||
} | ||
} | ||
}); | ||
})(); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think my version in #204 handles some edge cases a little better.
https://github.com/GoogleWebComponents/google-chart/pull/204/files#diff-d0b4f475ae2630d8efc01169d1a41af6R80
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I merged this on behalf of an internal request from a blocked user. I'd 100% be willing to review your import CL over this implementation.