From 2ccc7b8e07d584f85e4f5d4477d554de31a15272 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 21 Mar 2013 16:57:36 +0400
Subject: add a e hotkey for embed_original

---
 js/tt-rss.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'js/tt-rss.js')

diff --git a/js/tt-rss.js b/js/tt-rss.js
index bced92674..77bb5117c 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -786,6 +786,14 @@ function hotkey_handler(e) {
 		case "collapse_sidebar":
 			collapse_feedlist();
 			return false;
+		case "toggle_embed_original":
+			if (typeof embedOriginalArticle != "undefined") {
+				if (getActiveArticleId())
+					embedOriginalArticle(getActiveArticleId());
+			} else {
+				alert(__("Please enable embed_original plugin first."));
+			}
+			return false;
 		case "toggle_widescreen":
 			if (!isCdmMode()) {
 				_widescreen_mode = !_widescreen_mode;
-- 
cgit v1.2.3-54-g00ecf


From 16314ddafe88b6c214892799a5da354e2188524c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 21 Mar 2013 18:01:42 +0400
Subject: implement basic auto-reload on some dependent file timestamp changing

---
 include/functions.php | 14 ++++++++++++++
 js/tt-rss.js          |  6 ++++++
 2 files changed, 20 insertions(+)

(limited to 'js/tt-rss.js')

diff --git a/include/functions.php b/include/functions.php
index 3d6b7c89a..aa5575548 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2034,6 +2034,8 @@
 		$data['last_article_id'] = getLastArticleId($link);
 		$data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED');
 
+		$data['dep_ts'] = calculate_dep_timestamp();
+
 		if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
 
 			$data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
@@ -4103,4 +4105,16 @@
 		echo "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
 	}
 
+	function calculate_dep_timestamp() {
+		$files = array_merge(glob("js/*.js"), glob("*.css"));
+
+		$max_ts = -1;
+
+		foreach ($files as $file) {
+			if (filemtime($file) > $max_ts) $max_ts = filemtime($file);
+		}
+
+		return $max_ts;
+	}
+
 ?>
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 77bb5117c..ed5e01d4b 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -446,6 +446,12 @@ function parse_runtime_info(data) {
 			return;
 		}
 
+		if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) {
+			if (parseInt(getInitParam("dep_ts")) < parseInt(v)) {
+				window.location.reload();
+			}
+		}
+
 		if (k == "daemon_is_running" && v != 1) {
 			notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true);
 			return;
-- 
cgit v1.2.3-54-g00ecf


From c186beae4858afb4b17c0cb7fa3731ad2684d2df Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 21 Mar 2013 19:01:51 +0400
Subject: switchPanelMode: don't try to do anything in cdm (closes #609)

---
 js/tt-rss.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js/tt-rss.js')

diff --git a/js/tt-rss.js b/js/tt-rss.js
index ed5e01d4b..b58c36705 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -942,6 +942,8 @@ function handle_rpc_json(transport, scheduled_call) {
 
 function switchPanelMode(wide) {
 	try {
+		if (isCdmMode()) return;
+
 		article_id = getActiveArticleId();
 
 		if (wide) {
-- 
cgit v1.2.3-54-g00ecf


From 3a693fa76f0cc6a38aa5642a08b48f58c29758bc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 21 Mar 2013 22:17:32 +0400
Subject: updateTitle: show counter before title

---
 js/tt-rss.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/tt-rss.js')

diff --git a/js/tt-rss.js b/js/tt-rss.js
index b58c36705..eaa1f3daf 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -181,7 +181,7 @@ function updateTitle() {
 	var tmp = "Tiny Tiny RSS";
 
 	if (global_unread > 0) {
-		tmp = tmp + " (" + global_unread + ")";
+		tmp = "(" + global_unread + ") " + tmp;
 	}
 
 	if (window.fluid) {
-- 
cgit v1.2.3-54-g00ecf