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 "
".$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 @@
- -
 
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() {