From fa4a52260fa59f22edb83f64fb7cbb96504020e0 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Tue, 8 May 2012 16:22:35 +0000
Subject: [PATCH] Try to correct query string url for search in bookmark
---
apps/bookmarks/js/bookmarks.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index b1eebaa5515..73986e49186 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -120,13 +120,20 @@ function showBookmark(event) {
}, 500);
}
+function replaceQueryString(url,param,value) {
+ var re = new RegExp("([?|&])" + param + "=.*?(&|$)","i");
+ if (url.match(re))
+ return url.replace(re,'$1' + param + "=" + value + '$2');
+ else
+ return url + '&' + param + "=" + value;
+}
function updateBookmarksList(bookmark) {
var tags = encodeEntities(bookmark.tags).split(' ');
var taglist = '';
for ( var i=0, len=tags.length; i<len; ++i ){
if(tags[i] != '')
- taglist = taglist + '<a class="bookmark_tag" href="?tag=' + encodeURIComponent(tags[i]) + '">' + tags[i] + '</a> ';
+ taglist = taglist + '<a class="bookmark_tag" href="'+replaceQueryString( String(window.location), 'tag', encodeURIComponent(tags[i])) + '">' + tags[i] + '</a> ';
}
if(!hasProtocol(bookmark.url)) {
bookmark.url = 'http://' + bookmark.url;
--
GitLab