Skip to content

Partial Fix for Code Panel Toggle JS Errors on Master #906

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

Merged
merged 2 commits into from
Aug 3, 2018
Merged

Partial Fix for Code Panel Toggle JS Errors on Master #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c16675
fix: check to make sure the code panel-related <script> tag contains …
bolt-bot Jul 22, 2018
35c5726
fix: change const back to var since PL's Uikit JS isn't run through B…
bolt-bot Jul 28, 2018
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
1 change: 1 addition & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
packages/core/scripts/api.handlebars
packages/core/scripts/events.handlebars
packages/core/test/files/annotations.js
**/uikit-workshop/src/js/**/*
33 changes: 23 additions & 10 deletions packages/uikit-workshop/src/js/modal-styleguide.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,29 @@ var modalStyleguide = {
* @param {Boolean} if the text in the dropdown should be switched
*/
collectAndSend: function(el, iframePassback, switchText) {
var patternData = JSON.parse(el.innerHTML);
if (patternData.patternName !== undefined) {
patternMarkupEl = document.querySelector(
'#' + patternData.patternPartial + ' > .pl-js-pattern-example'
);
patternData.patternMarkup =
patternMarkupEl !== null
? patternMarkupEl.innerHTML
: document.querySelector('body').innerHTML;
modalStyleguide.patternQueryInfo(patternData, iframePassback, switchText);
/**
* Verify <script> tag has JSON data available (not just whitespace) - helps prevents JS errors from
* getting thrown when certain script tags aren't rendered with partial.patternData content.
*/
if (/\S/.test(el.innerHTML)) {
var patternData = JSON.parse(el.innerHTML);
if (patternData.patternName !== undefined) {
patternMarkupEl = document.querySelector(
'#' + patternData.patternPartial + ' > .pl-js-pattern-example'
);
patternData.patternMarkup =
patternMarkupEl !== null
? patternMarkupEl.innerHTML
: document.querySelector('body').innerHTML;
modalStyleguide.patternQueryInfo(
patternData,
iframePassback,
switchText
);
}
} else {
// @todo: how are we handling conditional logging for debugging based on the dev environment?
// console.log('This <script> tag\'s JSON is empty for some reason...');
}
},

Expand Down