diff --git a/static/functions/ajax.class.js b/static/functions/ajax.class.js
index 59778933..68885cec 100644
--- a/static/functions/ajax.class.js
+++ b/static/functions/ajax.class.js
@@ -116,26 +116,15 @@ var ajax = {
};
//Bookmarks
function Bookmark(type, id, newName) {
- if (window.location.pathname.indexOf('top10.php') != -1 || window.location.search.indexOf('?action=notify') != -1) {
- var oldName = $('#bookmarklink_' + type + '_' + id).raw().innerHTML;
- ajax.get("bookmarks.php?action=add&type=" + type + "&auth=" + authkey + "&id=" + id, function() {
- var bookmarklinks = $('#bookmarklink_' + type + '_' + id);
- for (var i = 0; i < bookmarklinks.results(); i++) {
- $(bookmarklinks[i].parentNode.parentNode.parentNode).add_class('bookmarked');
- bookmarklinks[i].onclick = function() { Unbookmark(type, id, oldName); return false; };
- bookmarklinks[i].innerHTML = newName;
- bookmarklinks[i].title = 'Remove bookmark';
- }
+ var bmLinks = $('#bookmarklink_' + type + '_' + id + ', .bookmarklink_' + type + '_' + id);
+ var oldName = bmLinks.html();
+ ajax.get("bookmarks.php?action=add&type=" + type + "&auth=" + authkey + "&id=" + id, function() {
+ bmLinks.parent('.remove_bookmark, .add_bookmark').toggleClass('add_bookmark remove_bookmark');
+ bmLinks.html(newName).attr('title', 'Remove bookmark').removeAttr('onclick').off('click').click(function() {
+ Unbookmark(type, id, oldName);
+ return false;
});
- } else {
- var lnk = $('#bookmarklink_' + type + '_' + id).raw();
- var oldName = lnk.innerHTML;
- ajax.get("bookmarks.php?action=add&type=" + type + "&auth=" + authkey + "&id=" + id, function() {
- lnk.onclick = function() { Unbookmark(type, id, oldName); return false; };
- lnk.innerHTML = newName;
- lnk.title = 'Remove bookmark';
- });
- }
+ });
}
function Unbookmark(type, id, newName) {
@@ -145,24 +134,15 @@ function Unbookmark(type, id, newName) {
$('.groupid_' + id).remove();
$('.bookmark_' + id).remove();
});
- } else if (window.location.pathname.indexOf('top10.php') != -1 || window.location.search.indexOf('?action=notify') != -1) {
- var oldName = $('#bookmarklink_' + type + '_' + id).raw().innerHTML;
- ajax.get("bookmarks.php?action=remove&type=" + type + "&auth=" + authkey + "&id=" + id, function() {
- var bookmarklinks = $('#bookmarklink_' + type + '_' + id);
- for (var i = 0; i < bookmarklinks.results(); i++) {
- $(bookmarklinks[i].parentNode.parentNode.parentNode).remove_class('bookmarked');
- bookmarklinks[i].onclick = function() { Bookmark(type, id, oldName); return false; };
- bookmarklinks[i].innerHTML = newName;
- bookmarklinks[i].title = 'Add bookmark';
- }
- });
} else {
- var lnk = $('#bookmarklink_' + type + '_' + id).raw();
- var oldName = lnk.innerHTML;
+ var bmLinks = $('#bookmarklink_' + type + '_' + id + ', .bookmarklink_' + type + '_' + id);
+ var oldName = bmLinks.html();
ajax.get("bookmarks.php?action=remove&type=" + type + "&auth=" + authkey + "&id=" + id, function() {
- lnk.onclick = function() { Bookmark(type, id, oldName); return false; };
- lnk.innerHTML = newName;
- lnk.title = 'Add bookmark';
+ bmLinks.parent('.remove_bookmark, .add_bookmark').toggleClass('add_bookmark remove_bookmark');
+ bmLinks.html(newName).attr('title', 'Add bookmark').removeAttr('onclick').off('click').click(function() {
+ Bookmark(type, id, oldName);
+ return false;
+ });
});
}
}
diff --git a/static/functions/sizzle.js b/static/functions/sizzle.js
deleted file mode 100644
index 38f208d9..00000000
--- a/static/functions/sizzle.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Sizzle CSS Selector Engine - v1.0
- * Copyright 2009, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- * More information: http://sizzlejs.com/
- */
-(function(){var q=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,i=0,d=Object.prototype.toString,o=false;var b=function(E,u,B,w){B=B||[];var e=u=u||document;if(u.nodeType!==1&&u.nodeType!==9){return[]}if(!E||typeof E!=="string"){return B}var C=[],D,z,H,G,A,t,s=true,x=p(u);q.lastIndex=0;while((D=q.exec(E))!==null){C.push(D[1]);if(D[2]){t=RegExp.rightContext;break}}if(C.length>1&&j.exec(E)){if(C.length===2&&f.relative[C[0]]){z=g(C[0]+C[1],u)}else{z=f.relative[C[0]]?[u]:b(C.shift(),u);while(C.length){E=C.shift();if(f.relative[E]){E+=C.shift()}z=g(E,z)}}}else{if(!w&&C.length>1&&u.nodeType===9&&!x&&f.match.ID.test(C[0])&&!f.match.ID.test(C[C.length-1])){var I=b.find(C.shift(),u,x);u=I.expr?b.filter(I.expr,I.set)[0]:I.set[0]}if(u){var I=w?{expr:C.pop(),set:a(w)}:b.find(C.pop(),C.length===1&&(C[0]==="~"||C[0]==="+")&&u.parentNode?u.parentNode:u,x);z=I.expr?b.filter(I.expr,I.set):I.set;if(C.length>0){H=a(z)}else{s=false}while(C.length){var v=C.pop(),y=v;if(!f.relative[v]){v=""}else{y=C.pop()}if(y==null){y=u}f.relative[v](H,y,x)}}else{H=C=[]}}if(!H){H=z}if(!H){throw"Syntax error, unrecognized expression: "+(v||E)}if(d.call(H)==="[object Array]"){if(!s){B.push.apply(B,H)}else{if(u&&u.nodeType===1){for(var F=0;H[F]!=null;F++){if(H[F]&&(H[F]===true||H[F].nodeType===1&&h(u,H[F]))){B.push(z[F])}}}else{for(var F=0;H[F]!=null;F++){if(H[F]&&H[F].nodeType===1){B.push(z[F])}}}}}else{a(H,B)}if(t){b(t,e,B,w);b.uniqueSort(B)}return B};b.uniqueSort=function(s){if(c){o=false;s.sort(c);if(o){for(var e=1;e