Merge remote-tracking branch 'origin' into hookhead

update to latest
This commit is contained in:
justauser 2013-06-29 05:54:45 -04:00
commit ef3a8db1cc
3 changed files with 5 additions and 0 deletions

View File

@ -41,6 +41,8 @@
header("Content-type: image/png");
$stamp = gmdate("D, d M Y H:i:s", filemtime($filename)). " GMT";
header("Last-Modified: $stamp", true);
ob_clean(); // discard any data in the output buffer (if possible)
flush(); // flush headers (if possible)
readfile($filename);
}
} else {

View File

@ -10,6 +10,7 @@ var PluginHost = {
HOOK_ARTICLE_COLLAPSED: 7,
HOOK_PARAMS_LOADED: 8,
HOOK_RUNTIME_INFO_LOADED: 9,
HOOK_FLOATING_TITLE: 10,
hooks: [],
register: function (name, callback) {
if (typeof(this.hooks[name]) == 'undefined')

View File

@ -2226,6 +2226,8 @@ function updateFloatingTitle() {
if (child.id != $("floatingTitle").getAttribute("rowid")) {
$("floatingTitle").setAttribute("rowid", child.id);
$("floatingTitle").innerHTML = header.innerHTML;
PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, child);
}
if (child.offsetTop < hf.scrollTop - header.offsetHeight - 100 &&