From eeb49d375ce7e6addc382bab1a1545e897bb1771 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 20:57:51 +0300
Subject: [PATCH] uploadIconHandler -> CommonDialogs

---
 classes/pref/feeds.php |  2 +-
 js/CommonDialogs.js    | 19 +++++++++++++++++++
 js/common.js           | 21 ---------------------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 7ae7a04c1..82cb84daf 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -492,7 +492,7 @@ class Pref_Feeds extends Handler_Protected {
 		@unlink($icon_file);
 
 		print "<script type=\"text/javascript\">";
-		print "parent.uploadIconHandler($rc);";
+		print "parent.CommonDialogs.uploadIconHandler($rc);";
 		print "</script>";
 		return;
 	}
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index cac4f9be1..cf21370d6 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -1,11 +1,30 @@
 'use strict'
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
+	// noinspection JSUnusedGlobalSymbols
 	return declare("fox.CommonDialogs", null, {
 		closeInfoBox: function() {
 			const dialog = dijit.byId("infoBox");
 			if (dialog)	dialog.hide();
 		},
+		uploadIconHandler: function(rc) {
+			switch (rc) {
+				case 0:
+					Notify.info("Upload complete.");
+					if (App.isPrefs()) {
+						Feeds.reload();
+					} else {
+						setTimeout('Feeds.reload(false, false)', 50);
+					}
+					break;
+				case 1:
+					Notify.error("Upload failed: icon is too big.");
+					break;
+				case 2:
+					Notify.error("Upload failed.");
+					break;
+			}
+		},
 		removeFeedIcon: function(id) {
 			if (confirm(__("Remove stored feed icon?"))) {
 				Notify.progress("Removing feed icon...", true);
diff --git a/js/common.js b/js/common.js
index ec6381e31..1da3e6d1b 100755
--- a/js/common.js
+++ b/js/common.js
@@ -343,27 +343,6 @@ function fatalError(code, msg, ext_info) {
 	return s.replace(/<\/?[^>]+(>|$)/g, "");
 } */
 
-// noinspection JSUnusedGlobalSymbols
-function uploadIconHandler(rc) {
-	switch (rc) {
-		case 0:
-			Notify.info("Upload complete.");
-			if (App.isPrefs()) {
-				Feeds.reload();
-			} else {
-				setTimeout('Feeds.reload(false, false)', 50);
-			}
-			break;
-		case 1:
-			Notify.error("Upload failed: icon is too big.");
-			break;
-		case 2:
-			Notify.error("Upload failed.");
-			break;
-	}
-}
-
-
 // noinspection JSUnusedGlobalSymbols
 function label_to_feed_id(label) {
 	return _label_base_index - 1 - Math.abs(label);