refactor tags dialog

1 files changed, 45 insertions, 59 deletions

diff --git a/viewfeed.js b/viewfeed.js
index 7fe83b42e..b276a3ef3 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -1083,84 +1083,70 @@ function catchupSelection() {
 	}
 }
 
-function editArticleTags(id, feed_id, cdm_enabled) {
-	displayDlg('editArticleTags', id,
+function editArticleTags(id) {
+/*	displayDlg('editArticleTags', id,
 			   function () {
 					$("tags_str").focus();
 
 					new Ajax.Autocompleter('tags_str', 'tags_choices',
 					   "backend.php?op=rpc&subop=completeTags",
 					   { tokens: ',', paramName: "search" });
-			   });
-}
-
-function editTagsSave() {
-
-	notify_progress("Saving article tags...");
+			   }); */
 
-	var form = document.forms["tag_edit_form"];
+		var query = "backend.php?op=dlg&id=editArticleTags&param=" + param_escape(id);
 
-	var query = Form.serialize("tag_edit_form");
+		if (dijit.byId("editTagsDlg"))
+			dijit.byId("editTagsDlg").destroyRecursive();
 
-	query = "?op=rpc&subop=setArticleTags&" + query;
+		dialog = new dijit.Dialog({
+			id: "editTagsDlg",
+			title: __("Edit article Tags"),
+			style: "width: 600px",
+			execute: function() {
+				if (this.validate()) {
+					var query = dojo.objectToQuery(this.attr('value'));
 
-	console.log(query);
+					notify_progress("Saving article tags...", true);
 
-	new Ajax.Request("backend.php",	{
-		parameters: query,
-		onComplete: function(transport) {
-				try {
-					//console.log("tags saved...");
-			
-					closeInfoBox();
-					notify("");
-		
-					if (transport.responseXML) {
-						var tags_str = transport.responseXML.getElementsByTagName("tags-str")[0];
-						
-						if (tags_str) {
-							var id = tags_str.getAttribute("id");
-			
-							if (id) {
-								var tags = $("ATSTR-" + id);
-								if (tags) {
-									tags.innerHTML = tags_str.firstChild.nodeValue;
+					new Ajax.Request("backend.php",	{
+					parameters: query,
+					onComplete: function(transport) {
+						notify('');
+						dialog.hide();
+	
+						if (transport.responseXML) {
+							var tags_str = transport.responseXML.getElementsByTagName("tags-str")[0];
+							
+							if (tags_str) {
+								var id = tags_str.getAttribute("id");
+				
+								if (id) {
+									var tags = $("ATSTR-" + id);
+									if (tags) {
+										tags.innerHTML = tags_str.firstChild.nodeValue;
+									}
+	
+									cache_invalidate(id);
 								}
-
-								cache_invalidate(id);
 							}
 						}
-					}
-			
-				} catch (e) {
-					exception_error("editTagsSave", e);
+	
+					}});
 				}
-			} });
-}
-
-function editTagsInsert() {
-	try {
-
-		var form = document.forms["tag_edit_form"];
-
-		var found_tags = form.found_tags;
-		var tags_str = form.tags_str;
-
-		var tag = found_tags[found_tags.selectedIndex].value;
+			},
+			href: query,
+		});
 
-		if (tags_str.value.length > 0 && 
-				tags_str.value.lastIndexOf(", ") != tags_str.value.length - 2) {
+		var tmph = dojo.connect(dialog, 'onLoad', function() {
+	   	dojo.disconnect(tmph);
 
-			tags_str.value = tags_str.value + ", ";
-		}
+			new Ajax.Autocompleter('tags_str', 'tags_choices',
+			   "backend.php?op=rpc&subop=completeTags",
+			   { tokens: ',', paramName: "search" });
+		});
 
-		tags_str.value = tags_str.value + tag + ", ";
+		dialog.show();
 
-		found_tags.selectedIndex = 0;
-		
-	} catch (e) {
-		exception_error("editTagsInsert", e);
-	}
 }
 
 function cdmScrollToArticleId(id) {