Skip to content
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

jsep is undefined fix #5601

Merged
merged 5 commits into from
Jul 10, 2017
Merged

jsep is undefined fix #5601

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d33682c
jsep undefined fix
czm-gabby Jul 7, 2017
c84e6fc
Updated CHANGES.md
czm-gabby Jul 7, 2017
0f4737e
Merge branch 'master' into define-jsep
czm-gabby Jul 7, 2017
4002ae2
Use noConflict jsep if it is defined
ggetz Jul 10, 2017
75aefd4
check for jsep being undefined
ggetz Jul 10, 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
3 changes: 2 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Change Log
==========

### 1.36 2017-08-01
### 1.36 - 2017-08-01

* Fixed a bug where a Model's compressed textures were not being displayed. [#5596](https://github.com/AnalyticalGraphicsInc/cesium/pull/5596)
* Fixed a bug where jsep was undefined when using webpack [#5593](https://github.com/AnalyticalGraphicsInc/cesium/issues/5593)

### 1.35 - 2017-07-05

Expand Down
6 changes: 5 additions & 1 deletion Source/ThirdParty/jsep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,5 +680,9 @@ define(function() {
}
}(this));

return jsep.noConflict();
if (typeof jsep.noConflict === 'function') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change this to if (typeof jsep !== 'undefined') { and remove the last return statement on line 687. I think that will finally do it. Add a comment to the if that mentions that jsep only exists when running in a browser, not Node.

return jsep.noConflict();
}

return jsep;
});