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

BUG: Fix version conflicts with Jupyter deps #694

Merged
merged 1 commit into from
Oct 31, 2018
Merged

BUG: Fix version conflicts with Jupyter deps #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions emperor/support_files/templates/logic-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
</div>

<script type="text/javascript">
requirejs.config({
// When running in the Jupyter notebook we've encountered version conflicts
// with some dependencies. So instead of polluting the global require context,
// we define a new context.
var emperorRequire = require.config({
'context': 'emperor',
// the left side is the module name, and the right side is the path
// relative to the baseUrl attribute, do NOT include the .js extension
'paths': {
Expand Down Expand Up @@ -94,7 +98,7 @@
}
});

requirejs(
emperorRequire(
["jquery", "model", "controller"],
function($, model, EmperorController) {
var DecompositionModel = model.DecompositionModel;
Expand Down
16 changes: 12 additions & 4 deletions tests/_test_core_strings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@
</div>

<script type="text/javascript">
requirejs.config({
// When running in the Jupyter notebook we've encountered version conflicts
// with some dependencies. So instead of polluting the global require context,
// we define a new context.
var emperorRequire = require.config({
'context': 'emperor',
// the left side is the module name, and the right side is the path
// relative to the baseUrl attribute, do NOT include the .js extension
'paths': {
Expand Down Expand Up @@ -165,7 +169,7 @@
}
});

requirejs(
emperorRequire(
["jquery", "model", "controller"],
function($, model, EmperorController) {
var DecompositionModel = model.DecompositionModel;
Expand Down Expand Up @@ -261,7 +265,11 @@
</div>

<script type="text/javascript">
requirejs.config({
// When running in the Jupyter notebook we've encountered version conflicts
// with some dependencies. So instead of polluting the global require context,
// we define a new context.
var emperorRequire = require.config({
'context': 'emperor',
// the left side is the module name, and the right side is the path
// relative to the baseUrl attribute, do NOT include the .js extension
'paths': {
Expand Down Expand Up @@ -351,7 +359,7 @@
}
});

requirejs(
emperorRequire(
["jquery", "model", "controller"],
function($, model, EmperorController) {
var DecompositionModel = model.DecompositionModel;
Expand Down