From 0256f7f3e0a2ad5556ed485a9f69ec0a7cb9b36b Mon Sep 17 00:00:00 2001
From: Martin Scharm <martin@binfalse.de>
Date: Wed, 26 Jun 2013 21:38:21 +0200
Subject: [PATCH] version 1.5-rc1

* added option to not show prompt after shortening
* added option to change icons after shortening
* added option to copy to clipboard after shortening
---
 chrome/content/options.xul        |  15 +++++++++++
 chrome/content/yourlsshortener.js |  43 ++++++++++++++++++++++++++++--
 defaults/preferences/prefs.js     |   5 +++-
 skin/favicon-failed.gif           | Bin 0 -> 154 bytes
 skin/favicon-success.gif          | Bin 0 -> 103 bytes
 5 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 skin/favicon-failed.gif
 create mode 100644 skin/favicon-success.gif

diff --git a/chrome/content/options.xul b/chrome/content/options.xul
index be5bef5..2aca955 100644
--- a/chrome/content/options.xul
+++ b/chrome/content/options.xul
@@ -8,6 +8,9 @@
 			<preference id="yourls-shortener-signature" name="extensions.yourls-shortener.signature" type="string"/>
 			<preference id="yourls-shortener-usesignature" name="extensions.yourls-shortener.usesignature" type="bool"/>
 			<preference id="yourls-shortener-askforkey" name="extensions.yourls-shortener.askforkey" type="bool"/>
+			<preference id="yourls-shortener-showprompt" name="extensions.yourls-shortener.showprompt" type="bool"/>
+			<preference id="yourls-shortener-copyclipboard" name="extensions.yourls-shortener.copyclipboard" type="bool"/>
+			<preference id="yourls-shortener-changeicons" name="extensions.yourls-shortener.changeicons" type="bool"/>
 			<preference id="yourls-shortener-maxwait" name="extensions.yourls-shortener.maxwait" type="int"/>
 		</preferences>
 		
@@ -31,6 +34,18 @@
 						<label control="askforkey" tooltiptext="Do you want to provide keywords?" value="Ask for a keyword?"/>
 						<checkbox id="askforkey" preference="yourls-shortener-askforkey"/>
 					</row>
+					<row>
+						<label control="showprompt" tooltiptext="Should the extension show a prompt with the shortened link?" value="Show prompt after shortening?"/>
+						<checkbox id="showprompt" preference="yourls-shortener-showprompt"/>
+					</row>
+					<row>
+						<label control="copyclipboard" tooltiptext="Should the extension copy the shortened url to your clipboard?" value="Copy result to clipboard?"/>
+						<checkbox id="copyclipboard" preference="yourls-shortener-copyclipboard"/>
+					</row>
+					<row>
+						<label control="changeicons" tooltiptext="Should the extension update the icons in statusbar/toolbar depending on success of shortening?" value="Update Icons?"/>
+						<checkbox id="changeicons" preference="yourls-shortener-changeicons"/>
+					</row>
 					<row>
 						<label control="maxwait" tooltiptext="How much time should we spend waiting for the API to respond? Minimum is 2 seconds." value="Max wait time (s)"/>
 						<textbox id="maxwait" preference="yourls-shortener-maxwait"/>
diff --git a/chrome/content/yourlsshortener.js b/chrome/content/yourlsshortener.js
index 55fe741..fd983e9 100644
--- a/chrome/content/yourlsshortener.js
+++ b/chrome/content/yourlsshortener.js
@@ -59,6 +59,32 @@ var YOURLSshortener = function () {
 				}
 			}
 		},
+		changeButtons : function (icon) {
+			var btn = document.getElementById("yourls-shortener-toolbar-button");
+			if (btn)
+				btn.style.listStyleImage = 'url("chrome://yourls-shortener/skin/' + icon + '")';
+			var btn = document.getElementById("yourls-shortener-status-bar-icon");
+			if (btn)
+				btn.src = 'chrome://yourls-shortener/skin/' + icon;
+		},
+		failed: function () {
+			if (!prefManager.getBoolPref ("extensions.yourls-shortener.changeicons"))
+				return;
+			this.changeButtons ("favicon-failed.gif");
+			var obj = this;
+			setTimeout (function () {
+				obj.changeButtons ("favicon.gif")
+			},3000);
+		},
+		success : function () {
+			if (!prefManager.getBoolPref ("extensions.yourls-shortener.changeicons"))
+				return;
+			this.changeButtons ("favicon-success.gif");
+			var obj = this;
+			setTimeout (function () {
+				obj.changeButtons ("favicon.gif")
+			},3000);
+		},
 		run : function (long) {
 			
 			if (typeof gContextMenu != 'undefined' && gContextMenu.onLink)
@@ -82,6 +108,7 @@ var YOURLSshortener = function () {
 				api += '/';
 			api += "yourls-api.php";
 			
+			var me = this;
 			if (api && api != "http://yoursite/")
 			{
 				try
@@ -120,6 +147,7 @@ var YOURLSshortener = function () {
 					var requestTimer = setTimeout (function () {
 						request.abort ();
 						prompts.alert(null, "YOURLS shortener: failed", "Did not get an answer from server!\nTry again later or increase maximum waiting time.");
+						me.failed ();
 						return;
 					}, maxwait);
 					request.onreadystatechange = function () {
@@ -128,18 +156,25 @@ var YOURLSshortener = function () {
 						clearTimeout (requestTimer);
 						if ((request.status == 200 || request.status == 201) && request.responseText.match(/^\s*\S+\s*$/))
 						{
-							prompts.alert (null, "YOURLS shortener: short URL", long + "\n\nis shortened by:\n\n" + request.responseText);
-							clipboard.copyString (request.responseText);
+							if (prefManager.getBoolPref ("extensions.yourls-shortener.showprompt"))
+								prompts.alert (null, "YOURLS shortener: short URL", long + "\n\nis shortened by:\n\n" + request.responseText);
+							
+							if (prefManager.getBoolPref ("extensions.yourls-shortener.copyclipboard"))
+								clipboard.copyString (request.responseText);
+							
+							me.success ();
 							return;
 						}
 						else if ((request.status == 200 || request.status == 201) && request.responseText.match(/^\s*$/))
 						{
 							prompts.alert(null, "YOURLS shortener: failed", "Shortening failed.. Maybe chosen key already in use!?\nTry again!");
+							me.failed ();
 							return;
 						}
 						else
 						{
 							prompts.alert(null, "YOURLS shortener: failed", "Do not understand the response from API!\nPlease check your signature and the API-URL.");
+							me.failed ();
 							return;
 						}
 					}
@@ -149,11 +184,15 @@ var YOURLSshortener = function () {
 				catch (e) 
 				{
 					prompts.alert(null, "YOURLS shortener: failed", "Failed to start XMLHttpRequest:\n" + e.message);
+					me.failed ();
 				}
 				
 			}
 			else 
+			{
 				prompts.alert(null, "YOURLS shortener: failed", "No API-URL specified... Check your settings!");
+				me.failed ();
+			}
 		}
 	};
 } ();
\ No newline at end of file
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index 74c9128..6ea766f 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -1,4 +1,7 @@
 pref("extensions.yourls-shortener.api", "http://yoursite/");
 pref("extensions.yourls-shortener.signature", "123456");
 pref("extensions.yourls-shortener.askforkey", false);
-pref("extensions.yourls-shortener.maxwait", 4);
\ No newline at end of file
+pref("extensions.yourls-shortener.maxwait", 4);
+pref("extensions.yourls-shortener.showprompt", true);
+pref("extensions.yourls-shortener.copyclipboard", true);
+pref("extensions.yourls-shortener.changeicons", true);
\ No newline at end of file
diff --git a/skin/favicon-failed.gif b/skin/favicon-failed.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f9158ee368559460853d20f0e975562bec24eab7
GIT binary patch
literal 154
zcmZ?wbhEHb6krfwIK;}pz;Grk?9A85h+h#Azat|4!+_#HLFb~>#FEq$h4Rdj3<Y;j
z-v9>1pDc`A4D1X#Ky5(n0t^hyUKLeF|B_BRu3GCXS5+Mr^V~4W)5L{=;o#CuEzB{-
zf#C-(+<JBUy4LIs#@g>9JW>oycks@&bj;ei`iGzN<)@Rc7CA0^zvyFuix?+^H2`Z3
BKHdNT

literal 0
HcmV?d00001

diff --git a/skin/favicon-success.gif b/skin/favicon-success.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a20372dcdbeb10ebd61d7ee196b5e2f8465162d0
GIT binary patch
literal 103
zcmZ?wbhEHb6krfwSjf!4z;Grk>`cV(?EnA&EB<6*<YHiE&;g19Wd#@*m@MX~udLjw
zFV*xu!0J6OL(9=ht_>5KW=^<&vUTmrxu2Y`t!{t3@x#K+{Y8ydt9#lKEtGVnJcWui
H7#OSp91$kC

literal 0
HcmV?d00001