Permalink
Browse files

Merge pull request #3 from scottgonzalez/24e5a20fb5539ceac380aa4844a0…

…cef78b689ca2

.noConflict() support
  • Loading branch information...
wycats committed Jan 16, 2013
2 parents b2139ff + 24e5a20 commit 459f4e4ef22c2d18ecaa1687dbb83255a255782b
Showing with 4 additions and 4 deletions.
  1. +4 −4 lib/jquery.offline.js
View
@@ -41,7 +41,7 @@
// modified getJSON which uses ifModified: true
function getJSON(url, data, fn) {
- if (jQuery.isFunction(data)) {
+ if ($.isFunction(data)) {
fn = data;
data = null;
}
@@ -53,7 +53,7 @@
requesting[requestingKey] = true;
- return jQuery.ajax({
+ return $.ajax({
type: "GET",
url: url,
data: data,
@@ -96,7 +96,7 @@
// If the user goes offline, hide any loading bar
// the user may have created
$(window).bind("offline", function() {
- jQuery.event.trigger("ajaxStop");
+ $.event.trigger("ajaxStop");
});
$.retrieveJSON = function(url, data, fn) {
@@ -214,4 +214,4 @@
$.clearJSON = $.noop;
}
-})(jQuery);
+})(jQuery);

0 comments on commit 459f4e4

Please sign in to comment.