aboutsummaryrefslogtreecommitdiffstats
path: root/src/js/utils/urls.js
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2019-03-16 12:14:20 +1100
committerSam Potts <sam@potts.es>2019-03-16 12:14:20 +1100
commit35f7ee9c59ff082a5b71aae43ffccab4cdf10fdf (patch)
tree75b8f7c56ec7fa6696991e52197172c9c6c7c3cd /src/js/utils/urls.js
parentbdd513635fffa33f66735c80209e6ae77e0426b4 (diff)
parentc202551e6d0b11656a99b41f3f8b3a48f2bf1e0a (diff)
downloadplyr-35f7ee9c59ff082a5b71aae43ffccab4cdf10fdf.tar.lz
plyr-35f7ee9c59ff082a5b71aae43ffccab4cdf10fdf.tar.xz
plyr-35f7ee9c59ff082a5b71aae43ffccab4cdf10fdf.zip
Merge branch 'develop' into css-variables
# Conflicts: # demo/dist/demo.css # demo/index.html # dist/plyr.css # gulpfile.js # package.json # yarn.lock
Diffstat (limited to 'src/js/utils/urls.js')
-rw-r--r--src/js/utils/urls.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/js/utils/urls.js b/src/js/utils/urls.js
index 3ebe622e..843c6aa6 100644
--- a/src/js/utils/urls.js
+++ b/src/js/utils/urls.js
@@ -6,8 +6,8 @@ import is from './is';
/**
* Parse a string to a URL object
- * @param {string} input - the URL to be parsed
- * @param {boolean} safe - failsafe parsing
+ * @param {String} input - the URL to be parsed
+ * @param {Boolean} safe - failsafe parsing
*/
export function parseUrl(input, safe = true) {
let url = input;