Merge pull request #165 from russelldavis/remove-no-conflict

mattrobenolt · mattrobenolt · commit d81942a5c3db · 2013-12-12T08:43:28.000-08:00
Don't call noConflict by default when loaded via AMD.
diff --git a/template/_footer.js b/template/_footer.js
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ window.Raven = Raven;`
`3`	`3`
`4`	`4`	`// AMD`
`5`	`5`	`if (typeof define === 'function' && define.amd) {`
`6`		`- define('raven', [], function() { return Raven.noConflict(); });`
	`6`	`+ define('raven', [], function() { return Raven; });`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`})(window);`