From 52d2482bb220d7e548ab6de9201cae7552d6808b Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Wed, 9 Aug 2023 17:58:05 +0200
Subject: [PATCH] fix(js): fix JS compilation error
---
www/js/platform.js | 4 ++--
www/js/services/bma-services.js | 41 +++++++++++++--------------------
2 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/www/js/platform.js b/www/js/platform.js
index 0d8c9121b..4a288974e 100644
--- a/www/js/platform.js
+++ b/www/js/platform.js
@@ -226,10 +226,10 @@ angular.module('cesium.platform', ['ngIdle', 'cesium.config', 'cesium.services']
// Try to find the current peer in synchronized peers
var synchronized = false;
peers = peers && _.filter(peers, function(peer) {
- if (BMA.url !== peer.url) return true
+ if (BMA.url !== peer.url) return true;
synchronized = true;
return false;
- })
+ });
// Saving other peers to settings
console.debug("[platform] Saving {0} BMA peers in settings, for a later use".format(peers.length));
diff --git a/www/js/services/bma-services.js b/www/js/services/bma-services.js
index 0c6c38a4f..1f5cbba5f 100644
--- a/www/js/services/bma-services.js
+++ b/www/js/services/bma-services.js
@@ -1072,40 +1072,29 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
};
// Define get latest release (or fake function is no URL defined)
- var duniterLatestReleaseUrl = csSettings.data.duniterLatestReleaseUrl && csHttp.uri.parse(csSettings.data.duniterLatestReleaseUrl);
- exports.raw.getLatestRelease =
- duniterLatestReleaseUrl ?
- $q(function(resolve, reject) {
- $http.get(csSettings.data.duniterLatestReleaseUrl, {
- timeout: csConfig.timeout,
- responseType: 'json',
- headers: {
- 'X-Requested-With': 'XMLHttpRequest'
- }
- }).success(resolve).error(reject)
- })
- // csHttp.getWithCache(duniterLatestReleaseUrl.host,
- // duniterLatestReleaseUrl.port,
- // "/" + duniterLatestReleaseUrl.pathname,
- // /*useSsl*/ (+(duniterLatestReleaseUrl.port) === 443 || duniterLatestReleaseUrl.protocol === 'https:' || that.forceUseSsl),
- // csCache.constants.LONG
- // )
- :
- // No URL define: use a fake function
- function() {
+ if (csSettings.data.duniterLatestReleaseUrl) {
+ var releaseUri = csHttp.uri.parse(csSettings.data.duniterLatestReleaseUrl);
+ var releaseUriUseSsl = releaseUri.port == 443 || releaseUri.protocol === 'https:' || that.forceUseSsl;
+ exports.raw.getLatestRelease = csHttp.getWithCache(releaseUri.host, releaseUri.port, "/" + releaseUri.pathname, releaseUriUseSsl,
+ csCache.constants.LONG);
+ }
+ // No URL define: use a fake function
+ else {
+ exports.raw.getLatestRelease = function() {
return $q.when();
};
+ }
exports.version.latest = function() {
return exports.raw.getLatestRelease()
.then(function (json) {
if (!json) return;
- // Gitlab release.json (used since Duniter 1.8)
+ // Gitlab
if (Array.isArray(json)) {
var releaseVersion = _.find(json, function(res) {
- return res.tag&& res.description && res.description.contains(':white_check_mark: Release\n');
- })
+ return res.tag && res.description && res.description.contains(':white_check_mark: Release\n');
+ });
if (releaseVersion) {
var version = releaseVersion.tag.startsWith('v') ? releaseVersion.tag.substring(1) : releaseVersion.tag;
var url = (csSettings.data.duniterLatestReleaseUrl.endsWith('.json') ?
@@ -1114,9 +1103,11 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
return {
version: version,
url: url
- }
+ };
}
}
+
+ // Github
if (json.name && json.html_url) {
return {
version: json.name,
--
GitLab