move some more shared stuff to CommonDialogs, Filters, and Utils

2 files changed, 6 insertions, 6 deletions

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index c061243ee..2184a0b42 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -765,7 +765,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<div class='dlgButtons'>
 			<div style=\"float : left\">
-			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
 				__('Unsubscribe')."</button>";
 
 			print "</div>";
@@ -1247,7 +1247,7 @@ class Pref_Feeds extends Handler_Protected {
 			var bare_id = id.substr(id.indexOf(':')+1);
 
 			if (id.match('FEED:')) {
-				editFeed(bare_id);
+				CommonDialogs.editFeed(bare_id);
 			} else if (id.match('CAT:')) {
 				editCat(bare_id, item);
 			}
@@ -1441,7 +1441,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<a class=\"visibleLink\" href=\"#\" ".
 				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"editFeed(".$line["id"].")\">".
+				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
 				htmlspecialchars($line["title"])."</a>";
 
 			print "</td><td class=\"insensitive\" align='right'>";
@@ -1506,7 +1506,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<a class=\"visibleLink\" href=\"#\" ".
 				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"editFeed(".$line["id"].")\">".
+				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
 				htmlspecialchars($line["title"])."</a>: ";
 
 			print "<span class=\"insensitive\">";
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index e3503d545..e60628f8f 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -797,7 +797,7 @@ class Pref_Filters extends Handler_Protected {
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
 		print "</div></div>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return quickAddFilter()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Filters.quickAddFilter()\">".
 			__('Create filter')."</button> ";
 
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return joinSelectedFilters()\">".
@@ -1044,7 +1044,7 @@ class Pref_Filters extends Handler_Protected {
 		print "<div class=\"dlgSecCont\">";
 
 		print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
-			onchange=\"filterDlgCheckAction(this)\">";
+			onchange=\"Filters.filterDlgCheckAction(this)\">";
 
 		$res = $this->pdo->query("SELECT id,description FROM ttrss_filter_actions
 			ORDER BY name");