3 files changed, 48 insertions, 19 deletions
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index afa2f445a..3546e30fb 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -1,6 +1,22 @@
 dojo.provide("fox.PrefFilterTree");
 
 dojo.require("lib.CheckBoxTree");
+dojo.require("dojo.data.ItemFileWriteStore");
+
+dojo.declare("fox.PrefFilterStore", dojo.data.ItemFileWriteStore, {
+
+	_saveEverything: function(saveCompleteCallback, saveFailedCallback,
+								newFileContentString) {
+
+		dojo.xhrPost({
+			url: "backend.php",
+			content: {op: "pref-filters", method: "savefilterorder",
+				payload: newFileContentString},
+			error: saveFailedCallback,
+			load: saveCompleteCallback});
+	},
+
+});
 
 dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
 	_createTreeNode: function(args) {
@@ -48,5 +64,17 @@ dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
 		return (!item.error || item.error == '') ? "dijitTreeRow" :
 			"dijitTreeRow Error";
 	},
+	checkItemAcceptance: function(target, source, position) {
+		var item = dijit.getEnclosingWidget(target).item;
+
+		// disable copying items
+		source.copyState = function() { return false; };
+
+		return position != 'over';
+	},
+	onDndDrop: function() {
+		this.inherited(arguments);
+		this.tree.model.store.save();
+	},
 });
 
diff --git a/js/prefs.js b/js/prefs.js
index 7d12e4202..cc2246374 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -1563,6 +1563,24 @@ function clearArticleAccessKeys() {
 
 	return false;
 }
+
+function resetFilterOrder() {
+	try {
+		notify_progress("Loading, please wait...");
+
+		new Ajax.Request("backend.php", {
+			parameters: "?op=pref-filters&method=filtersortreset",
+			onComplete: function(transport) {
+		  		updateFilterList();
+			} });
+
+
+	} catch (e) {
+		exception_error("resetFilterOrder");
+	}
+}
+
+
 function resetFeedOrder() {
 	try {
 		notify_progress("Loading, please wait...");
diff --git a/js/viewfeed.js b/js/viewfeed.js
index caf40919e..27d0c01b4 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -941,23 +941,6 @@ function selectArticles(mode) {
 	}
 }
 
-function catchupPage() {
-
-	var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-
-	var str = __("Mark all visible articles in %s as read?");
-
-	str = str.replace("%s", fn);
-
-	if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-		return;
-	}
-
-	selectArticles('all');
-	selectionToggleUnread(false, 'viewCurrentFeed()', true);
-	selectArticles('none');
-}
-
 function deleteSelection() {
 
 	try {
@@ -1170,11 +1153,11 @@ function postMouseIn(e, id) {
 
 	if (_post_preview_timeout) window.clearTimeout(_post_preview_timeout);
 
-	if (!isCdmMode() || !getInitParam("cdm_expanded")) {
+	/* if (!isCdmMode() || !getInitParam("cdm_expanded")) {
 		_post_preview_timeout = window.setTimeout(function() {
 			displaySmallArticlePreview(e, id);
 		}, 1000);
-	}
+	} */
 }
 
 function displaySmallArticlePreview(e, id) {