This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge pull request #17 from rstacruz/patch-1

Load jQuery from global namespace first
  • Loading branch information...
2 parents 499d223 + 131db4b commit e43326647388b345e659335846bd6f60f15cc10e @kossnocorp committed Jan 22, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/jquery.turbolinks.coffee
@@ -8,7 +8,7 @@
Copyright (c) 2012 Sasha Koss
###
-$ = require?('jquery') || window.jQuery
+$ = window.jQuery or require?('jquery')
# List for store callbacks passed to `$` or `$.ready`
callbacks = []

0 comments on commit e433266

Please sign in to comment.