From eda4d18a9900ddac28a4345160f2854e9b62e7e7 Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Fri, 1 Sep 2023 08:56:51 +0100 Subject: [PATCH] Update licence headers --- www/css/app.css | 2 +- www/index.html | 4 ++-- www/js/app.js | 2 +- www/js/init.js | 2 +- www/js/lib/images.js | 23 +------------------ www/js/lib/uiUtil.js | 2 +- www/js/lib/updater.js | 53 +++++++++++++------------------------------ www/js/lib/utf8.js | 2 +- www/js/lib/util.js | 2 +- 9 files changed, 25 insertions(+), 67 deletions(-) diff --git a/www/css/app.css b/www/css/app.css index 804d1d9d..2acde14b 100644 --- a/www/css/app.css +++ b/www/css/app.css @@ -1,7 +1,7 @@ /*! * app.css : Main CSS of the application * - * Copyright 2013-2014 Mossroy and contributors + * Copyright 2013-2023 Mossroy, Jaifroid and contributors * License GPL v3: * * This file is part of Kiwix. diff --git a/www/index.html b/www/index.html index 1441f3be..7e1ffebf 100644 --- a/www/index.html +++ b/www/index.html @@ -18,7 +18,7 @@ Jaifroid - Adapted for UWP for Windows 10 and Windows Mobile 10, Electron, NWJS and PWA: Geoffrey Kantaris egk10@cam.ac.uk - Copyright 2013-2018 Mossroy, Peter-x, Jaifroid, sharun-s and contributors + Copyright 2013-2023 Jaifroid, Mossroy, Peter-x and contributors License GPL v3: This file is part of Kiwix. @@ -627,7 +627,7 @@

Licence information

- Copyright 2013-2019 Mossroy, Peter-x, Jaifroid, sharun-s and other contributors + Copyright 2013-2023 Jaifroid, Mossroy, Peter-x and other contributors
Jaifroid for adaptation and development of the app on the Universal Windows, Electron, NWJS and PWA Platforms

This application is licensed under the GPL v3 licence: diff --git a/www/js/app.js b/www/js/app.js index 917c1ef8..08413de3 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -2,7 +2,7 @@ * app.js : The main Kiwix User Interface implementation * This file handles the interaction between the Kiwix JS back end and the user * - * Copyright 2013-2023 Mossroy, Jaifroid and contributors + * Copyright 2013-2023 Jaifroid, Mossroy and contributors * License GPL v3: * * This file is part of Kiwix. diff --git a/www/js/init.js b/www/js/init.js index c92fb625..f026e99d 100644 --- a/www/js/init.js +++ b/www/js/init.js @@ -2,7 +2,7 @@ * init.js : Configuration for the app * This file sets the app's main parameters and variables * - * Copyright 2013-2023 Mossroy, Jaifroid and contributors + * Copyright 2013-2023 Jaifroid, Mossroy and contributors * License GPL v3: * * This file is part of Kiwix. diff --git a/www/js/lib/images.js b/www/js/lib/images.js index f5dff58d..f25a4ba7 100644 --- a/www/js/lib/images.js +++ b/www/js/lib/images.js @@ -1,28 +1,7 @@ /** * images.js : Functions for the processing of images * - * Copyright 2013-2019 Mossroy and contributors - * License GPL v3: - * - * This file is part of Kiwix. - * - * Kiwix is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Kiwix is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Kiwix (file LICENSE-GPLv3.txt). If not, see - */ -/** - * images.js : Functions for the processing of images - * - * Copyright 2013-2019 Mossroy and contributors + * Copyright 2013-2023 Jaifroid and contributors * License GPL v3: * * This file is part of Kiwix. diff --git a/www/js/lib/uiUtil.js b/www/js/lib/uiUtil.js index 057d9b88..8a068329 100644 --- a/www/js/lib/uiUtil.js +++ b/www/js/lib/uiUtil.js @@ -1,7 +1,7 @@ /** * uiUtil.js : Utility functions for the User Interface * - * Copyright 2013-2020 Mossroy and contributors + * Copyright 2013-2023 Mossroy, Jaifroid and contributors * License GPL v3: * * This file is part of Kiwix. diff --git a/www/js/lib/updater.js b/www/js/lib/updater.js index 4447857a..7016ddc9 100644 --- a/www/js/lib/updater.js +++ b/www/js/lib/updater.js @@ -1,49 +1,29 @@ /** * updater.js : Functions for checking and initiating app updates - * - * Copyright 2013-2022 Jaifroid, Mossroy and contributors + * + * Copyright 2013-2023 Jaifroid and contributors * License GPL v3: - * + * * This file is part of Kiwix. - * + * * Kiwix is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * Kiwix is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Kiwix (file LICENSE-GPLv3.txt). If not, see - */ - -/** - * updater.js : Functions for checking and initiating app updates - * - * Copyright 2013-2022 Jaifroid, Mossroy and contributors - * License GPL v3: - * - * This file is part of Kiwix. - * - * Kiwix is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Kiwix is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with Kiwix (file LICENSE-GPLv3.txt). If not, see */ 'use strict'; +/* global params */ + import uiUtil from './uiUtil.js'; /** @@ -55,20 +35,20 @@ params.updateServer = { }; // A RegExp prototype string to match the current app's releases -const baseApp = (params.packagedFile && /wikivoyage/.test(params.packagedFile)) ? 'wikivoyage' : - (params.packagedFile && /wikmed|mdwiki/.test(params.packagedFile)) ? 'wikimed' : - 'windows|electron|kiwixwebapp_'; // Default value +const baseApp = (params.packagedFile && /wikivoyage/.test(params.packagedFile)) ? 'wikivoyage' + : (params.packagedFile && /wikmed|mdwiki/.test(params.packagedFile)) ? 'wikimed' + : 'windows|electron|kiwixwebapp_'; // Default value // A RegExp to match download URLs of releases const regexpMatchGitHubReleases = RegExp('"browser_download_url[":\\s]+"(https:.*download\\/([^\\/]+).*(?:' + baseApp + ')[^"]+)"', 'ig'); /** * Get and return the JSON list of releases from the update server's REST API - * + * * @param {Function} callback The function to call with the data * @returns {String} A JSON string containing hierarchical release data */ -function getReleasesObject(callback) { +function getReleasesObject (callback) { uiUtil.XHR(params.updateServer.url + params.updateServer.releases, 'text', function (response, mimetype, status) { if (status === 200) { @@ -82,11 +62,11 @@ function getReleasesObject(callback) { * A function to get the latest updates from a GitHub releases source * Only updates that are greater than the current update are returned * Attempts to match by channel, but also matches non-channel releases - * + * * @param {Function} callback A function to call back with the results * @returns {Object} Calls back with update tag, update URL, and array of releases */ -function getLatestUpdates(callback) { +function getLatestUpdates (callback) { var updatedReleases = []; var currentRelease = params.appVersion.replace(/^v?([\d.]+)/, '$1'); var currentReleaseChannel = params.appVersion.replace(/^[v\d.]+/, ''); @@ -126,7 +106,6 @@ function getLatestUpdates(callback) { }); } - export default { getLatestUpdates: getLatestUpdates -}; \ No newline at end of file +}; diff --git a/www/js/lib/utf8.js b/www/js/lib/utf8.js index e505574a..8823691b 100644 --- a/www/js/lib/utf8.js +++ b/www/js/lib/utf8.js @@ -3,7 +3,7 @@ * Original code from http://stackoverflow.com/users/553542/kadm , taken from * http://stackoverflow.com/questions/1240408/reading-bytes-from-a-javascript-string * - * Copyright 2013-2014 Mossroy and contributors + * Copyright 2013-2023 Mossroy and contributors * License GPL v3: * * This file is part of Kiwix. diff --git a/www/js/lib/util.js b/www/js/lib/util.js index 968a8526..90b96826 100644 --- a/www/js/lib/util.js +++ b/www/js/lib/util.js @@ -1,7 +1,7 @@ /** * util.js : Utility functions * - * Copyright 2013-2014 Mossroy and contributors + * Copyright 2013-2023 Mossroy, Jaifroid and contributors * License GPL v3: * * This file is part of Kiwix.