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.

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

Fix compatibility with $.noConflict(true) #187

Merged
merged 1 commit into from
Feb 4, 2014
Merged

Fix compatibility with $.noConflict(true) #187

merged 1 commit into from
Feb 4, 2014

Conversation

Lendar
Copy link
Contributor

@Lendar Lendar commented Feb 4, 2014

Replace: window.jQueryjQuery

Rationale is well described here in twbs/bootstrap#10038

TL;DR: window.jQuery breaks browserify/webpack/etc. jQuery doesn't.

Notes:

Replace: `window.jQuery` → `jQuery`

Rationale is well described here in twbs/bootstrap#10038

TL;DR: `window.jQuery` breaks browserify/webpack/etc. `jQuery` doesn't.

Notes:

- it's a copy of daguej/bootstrap@f140084
- it should not break 58bfb22 (Alert in console, that Fotorama requires jQuery 1.8)
artpolikarpov added a commit that referenced this pull request Feb 4, 2014
Fix compatibility with `$.noConflict(true)`
@artpolikarpov artpolikarpov merged commit 7f62f59 into artpolikarpov:master Feb 4, 2014
@artpolikarpov
Copy link
Owner

Nice work, thanks! Next time, please submit a pull request into develop branch, not master.

@Lendar
Copy link
Contributor Author

Lendar commented Feb 4, 2014

Sure.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants