From d94fba61c1d995e5f15deec477ba74202304becd Mon Sep 17 00:00:00 2001
From: Daniel Andersson <sskraep@gmail.com>
Date: Mon, 1 Apr 2013 21:08:04 +0200
Subject: Load plugin JS last to enhance plugin capabilities

---
 index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 7fb7a7878..ac2762f7f 100644
--- a/index.php
+++ b/index.php
@@ -104,6 +104,9 @@
 	<?php
 		require 'lib/jshrink/Minifier.php';
 
+		print get_minified_js(array("tt-rss",
+			"functions", "feedlist", "viewfeed", "FeedTree"));
+
 		global $pluginhost;
 
 		foreach ($pluginhost->get_plugins() as $n => $p) {
@@ -112,9 +115,6 @@
 			}
 		}
 
-		print get_minified_js(array("tt-rss",
-			"functions", "feedlist", "viewfeed", "FeedTree"));
-
 		init_js_translations();
 	?>
 	</script>
-- 
cgit v1.2.3-54-g00ecf


From 97e2c731b8c069fe1df67fc0615b4ab084ffd073 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 2 Apr 2013 08:45:50 +0400
Subject: move HOOK_TOOLBAR_BUTTON elements inside actionChooser

---
 index.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index ac2762f7f..3b905d1b1 100644
--- a/index.php
+++ b/index.php
@@ -201,15 +201,15 @@
 
 		</form>
 
-		<?php
-			global $pluginhost;
-			foreach ($pluginhost->get_hooks($pluginhost::HOOK_TOOLBAR_BUTTON) as $p) {
-				 echo $p->hook_toolbar_button();
-			}
-		?>
-
 		<div class="actionChooser">
 
+			<?php
+				global $pluginhost;
+				foreach ($pluginhost->get_hooks($pluginhost::HOOK_TOOLBAR_BUTTON) as $p) {
+					 echo $p->hook_toolbar_button();
+				}
+			?>
+
 			<button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
 				title="<?php echo __("Communication problem with server.") ?>">
 			<img
-- 
cgit v1.2.3-54-g00ecf


From c88e4a2af317d5b1dfa60e639df9336a72fe879a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 2 Apr 2013 14:34:17 +0400
Subject: remove small_article_preview

---
 cdm.css         | 19 -------------------
 classes/rpc.php | 27 ---------------------------
 index.php       |  2 --
 js/viewfeed.js  | 45 ---------------------------------------------
 4 files changed, 93 deletions(-)

(limited to 'index.php')

diff --git a/cdm.css b/cdm.css
index 13f88dd4e..9893f43fc 100644
--- a/cdm.css
+++ b/cdm.css
@@ -192,23 +192,4 @@ div.cdm.expanded div.cdmHeader a.title, div.cdm.active div.cdmHeader a.title {
 	font-size : 13px;
 }
 
-div#small_article_preview {
-	width : 300px;
-	max-height : 350px;
-	overflow : hidden;
-	border : 1px solid #c0c0c0;
-	background : white;
-	position : absolute;
-	box-shadow : 2px 2px 4px #c0c0c0;
-	z-index : 2;
-}
 
-div#small_article_preview div.content {
-	padding : 5px;
-	font-size : 12px;
-	color : gray;
-}
-
-div#small_article_preview div.content img {
-	max-width : 290px;
-}
diff --git a/classes/rpc.php b/classes/rpc.php
index 36d7083a5..f0218f91e 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -834,32 +834,5 @@ class RPC extends Handler_Protected {
 		}
 	}
 
-	function cdmArticlePreview() {
-		$id = db_escape_string($this->link, $_REQUEST['id']);
-
-		$result = db_query($this->link, "SELECT link,
-			ttrss_entries.title, content, feed_url
-			FROM
-			ttrss_entries, ttrss_user_entries
-				LEFT JOIN ttrss_feeds ON (ttrss_user_entries.feed_id = ttrss_feeds.id)
-			WHERE ref_id = '$id' AND ref_id = ttrss_entries.id AND
-				ttrss_user_entries.owner_uid = ". $_SESSION["uid"]);
-
-		if (db_num_rows($result) != 0) {
-			$link = db_fetch_result($result, 0, "link");
-			$title = db_fetch_result($result, 0, "title");
-			$feed_url = db_fetch_result($result, 0, "feed_url");
-
-			$content = sanitize($this->link,
-				db_fetch_result($result, 0, "content"), false, false, $feed_url);
-
-			print "<div class='content'>".$content."</content>";
-
-		} else {
-			print "Article not found.";
-		}
-
-	}
-
 }
 ?>
diff --git a/index.php b/index.php
index 3b905d1b1..e390edffd 100644
--- a/index.php
+++ b/index.php
@@ -140,8 +140,6 @@
 	</div>
 </div>
 
-<div style="display : none" onclick="Element.hide(this)" id="small_article_preview"></div>
-
 <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
 <div id="cmdline" style="display : none"></div>
 <div id="headlines-tmp" style="display : none"></div>
diff --git a/js/viewfeed.js b/js/viewfeed.js
index c24dec62e..e3d73b89b 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -13,8 +13,6 @@ var catchup_timeout_id = false;
 var cids_requested = [];
 var loaded_article_ids = [];
 
-var _post_preview_timeout = false;
-
 var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
 
 function headlines_callback2(transport, offset, background, infscroll_req) {
@@ -1153,53 +1151,10 @@ function getActiveArticleId() {
 
 function postMouseIn(e, id) {
 	post_under_pointer = id;
-
-	if (_post_preview_timeout) window.clearTimeout(_post_preview_timeout);
-
-	/* if (!isCdmMode() || !getInitParam("cdm_expanded")) {
-		_post_preview_timeout = window.setTimeout(function() {
-			displaySmallArticlePreview(e, id);
-		}, 1000);
-	} */
-}
-
-function displaySmallArticlePreview(e, id) {
-	try {
-		var query = "?op=rpc&method=cdmarticlepreview&id=" + id;
-
-		new Ajax.Request("backend.php", {
-			parameters: query,
-			onComplete: function(transport) {
-				cexc = $("CEXC-" + id);
-				preview = $("small_article_preview");
-				row = $("RROW-" + id);
-				ctr = $("headlines-frame");
-
-				if (id != getActiveArticleId() && (!isCdmMode() || (cexc && Element.visible(cexc))) && row && preview) {
-					preview.innerHTML = transport.responseText;
-					new Effect.Appear(preview, {duration:0.2});
-
-					preview.setStyle({
-						left: (e.clientX + 20) + 'px',
-						top: (row.offsetTop + row.offsetHeight*2 + 20 - ctr.scrollTop) + 'px' });
-
-				}
-
-			} });
-
-
-	} catch (e) {
-		exception_error("displaySmallArticlePreview", e);
-	}
 }
 
 function postMouseOut(id) {
 	post_under_pointer = false;
-
-	if (_post_preview_timeout) window.clearTimeout(_post_preview_timeout);
-
-	if (Element.visible("small_article_preview"))
-		Element.hide("small_article_preview");
 }
 
 function unpackVisibleHeadlines() {
-- 
cgit v1.2.3-54-g00ecf


From b7041615c43e4c5f7dd44a13ab55f7314f7ae8ba Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 2 Apr 2013 18:50:54 +0400
Subject: fix mark as read dropdown not resetting

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index e390edffd..dd3d34b3a 100644
--- a/index.php
+++ b/index.php
@@ -188,7 +188,7 @@
 		</select>
 
 		<select title="<?php echo __('Mark feed as read') ?>"
-			onchange="catchupCurrentFeed(event)"
+			onchange="catchupCurrentFeed(this)"
 			dojoType="dijit.form.Select" name="catchup_feed">
 			<option selected="selected" value="default"><?php echo __('Mark as read') ?></option>
 			<option value="all"><?php echo __('All articles') ?></option>
-- 
cgit v1.2.3-54-g00ecf