Skip to content
This repository has been archived by the owner on Dec 23, 2017. It is now read-only.

jQuery 3.2.1 #1986

Merged
merged 4 commits into from
May 10, 2017
Merged

jQuery 3.2.1 #1986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9560a79
jQuery 3.2.1
Apr 26, 2017
eaa6f07
Replace then() with done()
May 1, 2017
58c25b2
fec-style 11.0.0
May 10, 2017
45d9cb4
Merge branch 'develop' into feature/jquery-upgrade
May 10, 2017
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@
"datatables.net": "1.10.10",
"datatables.net-responsive": "2.0.1",
"es6-weak-map": "2.0.1",
"fec-style": "10.1.1",
"fec-style": "11.0.0",
"glossary-panel": "1.0.0",
"handlebars": "^4.0.5",
"hbsfy": "2.2.1",
"intl": "1.0.0-rc-4",
"jquery": "2.2.4",
"jquery": "3.2.1",
"jquery.inputmask": "3.2.7",
"keyboardjs": "0.4.2",
"leaflet": "0.7.7",
Expand Down
2 changes: 1 addition & 1 deletion static/js/modules/download.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ DownloadItem.prototype.refresh = function() {
contentType: 'application/json',
dataType: 'json'
});
this.promise.then(this.handleSuccess.bind(this));
this.promise.done(this.handleSuccess.bind(this));
Copy link
Contributor

Choose a reason for hiding this comment

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

Interesting, this required a change to done? In reading the guide I would've thought then would still be preferred as that is the new way forward with the Deferred object changes. It appears we're still using the old style, though, according to this part, which would make sense given this change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, I was confused about this too. But there was an issue with the wrong context not being passed and this solution fixed it. Since it's a test and not a feature, seemed ok to just leave it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sounds good to me! Should we work in the fec-style version bump in this PR to just ensure full testing of the updates?

Copy link
Contributor Author

@noahmanger noahmanger May 10, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Sounds good.

this.promise.fail(this.handleError.bind(this));
};

Expand Down