diff --git a/dist/desktop b/dist/desktop index adc9f85dd7d2667389bf179950f1ba9e2781c9aa..2442ab64994614a0eeabf76efbc95cbb7288556c 160000 --- a/dist/desktop +++ b/dist/desktop @@ -1 +1 @@ -Subproject commit adc9f85dd7d2667389bf179950f1ba9e2781c9aa +Subproject commit 2442ab64994614a0eeabf76efbc95cbb7288556c diff --git a/gulpfile.js b/gulpfile.js index e6f87aec34bcdcf146fa5158ec5b0e9e5390f91a..54afdd4c67e810ed76c2bc7cdcd70e5cc1df12fe 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1403,8 +1403,7 @@ const webExtBuild = gulp.series( --------------------------------------------------------------------------*/ exports.help = help; -exports.config = appConfig; -exports.configTest = appConfigTest; +exports.config = config; exports.license = appLicense; exports.sass = appAndPluginSass; exports.translate = translate; diff --git a/www/js/controllers/feed-controllers.js b/www/js/controllers/feed-controllers.js index 69b970c36d90713ab28b72b3d40fc93da56646e9..1efe5964348fd480a8bda1544f26f0786c7d614d 100644 --- a/www/js/controllers/feed-controllers.js +++ b/www/js/controllers/feed-controllers.js @@ -106,7 +106,7 @@ function FeedController($scope, $timeout, $http, $translate, $q, csConfig, csHtt // Migrate from old version 1.0 to 1.1 if (feed.version === 'https://jsonfeed.org/version/1') { if (feed.author && !feed.authors) { - feed.authors = [feed.author] + feed.authors = [feed.author]; delete feed.author; } (feed.items || []).forEach(function (item) { diff --git a/www/js/services/device-services.js b/www/js/services/device-services.js index 71f34ad2f4b545bdbabe8e47ae8caa2c04bf4a60..deb32a42f3c258e5e5e7ce3189b26694f9bae420 100644 --- a/www/js/services/device-services.js +++ b/www/js/services/device-services.js @@ -182,7 +182,7 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti case 'none': return 'none'; default: - return 'unknown' + return 'unknown'; } } catch (err) { console.error('[device] Cannot get connection type: ' + (err && err.message || err), err);