fix broken piggie

19 years ago · d437c8cf56
parent 9e397d0f5a
commit d437c8cf56
5 changed files with 48 additions and 18 deletions
--- a/functions.js
+++ b/functions.js
@ -151,8 +151,6 @@ function notify(msg, no_hide, is_err) {
 function printLockingError() {
 	notify("Please wait until operation finishes");}

-var seq = "";
-
 function hotkey_handler(e) {

 	try {
@ -172,11 +170,11 @@ function hotkey_handler(e) {
 		} else {
 			seq = seq + "" + keycode;
 		}
-	
+
 		var m_ctx = getMainContext();
 		var f_ctx = getFeedsContext();
 		var h_ctx = getHeadlinesContext();
-	
+
 		if (keycode == 82) { // r
 			return m_ctx.scheduleFeedUpdate(true);
 		}
@ -216,16 +214,6 @@ function hotkey_handler(e) {
 	
 		if (keycode == 80 || keycode == 38) { // p, up
 			return h_ctx.moveToPost('prev');
-		} 
-	
-		if (document.getElementById("piggie")) {
-	
-			if (seq.match("807371717369")) {
-				seq = "";
-				localPiggieFunction(true);
-			} else {
-				localPiggieFunction(false);
-			}
 		}
 		
 		if (typeof localHotkeyHandler != 'undefined') {
--- a/images/piggie.png
+++ b/images/piggie.png
--- a/prefs.js
+++ b/prefs.js
@ -1058,6 +1058,7 @@ function piggie2_callback() {

 function localPiggieFunction(enable) {
 	if (enable) {
+		debug("I LOVEDED IT!");
 		var piggie = document.getElementById("piggie");
 		piggie.style.display = "block";

@ -1252,6 +1253,8 @@ function init_second_stage() {
 		active_tab = getInitParam("prefs_active_tab");
 		if (!active_tab) active_tab = "genConfig";

+		document.onkeydown = pref_hotkey_handler;
+
 		if (navigator.userAgent.match("Opera")) {	
 			setTimeout("selectTab()", 500);
 		} else {
@ -1503,3 +1506,42 @@ function toggleSelectFBListRow(sender) {
 	toggleSelectListRow(sender);
 	disableContainerChildren("fbrOpToolbar", getSelectedFeedsFromBrowser() == 0);
 }
+
+var seq = "";
+
+function pref_hotkey_handler(e) {
+	try {
+
+		var keycode;
+	
+		if (!hotkeys_enabled) return;
+	
+		if (window.event) {
+			keycode = window.event.keyCode;
+		} else if (e) {
+			keycode = e.which;
+		}
+	
+		if (keycode == 13 || keycode == 27) {
+			seq = "";
+		} else {
+			seq = seq + "" + keycode;
+		}
+
+
+	if (document.getElementById("piggie")) {
+	
+		if (seq.match("807371717369")) {
+			seq = "";
+			localPiggieFunction(true);
+		} else {
+			localPiggieFunction(false);
+		}
+	}
+
+	} catch (e) {
+		exception_error("pref_hotkey_handler", e);
+	}
+}
+
+
--- a/prefs.php
+++ b/prefs.php
@ -70,7 +70,7 @@

 <body>

-<div id="piggie" class="invisible">&nbsp;</div>
+<div id="piggie">&nbsp;</div>

 <iframe id="backReqBox"></iframe>

--- a/tt-rss.css
+++ b/tt-rss.css
@ -265,9 +265,9 @@ a:hover {
 	right : 0;
 	top : -400;
 	background-color : white;
-	display : none;
-	z-index : 3;
-	background-image : url("http://madoka.spb.ru/stuff/fox/piggie.png");
+	display : block;
+	z-index : 999;
+	background-image : url("images/piggie.png");
 	background-position : center center;
 	background-repeat : no-repeat;
 	position : absolute;