Skip to content

Commit 54ff7fc

Browse files
Merge pull request #42 from PixelsCommander/demo-ff-safari-fix
IE fix
2 parents 7c0dd54 + f65cf16 commit 54ff7fc

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

dist/htmlgl.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8742,7 +8742,7 @@ will produce an inaccurate conversion value. The same issue exists with the cx/c
87428742

87438743
p.createdCallback = function () {
87448744
//Checking is node created inside of html2canvas virtual window or not. We do not need WebGL there
8745-
var isInsideHtml2Canvas = this.baseURI.length === 0;
8745+
var isInsideHtml2Canvas = this.baseURI !== undefined && this.baseURI.length === 0;
87468746

87478747
if (!isInsideHtml2Canvas) {
87488748
HTMLGL.elements.push(this);
@@ -8769,7 +8769,7 @@ will produce an inaccurate conversion value. The same issue exists with the cx/c
87698769
this.patchStyleGLTransform();
87708770
}
87718771

8772-
//Updateing bounds, waiting for all images to load and calling rasterization then
8772+
//Updating bounds, waiting for all images to load and calling rasterization then
87738773
p.updateTexture = function () {
87748774
var self = this;
87758775
self.updateBoundingRect();

dist/htmlgl.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

page/js/effects.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ window.addEventListener('DOMContentLoaded', function(){
1414
displacementFolder.add(filtersSwitchs, '0').name("apply");
1515
displacementFolder.add(displacementFilter.scale, 'x', 1, 200).name("scaleX");
1616
displacementFolder.add(displacementFilter.scale, 'y', 1, 200).name("scaleY");
17+
displacementFolder.open();
1718

1819
var blurFilter = new PIXI.BlurFilter();
1920

page/js/htmlgl.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/gl-element.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
p.createdCallback = function () {
2121
//Checking is node created inside of html2canvas virtual window or not. We do not need WebGL there
22-
var isInsideHtml2Canvas = this.baseURI.length === 0;
22+
var isInsideHtml2Canvas = this.baseURI !== undefined && this.baseURI.length === 0;
2323

2424
if (!isInsideHtml2Canvas) {
2525
HTMLGL.elements.push(this);
@@ -46,7 +46,7 @@
4646
this.patchStyleGLTransform();
4747
}
4848

49-
//Updateing bounds, waiting for all images to load and calling rasterization then
49+
//Updating bounds, waiting for all images to load and calling rasterization then
5050
p.updateTexture = function () {
5151
var self = this;
5252
self.updateBoundingRect();

0 commit comments

Comments
 (0)