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

some (very minor) code cleanup in feeds class

This commit is contained in:
Andrew Dolgov 2017-12-04 10:39:50 +03:00
parent 003a7447c3
commit 8f92a67e6f
2 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
classes/feeds.php
View File

@ -339,6 +339,8 @@ class Feeds extends Handler_Protected {
$label_cache = $line["label_cache"]; $label_cache = $line["label_cache"];
$labels = false; $labels = false;
$mouseover_attrs = "onmouseover='postMouseIn(event, $id)' onmouseout='postMouseOut($id)'";
if ($label_cache) { if ($label_cache) {
$label_cache = json_decode($label_cache, true); $label_cache = json_decode($label_cache, true);
@ -367,29 +369,13 @@ class Feeds extends Handler_Protected {
++$num_unread; ++$num_unread;
} }
if ($line["marked"]) { $marked_pic_src = $line["marked"] ? "mark_set.png" : "mark_unset.png";
$marked_pic = "<img $class .= $line["marked"] ? " marked" : "";
src=\"images/mark_set.png\" $marked_pic = "<img src=\"images/$marked_pic_src\" class=\"markedPic\" onclick='toggleMark($id)'>";
class=\"markedPic\" alt=\"Unstar article\"
onclick='toggleMark($id)'>";
$class .= " marked";
} else {
$marked_pic = "<img
src=\"images/mark_unset.png\"
class=\"markedPic\" alt=\"Star article\"
onclick='toggleMark($id)'>";
}
if ($line["published"]) { $published_pic_src = $line["published"] ? "pub_set.png" : "pub_unset.png";
$published_pic = "<img src=\"images/pub_set.png\" $class .= $line["published"] ? " published" : "";
class=\"pubPic\" $published_pic = "<img src=\"images/$published_pic_src\" class=\"pubPic\" onclick='togglePub($id)'>";
alt=\"Unpublish article\" onclick='togglePub($id)'>";
$class .= " published";
} else {
$published_pic = "<img src=\"images/pub_unset.png\"
class=\"pubPic\"
alt=\"Publish article\" onclick='togglePub($id)'>";
}
$updated_fmt = make_local_datetime($line["updated"], false, false, false, true); $updated_fmt = make_local_datetime($line["updated"], false, false, false, true);
$date_entered_fmt = T_sprintf("Imported at %s", $date_entered_fmt = T_sprintf("Imported at %s",
@ -456,9 +442,6 @@ class Feeds extends Handler_Protected {
} }
} }
$mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
onmouseout='postMouseOut($id)'";
$reply['content'] .= "<div class='hl hlMenuAttach $class' data-orig-feed-id='$feed_id' data-article-id='$id' id='RROW-$id' $mouseover_attrs>"; $reply['content'] .= "<div class='hl hlMenuAttach $class' data-orig-feed-id='$feed_id' data-article-id='$id' id='RROW-$id' $mouseover_attrs>";
$reply['content'] .= "<div class='hlLeft'>"; $reply['content'] .= "<div class='hlLeft'>";
@ -551,9 +534,6 @@ class Feeds extends Handler_Protected {
} }
} }
$mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
onmouseout='postMouseOut($id)'";
$expanded_class = $expand_cdm ? "expanded" : "expandable"; $expanded_class = $expand_cdm ? "expanded" : "expandable";
$tmp_content = "<div class=\"cdm $hlc_suffix $expanded_class $class\" $tmp_content = "<div class=\"cdm $hlc_suffix $expanded_class $class\"

4
js/viewfeed.js
View File

@ -423,11 +423,9 @@ function toggleMark(id, client_only) {
if (!row.hasClassName("marked")) { if (!row.hasClassName("marked")) {
img.src = img.src.replace("mark_unset", "mark_set"); img.src = img.src.replace("mark_unset", "mark_set");
img.alt = __("Unstar article");
query = query + "&mark=1"; query = query + "&mark=1";
} else { } else {
img.src = img.src.replace("mark_set", "mark_unset"); img.src = img.src.replace("mark_set", "mark_unset");
img.alt = __("Star article");
query = query + "&mark=0"; query = query + "&mark=0";
} }
} }
@ -477,11 +475,9 @@ function togglePub(id, client_only, no_effects, note) {
if (!row.hasClassName("published") || note != undefined) { if (!row.hasClassName("published") || note != undefined) {
img.src = img.src.replace("pub_unset", "pub_set"); img.src = img.src.replace("pub_unset", "pub_set");
img.alt = __("Unpublish article");
query = query + "&pub=1"; query = query + "&pub=1";
} else { } else {
img.src = img.src.replace("pub_set", "pub_unset"); img.src = img.src.replace("pub_set", "pub_unset");
img.alt = __("Publish article");
query = query + "&pub=0"; query = query + "&pub=0";
} }
} }