summaryrefslogtreecommitdiffstats
path: root/core/src/Util
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2019-01-31 19:19:47 +0100
committerChristoph Wurst <christoph@winzerhof-wurst.at>2019-02-01 09:15:30 +0100
commitab73c9c3282fa3550fcf349ea30e399de202f4ed (patch)
treeced754c494c98035e115bf8a8727afaaa31f83bf /core/src/Util
parent8709f6b218f16dd71200c715dd37a1d58736d4e4 (diff)
downloadnextcloud-server-ab73c9c3282fa3550fcf349ea30e399de202f4ed.tar.gz
nextcloud-server-ab73c9c3282fa3550fcf349ea30e399de202f4ed.zip
Move global helper functions to the bundle and deprecate some of them
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'core/src/Util')
-rw-r--r--core/src/Util/format-date.js34
-rw-r--r--core/src/Util/get-url-parameter.js32
-rw-r--r--core/src/Util/relative-modified-date.js37
3 files changed, 103 insertions, 0 deletions
diff --git a/core/src/Util/format-date.js b/core/src/Util/format-date.js
new file mode 100644
index 00000000000..04a2d274de5
--- /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 00000000000..6051e923e9d
--- /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 00000000000..3837d2c372e
--- /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);
+}