From d512b113cde9b7cbf3399dbe53d3ed571afdd049 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 2 Nov 2016 18:28:19 +0100
Subject: [PATCH] address failure to parse url when hash is not present
---
www/common/cryptpad-common.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index b691f2ee4..68ebd95dc 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -276,15 +276,15 @@ define([
};
var parsePadUrl = common.parsePadUrl = function (href) {
- var patt = /^https*:\/\/([^\/]*)\/(.*?)\/#(.*)$/i;
+ var patt = /^https*:\/\/([^\/]*)\/(.*?)\//i;
var ret = {};
- href.replace(patt, function (a, domain, type, hash) {
+ var hash = href.replace(patt, function (a, domain, type, hash) {
ret.domain = domain;
ret.type = type;
- ret.hash = hash;
return '';
});
+ ret.hash = hash.replace(/#/g, '');
return ret;
};