Skip to content

Commit

Permalink
Fixed Firefox Network Error issue when updating multiple plugins/them…
Browse files Browse the repository at this point in the history
…es at concurrently (fixes #1301)
  • Loading branch information
w00fz committed Feb 12, 2017
1 parent 93e1927 commit b5384a4
Show file tree
Hide file tree
Showing 6 changed files with 199 additions and 287 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v1.2.12
## XX/XX/2017

1. [](#bugfix)
* Fixed Firefox Network Error issue when updating multiple plugins/themes at concurrently [#1301](https://github.com/getgrav/grav-plugin-admin/issues/1301)

# v1.2.11
## 02/10/2017

Expand Down
9 changes: 5 additions & 4 deletions themes/grav/app/utils/packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import $ from 'jquery';
import { config, translations } from 'grav-config';
import request from '../utils/request';
import { Instance as gpm } from '../utils/gpm';
import { Promise } from 'es6-promise';

class Sorter {
getElements(elements, container) {
Expand Down Expand Up @@ -247,15 +248,15 @@ class Packages {
installPackages(type, slugs, callbackSuccess) {
let url = Packages.getInstallPackageUrl(type);

slugs.forEach((slug) => {
request(url, {
Promise.all(slugs.map((slug) => {
return request(url, {
method: 'post',
body: {
package: slug,
type: type
}
}, callbackSuccess);
});
});
})).then(callbackSuccess);

}

Expand Down
37 changes: 22 additions & 15 deletions themes/grav/js/admin.min.js

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions themes/grav/js/vendor.min.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion themes/grav/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"dropzone": "^4.3.0",
"eonasdan-bootstrap-datetimepicker": "^4.17.43",
"es6-map": "^0.1.4",
"es6-promise": "^4.0.5",
"gemini-scrollbar": "^1.4.3",
"immutable": "^3.8.1",
"immutablediff": "^0.4.3",
Expand All @@ -32,7 +33,7 @@
"speakingurl": "^10.0.0",
"toastr": "^2.1.2",
"watchjs": "0.0.0",
"whatwg-fetch": "^1.0.0"
"whatwg-fetch": "^2.0.2"
},
"devDependencies": {
"babel-core": "^6.18.2",
Expand Down
Loading

1 comment on commit b5384a4

@flaviocopes
Copy link
Contributor

Choose a reason for hiding this comment

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

Oh yes

Please sign in to comment.