diff options
| author | justauser <[email protected]> | 2013-06-29 05:54:45 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-06-29 05:54:45 -0400 |
| commit | ef3a8db1cc83e02a9f8933869d19f299f2abe72a (patch) | |
| tree | 9b2e365262350c3a6fd9d1d2089a505df26be2bf | |
| parent | 575a52874c8ebb0bcd5741009cc143389ea2279e (diff) | |
| parent | 776b19536df2e01d8d5363c3a8647f3a24417b6b (diff) | |
Merge remote-tracking branch 'origin' into hookhead
update to latest
| -rw-r--r-- | image.php | 2 | ||||
| -rw-r--r-- | js/PluginHost.js | 1 | ||||
| -rw-r--r-- | js/viewfeed.js | 2 |
3 files changed, 5 insertions, 0 deletions
@@ -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 { diff --git a/js/PluginHost.js b/js/PluginHost.js index 668d215f9..ae89ba481 100644 --- a/js/PluginHost.js +++ b/js/PluginHost.js @@ -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') diff --git a/js/viewfeed.js b/js/viewfeed.js index 1c5811fe7..5875a9e48 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -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 && |