Skip to content

Fixed integration with django js i18n #802

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
jpic merged 3 commits into from
Feb 23, 2017
Merged

Fixed integration with django js i18n #802

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
776ef1e
Fixed integration with django js i18n
italomaia Feb 22, 2017
25cc4f5
Adding Italo Maia to authors
italomaia Feb 22, 2017
49b43af
Merge pull request #1 from italomaia/patch-2
italomaia Feb 22, 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
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ documentation to the project.
- Helen Sherwood-Taylor
- Ian Leith
- Igor Mitrenko
- Italo Maia
- Ivan Metzlar
- James Pic
- Jonas Haag
Expand Down
2 changes: 1 addition & 1 deletion src/dal/static/autocomplete_light/jquery.init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var yl = yl || {};

if (yl.jQuery === undefined) {
if (typeof django !== 'undefined')
if ((typeof django !== 'undefined') && (typeof django.jQuery !== 'undefined'))
yl.jQuery = django.jQuery;

else if (typeof $ !== 'undefined')
Expand Down