Skip to content

Infinit loading #7

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
Kaos64 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Infinit loading #7

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5824ebe
Infinit loading : npm ls return various format depending of node_mod…
Nov 3, 2017
8d4730b
bug correction
Nov 3, 2017
a8e5018
keep indentation
Nov 3, 2017
c04bcea
Update indentation
Nov 3, 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
17 changes: 16 additions & 1 deletion js/helpers/PackageHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,21 @@ var PackageHelpers = (function () {
_this.scope.$root.packages[key.name] = packInfo;
});
};
PackageHelpers.prototype._extractNpmVersion = function(name, pkg) {
var version = undefined;
if (pkg.version) {
version = pkg.version;
} else if (pkg.peerMissing) {
version = pkg.required.version;
} else if (pkg.missing) {
version = '0'; //pkg.required;
} else {
version = '0';
console.warn(`Unknown format : ${name}`, pkg);
}

return version;
};
PackageHelpers.prototype.getInstalledPackagesFromFile = function (packageManager, filePath, callback) {
var _this = this;
if (packageManager === 'npm') {
Expand All @@ -230,7 +245,7 @@ var PackageHelpers = (function () {
new NpmService_1.NpmService().getInstalledPackagesFromFile(filePath, function (result) {
if (result !== undefined && result !== null) {
$.each(result.dependencies, function (key, val) {
_this.addToInstalledPackages(key, val.version, true, false);
_this.addToInstalledPackages(key, _this._extractNpmVersion(key, val), true, false);
});
}
setTimeout(function () {
Expand Down