Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@

## 4.0.0 - unreleased

- Runs now on jQuery 3
Features
~~~~~~~~

- Runs now on jQuery 3.
- Integrated pat-display-time from https://github.com/ploneintranet/pat-display-time
- fix minimum input length default so that you can display select results already on click

Fixes
~~~~~

- Fix heisenbug with pat-scroll on testruns.
- Fix minimum input length default so that you can display select results already on click.


## 3.0.0a5 - unreleased

Expand Down
12 changes: 6 additions & 6 deletions src/pat/scroll/tests.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(["pat-scroll", "imagesloaded"], function(Pattern, imagesLoaded) {
define(["pat-scroll"], function(Pattern) {

describe("pat-scroll", function() {

Expand All @@ -17,7 +17,6 @@ define(["pat-scroll", "imagesloaded"], function(Pattern, imagesLoaded) {
].join("\n"));
var spy_animate = spyOn($.fn, 'animate');
Pattern.init($(".pat-scroll"));
imagesLoaded($("body"));
setTimeout(function () {
expect(spy_animate).toHaveBeenCalled();
done();
Expand All @@ -41,11 +40,13 @@ define(["pat-scroll", "imagesloaded"], function(Pattern, imagesLoaded) {
var $el = $(".pat-scroll");
var spy_animate = spyOn($.fn, 'animate');
Pattern.init($el);
imagesLoaded($("body"));
setTimeout(function() {
$el.click();
expect(spy_animate).toHaveBeenCalled();
done();
setTimeout(function() {
// wait for scrolling via click to be done.
expect(spy_animate).toHaveBeenCalled();
done();
}, 2000);
}, 2000);

});
Expand All @@ -58,7 +59,6 @@ define(["pat-scroll", "imagesloaded"], function(Pattern, imagesLoaded) {
var $el = $(".pat-scroll");
var spy_animate = spyOn($.fn, 'animate');
Pattern.init($el);
imagesLoaded($("body"));
$el.trigger("pat-update", {
'pattern': "stacks",
'originalEvent': {
Expand Down