Fixed jQuery conflict by using 1.5 with noConflict().

rlr · Feb 20, 2011 · 9ab016f · 9ab016f
1 parent 40fb582
commit 9ab016f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -8,8 +8,10 @@ pageMod.PageMod({
     contentScriptWhen: 'ready',
     contentScriptFile: data.url('jquery-1.5.min.js'),
     contentScript:
-        'onMessage = function onMessage(script) { eval(script); };' +
-        'postMessage(document.URL); console.log(jQuery.fn.jquery);',
+        '(function($) {' +
+            'onMessage = function onMessage(script) { eval(script); };' +
+            'postMessage(document.URL);' +
+        '}(jQuery.noConflict()));',
     onAttach: function onAttach(worker) {
         worker.on('message', function(data) {
             var domain = url.URL(data).host;