Skip to content

Explicitly require jquery in kanso. Fixes kanso/db#12. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mgmarino wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −10
Open

Explicitly require jquery in kanso. Fixes kanso/db#12. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ Add `db` to your dependencies section in `kanso.json`.

> run `kanso install` to fetch the package

You also need __jQuery__ to be included on your page, since this module uses
jQuery.ajax to make requests.


### Events

The db module is an EventEmitter. See the
Expand Down
11 changes: 6 additions & 5 deletions db.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@


var events = require('events'),
_ = require('underscore')._;
_ = require('underscore')._,
jQuery = require('jquery');


/**
Expand Down Expand Up @@ -62,17 +63,17 @@ var httpData = function (xhr, type, s) {
data = xml ? xhr.responseXML : xhr.responseText;

if (xml && data.documentElement.nodeName === "parsererror") {
$.error("parsererror");
jQuery.error("parsererror");
}
if (s && s.dataFilter) {
data = s.dataFilter(data, type);
}
if (typeof data === "string") {
if (type === "json" || !type && ct.indexOf("json") >= 0) {
data = $.parseJSON(data);
data = jQuery.parseJSON(data);
}
else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
$.globalEval(data);
jQuery.globalEval(data);
}
}
return data;
Expand Down Expand Up @@ -257,7 +258,7 @@ exports.stringifyQuery = function (query) {
exports.request = function (options, callback) {
options.complete = onComplete(options, callback);
options.dataType = 'json';
$.ajax(options);
jQuery.ajax(options);
};


Expand Down
3 changes: 2 additions & 1 deletion kanso.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"dependencies": {
"modules": null,
"underscore": ">=1.1.5",
"events": null
"events": null,
"jquery": null
}
}