Skip to content

Fix undefined object errors when loading assets in workers #15012

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 3 commits into from
Oct 9, 2018
Merged

Fix undefined object errors when loading assets in workers #15012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e2dcbd
Use image.src if HTMLCanvasElement is undefined
jbaicoianu Sep 28, 2018
31f81c6
Remove unnecessary window references
jbaicoianu Oct 5, 2018
9d57a0d
Fixed else if
jbaicoianu Oct 9, 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
6 changes: 5 additions & 1 deletion src/extras/ImageUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ var ImageUtils = {

var canvas;

if ( image instanceof HTMLCanvasElement ) {
if ( typeof HTMLCanvasElement == 'undefined' ) {

return image.src;

} else if ( image instanceof HTMLCanvasElement ) {

canvas = image;

Expand Down
8 changes: 4 additions & 4 deletions src/loaders/FileLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ Object.assign( FileLoader.prototype, {
var isBase64 = !! dataUriRegexResult[ 2 ];
var data = dataUriRegexResult[ 3 ];

data = window.decodeURIComponent( data );
data = decodeURIComponent( data );

if ( isBase64 ) data = window.atob( data );
if ( isBase64 ) data = atob( data );

try {

Expand Down Expand Up @@ -126,7 +126,7 @@ Object.assign( FileLoader.prototype, {
}

// Wait for next browser tick like standard XMLHttpRequest event dispatching does
window.setTimeout( function () {
setTimeout( function () {

if ( onLoad ) onLoad( response );

Expand All @@ -137,7 +137,7 @@ Object.assign( FileLoader.prototype, {
} catch ( error ) {

// Wait for next browser tick like standard XMLHttpRequest event dispatching does
window.setTimeout( function () {
setTimeout( function () {

if ( onError ) onError( error );

Expand Down