diff --git a/core/js/dist/main.js b/core/js/dist/main.js index 6b4739f00ff7061bd4e181465bf957b835266291..c01085d3266eca58d57f9edd0d30b98bbaca7844 100644 Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map index 76acfe7b4eb4aed4d9f797ef32a6678c3bd8768f..1c65b98ff0381c5946822bee9b5f8914611aeb28 100644 Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ diff --git a/core/js/js.js b/core/js/js.js index 9b4114e400e38876990ee91fcaf4cd4fab9e9e66..048bd5d470fee170e7e453400a3c3b6646c9ed5e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1312,40 +1312,6 @@ function initCore() { $(document).ready(initCore); /** - * Format an UNIX timestamp to a human understandable format - * @param {number} timestamp UNIX timestamp - * @return {string} Human readable format - */ -function formatDate(timestamp){ - return OC.Util.formatDate(timestamp); -} - -// -/** - * Get the value of a URL parameter - * @link http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery - * @param {string} name URL parameter - * @return {string} - */ -function getURLParameter(name) { - return decodeURIComponent( - (new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec( - location.search)||[,''])[1].replace(/\+/g, '%20') - )||''; -} - -/** - * Takes an absolute timestamp and return a string with a human-friendly relative date - * @param {number} timestamp A Unix timestamp - */ -function relative_modified_date(timestamp) { - /* - Were multiplying by 1000 to bring the timestamp back to its original value - per https://github.com/owncloud/core/pull/10647#discussion_r16790315 - */ - return OC.Util.relativeModifiedDate(timestamp * 1000); -} - // fallback to hashchange when no history support if (window.history.pushState) { window.onpopstate = _.bind(OC.Util.History._onPopState, OC.Util.History); diff --git a/core/src/Util/format-date.js b/core/src/Util/format-date.js new file mode 100644 index 0000000000000000000000000000000000000000..04a2d274de50241d62486d2cac86b4054a7bd30d --- /dev/null +++ b/core/src/Util/format-date.js @@ -0,0 +1,34 @@ +/* + * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +// TODO: import Util directly: https://github.com/nextcloud/server/pull/13957 +import OC from '../OC/index' + +/** + * Format an UNIX timestamp to a human understandable format + * @param {number} timestamp UNIX timestamp + * @return {string} Human readable format + * @deprecated 16.0.0 use OC.Util.formatDate instead + */ +export default function formatDate (timestamp) { + console.warn('formatDate is deprecated, use OC.Util.formatDate instead') + return OC.Util.formatDate(timestamp); +} diff --git a/core/src/Util/get-url-parameter.js b/core/src/Util/get-url-parameter.js new file mode 100644 index 0000000000000000000000000000000000000000..6051e923e9de8391c5f28369dfe4c618faf33430 --- /dev/null +++ b/core/src/Util/get-url-parameter.js @@ -0,0 +1,32 @@ +/* + * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/** + * Get the value of a URL parameter + * @link http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery + * @param {string} name URL parameter + * @return {string} + */ +export default function getURLParameter (name) { + return decodeURIComponent( + (new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search) || [, ''])[1].replace(/\+/g, '%20') + ) || ''; +} diff --git a/core/src/Util/relative-modified-date.js b/core/src/Util/relative-modified-date.js new file mode 100644 index 0000000000000000000000000000000000000000..3837d2c372e9a05cfb735132305d2211fe62eb69 --- /dev/null +++ b/core/src/Util/relative-modified-date.js @@ -0,0 +1,37 @@ +/* + * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +// TODO: import Util directly: https://github.com/nextcloud/server/pull/13957 +import OC from '../OC/index' + +/** + * Takes an absolute timestamp and return a string with a human-friendly relative date + * @param {number} timestamp A Unix timestamp + * @deprecated use OC.Util.relativeModifiedDate instead but beware the argument value + */ +export default function relative_modified_date (timestamp) { + console.warn('relative_modified_date is deprecated, use OC.Util.relativeModifiedDate instead') + /* + Were multiplying by 1000 to bring the timestamp back to its original value + per https://github.com/owncloud/core/pull/10647#discussion_r16790315 + */ + return OC.Util.relativeModifiedDate(timestamp * 1000); +} diff --git a/core/src/globals.js b/core/src/globals.js index 4542a59b7b3cdaa1013add5c64ddced4f5fd3350..560c492fdde5d3830cc199463643a1e363d90e09 100644 --- a/core/src/globals.js +++ b/core/src/globals.js @@ -52,7 +52,10 @@ import OC from './OC/index' import OCP from './OCP/index' import OCA from './OCA/index' import escapeHTML from './Util/escapeHTML' +import formatDate from './Util/format-date' +import getUrlParameter from './Util/get-url-parameter' import humanFileSize from './Util/human-file-size' +import relative_modified_date from './Util/relative-modified-date' window['_'] = _ window['$'] = $ @@ -75,7 +78,10 @@ window['OC'] = OC window['OCP'] = OCP window['OCA'] = OCA window['escapeHTML'] = escapeHTML +window['formatDate'] = formatDate +window['getUrlParameter'] = getUrlParameter window['humanFileSize'] = humanFileSize +window['relative_modified_date'] = relative_modified_date /** * translate a string