Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

.noConflict() support #3

Merged
merged 1 commit into from

2 participants

@scottgonzalez

There were a few references to jQuery as jQuery, not $, inside the closure.

@wycats wycats merged commit 459f4e4 into wycats:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 10, 2010
  1. @scottgonzalez

    .noConflict() support.

    scottgonzalez authored
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/jquery.offline.js
View
6 lib/jquery.offline.js
@@ -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) {
Something went wrong with that request. Please try again.