Skip to content

Handle cases where the postMessage is not a valid json #23

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle cases where the postMessage is not a valid json #23

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
d925484
Handle cases where the postMessage is not a valid json
kwadwo Mar 24, 2017
d0d036e
checking for parent
kwadwo May 17, 2017
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
16 changes: 11 additions & 5 deletions bin/VPAIDHTML5Client.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/VPAIDHTML5Client.js.map
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion js/VPAIDHTML5Client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,12 @@ VPAIDHTML5Client.prototype.loadAdUnit = function loadAdUnit(adURL, callback) {
/*jshint validthis: false */
//don't clear timeout
if (e.origin !== getOrigin()) return;
var result = JSON.parse(e.data);

try {
var result = JSON.parse(e.data);
} catch (e) {
return;
}

//don't clear timeout
if (result.id !== that.getID()) return;
Expand Down
4 changes: 3 additions & 1 deletion js/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ function callbackTimeout(timer, onSuccess, onTimeout) {
* @param {string} id
*/
function createElementInEl(parent, tagName, id) {
if (typeof parent === 'undefined') {
return;
}
var nEl = document.createElement(tagName);
if (id) nEl.id = id;
parent.appendChild(nEl);
Expand Down Expand Up @@ -177,4 +180,3 @@ module.exports = {
extend: extend,
unique: unique
};