Skip to content

Commit

Permalink
Don't call noConflict by default when loaded via AMD.
Browse files Browse the repository at this point in the history
Calling noConflict() makes it a pain to load the plugins, which depend on the
global variable (which is why jQuery's AMD handler, for example, doesn't do
that). For those that want noConflict(), that can be done with a wrapper (see
http://requirejs.org/docs/jquery.html#noconflictmap)
  • Loading branch information
russell-stripe committed Dec 3, 2013
1 parent 865c081 commit 190d9e6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion template/_footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ window.Raven = Raven;

// AMD
if (typeof define === 'function' && define.amd) {
define('raven', [], function() { return Raven.noConflict(); });
define('raven', [], function() { return Raven; });
}

})(window);

0 comments on commit 190d9e6

Please sign in to comment.