Skip to content

Make infiniScroll work if $ is not jQuery compatible. #15

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
fojas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make infiniScroll work if $ is not jQuery compatible. #15

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: 2 additions & 2 deletions lib/infiniScroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// MIT license
// Version 0.3

(function() {
(function($) {
Backbone.InfiniScroll = function(collection, options) {
options = options || { };

Expand Down Expand Up @@ -120,4 +120,4 @@

return self;
};
})( );
})( this.jQuery || this.Zepto || this.$ );
53 changes: 53 additions & 0 deletions spec/SpecRunnerZepto.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<title>Jasmine Spec Runner</title>

<link rel="stylesheet" type="text/css" href="jasmine.css">

<script type="text/javascript" src="jasmine.js"></script>
<script type="text/javascript" src="jasmine-html.js"></script>

<script type="text/javascript" src="vender/zepto.min.js"></script>
<script type="text/javascript" src="vender/underscore-min.js"></script>
<script type="text/javascript" src="vender/backbone-min.js"></script>

<script type="text/javascript" src="../lib/infiniScroll.js"></script>

<script type="text/javascript" src="infiniScroll_spec.js"></script>

<script type="text/javascript">
(function() {
var jasmineEnv = jasmine.getEnv();
jasmineEnv.updateInterval = 1000;

var htmlReporter = new jasmine.HtmlReporter();

jasmineEnv.addReporter(htmlReporter);

jasmineEnv.specFilter = function(spec) {
return htmlReporter.specFilter(spec);
};

var currentWindowOnload = window.onload;

window.onload = function() {
if (currentWindowOnload) {
currentWindowOnload();
}
execJasmine();
};

function execJasmine() {
jasmineEnv.execute();
}

})();
</script>

</head>

<body>
</body>
</html>
2 changes: 1 addition & 1 deletion spec/infiniScroll_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ describe("InfiniScroll", function() {
var event;

beforeEach(function() {
event = jQuery.Event("scroll");
event = $.Event("scroll");
spyOn(collection, "fetch");
});

Expand Down
Loading