valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "headlines buffer: remove dijit-based RCHK elements" 

This reverts commit f7945c99d0.
This commit is contained in:
Andrew Dolgov 2013-02-28 15:48:09 +04:00
parent f7945c99d0
commit 524de8dcf6
4 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/feeds.php
View File

@ -417,8 +417,8 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "<div class='hlLeft'>";
$reply['content'] .= "<input
type=\"checkbox\" onclick=\"toggleSelectRow(this)\"
$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"
id=\"RCHK-$id\">";
$reply['content'] .= "$marked_pic";
@ -520,8 +520,8 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "<div>";
$reply['content'] .= "<input
type=\"checkbox\" onclick=\"toggleSelectRow(this, false, true)\"
$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" onclick=\"toggleSelectRow2(this, false, true)\"
id=\"RCHK-$id\">";
$reply['content'] .= "$marked_pic";

8
js/functions.js
View File

@ -366,13 +366,9 @@ function toggleSelectRow2(sender, row, is_cdm) {
}
function toggleSelectRow(sender, row, is_cdm) {
function toggleSelectRow(sender, row) {
if (!row)
if (!is_cdm)
row = sender.parentNode.parentNode;
else
row = sender.parentNode.parentNode.parentNode;
if (!row) row = sender.parentNode.parentNode;
if (sender.checked && !row.hasClassName('Selected'))
row.addClassName('Selected');

4
js/tt-rss.js
View File

@ -737,9 +737,9 @@ function hotkey_handler(e) {
case "select_article_cursor":
var id = getArticleUnderPointer();
if (id) {
var cb = $("RCHK-" + id)
var cb = dijit.byId("RCHK-" + id);
if (cb) {
cb.checked = !cb.checked;
cb.attr("checked", !cb.attr("checked"));
toggleSelectRowById(cb, "RROW-" + id);
return false;
}

39
js/viewfeed.js
View File

@ -162,7 +162,11 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
initHeadlinesMenu();
new_elems.each(function(child) {
if (!$("RCHK-" + child.id.replace("RROW-", "RCHK-"))) {
var cb = dijit.byId(child.id.replace("RROW-", "RCHK-"));
if (!cb) {
dojo.parser.parse(child);
if (!Element.visible(child))
new Effect.Appear(child, { duration : 0.5 });
} else {
@ -212,7 +216,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
_infscroll_request_sent = 0;
notify("");
} catch (e) {
@ -602,16 +605,16 @@ function moveToPost(mode, noscroll) {
function toggleSelected(id, force_on) {
try {
var cb = $("RCHK-" + id);
var cb = dijit.byId("RCHK-" + id);
var row = $("RROW-" + id);
if (row) {
if (row.hasClassName('Selected') && !force_on) {
row.removeClassName('Selected');
if (cb) cb.checked = false;
if (cb) cb.attr("checked", false);
} else {
row.addClassName('Selected');
if (cb) cb.checked = true;
if (cb) cb.attr("checked", true);
}
}
} catch (e) {
@ -897,52 +900,52 @@ function selectArticles(mode) {
children.each(function(child) {
var id = child.id.replace("RROW-", "");
var cb = $("RCHK-" + id);
var cb = dijit.byId("RCHK-" + id);
if (mode == "all") {
child.addClassName("Selected");
if (cb) cb.checked= true;
if (cb) cb.attr("checked", true);
} else if (mode == "unread") {
if (child.hasClassName("Unread")) {
child.addClassName("Selected");
if (cb) cb.checked = true;
if (cb) cb.attr("checked", true);
} else {
child.removeClassName("Selected");
if (cb) cb.checked = false;
if (cb) cb.attr("checked", false);
}
} else if (mode == "marked") {
var img = $("FMPIC-" + child.id.replace("RROW-", ""));
if (img && img.src.match("mark_set")) {
child.addClassName("Selected");
if (cb) cb.checked = true;
if (cb) cb.attr("checked", true);
} else {
child.removeClassName("Selected");
if (cb) cb.checked = false;
if (cb) cb.attr("checked", false);
}
} else if (mode == "published") {
var img = $("FPPIC-" + child.id.replace("RROW-", ""));
if (img && img.src.match("pub_set")) {
child.addClassName("Selected");
if (cb) cb.checked = true;
if (cb) cb.attr("checked", true);
} else {
child.removeClassName("Selected");
if (cb) cb.checked = false;
if (cb) cb.attr("checked", false);
}
} else if (mode == "invert") {
if (child.hasClassName("Selected")) {
child.removeClassName("Selected");
if (cb) cb.checked = false;
if (cb) cb.attr("checked", false);
} else {
child.addClassName("Selected");
if (cb) cb.checked = true;
if (cb) cb.attr("checked", true);
}
} else {
child.removeClassName("Selected");
if (cb) cb.checked = false;
if (cb) cb.attr("checked", false);
}
});
@ -1633,10 +1636,10 @@ function isCdmMode() {
function markHeadline(id) {
var row = $("RROW-" + id);
if (row) {
var check = $("RCHK-" + id);
var check = dijit.byId("RCHK-" + id);
if (check) {
check.checked = true;
check.attr("checked", true);
}
row.addClassName("Selected");