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

Merge remote-tracking branch 'origin' into hookhead

Browse Source 
update to latest
This commit is contained in:
justauser
2013-06-29 05:54:45 -04:00
parent 575a52874c 776b19536d
commit ef3a8db1cc
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image.php
+2
View File
@@ -41,6 +41,8 @@
header("Content-type: image/png"); header("Content-type: image/png");
$stamp = gmdate("D, d M Y H:i:s", filemtime($filename)). " GMT"; $stamp = gmdate("D, d M Y H:i:s", filemtime($filename)). " GMT";
header("Last-Modified: $stamp", true); header("Last-Modified: $stamp", true);
ob_clean(); // discard any data in the output buffer (if possible)
flush(); // flush headers (if possible)
readfile($filename); readfile($filename);
} }
} else { } else {
js/PluginHost.js
+1
View File
@@ -10,6 +10,7 @@ var PluginHost = {
HOOK_ARTICLE_COLLAPSED: 7, HOOK_ARTICLE_COLLAPSED: 7,
HOOK_PARAMS_LOADED: 8, HOOK_PARAMS_LOADED: 8,
HOOK_RUNTIME_INFO_LOADED: 9, HOOK_RUNTIME_INFO_LOADED: 9,
HOOK_FLOATING_TITLE: 10,
hooks: [], hooks: [],
register: function (name, callback) { register: function (name, callback) {
if (typeof(this.hooks[name]) == 'undefined') if (typeof(this.hooks[name]) == 'undefined')
js/viewfeed.js
+2
View File
@@ -2226,6 +2226,8 @@ function updateFloatingTitle() {
if (child.id != $("floatingTitle").getAttribute("rowid")) { if (child.id != $("floatingTitle").getAttribute("rowid")) {
$("floatingTitle").setAttribute("rowid", child.id); $("floatingTitle").setAttribute("rowid", child.id);
$("floatingTitle").innerHTML = header.innerHTML; $("floatingTitle").innerHTML = header.innerHTML;
PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, child);
} }
if (child.offsetTop < hf.scrollTop - header.offsetHeight - 100 && if (child.offsetTop < hf.scrollTop - header.offsetHeight - 100 &&