Skip to content
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.

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

Nested 'then' not working properly. Fixed #197

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
4 changes: 3 additions & 1 deletion lib/sammy.js
Original file line number Diff line number Diff line change
Expand Up @@ -1551,9 +1551,11 @@ $.extend(Sammy.DefaultLocationProxy.prototype , {
}
var context = this;
if (this.waiting) {
this.callbacks.push(callback);
this.callbacks.splice(this.inAThen,0,callback);
this.inAThen++;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we translate the push() to an splice() at the highest index inside this nested then

} else {
this.wait();
this.inAThen = 0;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we re-initialize inAThen to 0, to allow nested thens to be the first at queue.

window.setTimeout(function() {
var returned = callback.apply(context, [context.content, context.previous_content]);
if (returned !== false) {
Expand Down