public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-29 09:47:10 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Richard Beales
2013-03-21 07:04:54 +00:00
parent 77accf45df b74c513428
commit f1fdfbea43
23 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/functions.js
View File

@@ -1746,7 +1746,7 @@ function feedBrowser() {
} });
},
removeFromArchive: function() {
var selected = this.getSelectedFeeds();
var selected = this.getSelectedFeedIds();
if (selected.length > 0) {
@@ -1755,7 +1755,7 @@ function feedBrowser() {
if (confirm(pr)) {
Element.show('feed_browser_spinner');
var query = "?op=rpc&method=remarchived&ids=" +
var query = "?op=rpc&method=remarchive&ids=" +
param_escape(selected.toString());;
new Ajax.Request("backend.php", {

46
js/viewfeed.js
View File

@@ -205,6 +205,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
_infscroll_request_sent = 0;
headlines_scroll_handler($("headlines-frame"));
notify("");
} catch (e) {
@@ -541,7 +543,7 @@ function moveToPost(mode, noscroll) {
} else if (next_id) {
cdmExpandArticle(next_id);
cdmScrollToArticleId(next_id, noscroll);
cdmScrollToArticleId(next_id, true);
}
} else if (next_id) {
@@ -560,8 +562,13 @@ function moveToPost(mode, noscroll) {
var ctr = $("headlines-frame");
if (!getInitParam("cdm_expanded")) {
cdmExpandArticle(prev_id);
cdmScrollToArticleId(prev_id, true);
if (!noscroll && article.offsetTop < ctr.scrollTop) {
scrollArticle(-ctr.offsetHeight/3);
} else {
cdmExpandArticle(prev_id);
cdmScrollToArticleId(prev_id, true);
}
} else {
if (!noscroll && article && article.offsetTop < ctr.scrollTop) {
@@ -1171,6 +1178,23 @@ function headlines_scroll_handler(e) {
try {
var hsp = $("headlines-spacer");
$$("#headlines-frame > div[id*=RROW]").each(
function(child) {
if (child.offsetTop <= $("headlines-frame").scrollTop +
$("headlines-frame").offsetHeight) {
var cencw = $("CENCW-" + child.id.replace("RROW-", ""));
if (cencw) {
cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
cencw.setAttribute('id', '');
Element.show(cencw);
}
}
}
);
if (!_infscroll_disable) {
if ((hsp && e.scrollTop + e.offsetHeight >= hsp.offsetTop - hsp.offsetHeight) ||
(e.scrollHeight != 0 &&
@@ -1192,7 +1216,7 @@ function headlines_scroll_handler(e) {
$$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
function(child) {
if ($("headlines-frame").scrollTop >
if (child.hasClassName("Unread") && $("headlines-frame").scrollTop >
(child.offsetTop + child.offsetHeight/2)) {
var id = child.id.replace("RROW-", "");
@@ -1348,7 +1372,6 @@ function cdmCollapseArticle(event, id) {
function cdmExpandArticle(id) {
try {
console.log("cdmExpandArticle " + id);
hideAuxDlg();
@@ -1373,10 +1396,6 @@ function cdmExpandArticle(id) {
setActiveArticleId(id);
if (!getInitParam("cdm_expanded")) {
cdmScrollToArticleId(id, true);
}
elem = $("CICD-" + id);
var collapse = $$("div#RROW-" + id +
@@ -1388,6 +1407,7 @@ function cdmExpandArticle(id) {
if (cencw) {
cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
cencw.setAttribute('id', '');
Element.show(cencw);
}
Element.show(elem);
@@ -1395,12 +1415,10 @@ function cdmExpandArticle(id) {
Element.show(collapse);
}
/* var new_offset = $("RROW-" + id).offsetTop;
var new_offset = $("RROW-" + id).offsetTop;
$("headlines-frame").scrollTop += (new_offset-old_offset);
if ($("RROW-" + id).offsetTop != old_offset)
$("headlines-frame").scrollTop = new_offset; */
if (old_offset > new_offset)
$("headlines-frame").scrollTop -= (old_offset-new_offset);
toggleUnread(id, 0, true);
toggleSelected(id);