com web/php: Merge branch 'pull-request/68': js/common.js
| From: | Paul Dragoonis | Date: | Tue, 23 Jun 2015 22:39:22 +0000 |
| Subject: | com web/php: Merge branch 'pull-request/68': js/common.js | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-21598@lists.php.net to get a copy of this message | ||
Commit: 460415724a6cf08b11f9f9435c658f4f33250cca
Author: Peter Cowburn <salathe@php.net> Tue, 23 Jun 2015 23:39:22 +0100
Parents: c8ad1fcc78c77fadf1da7ab988c829adf847c074 c7ab01d3fa377dece0411da22f77a1acdfc5acf1
Branches: master
Link: http://git.php.net/?p=web/php..git;a=commitdiff;h=460415724a6cf08b11f9f9435c658f4f33250cca
Log:
Merge branch 'pull-request/68'
Changed paths:
MM js/common.js
Diff:
diff --cc js/common.js
index 6182fb8,c4f7b82..fc5e1b3
--- a/js/common.js
+++ b/js/common.js
@@@ -312,24 -355,7 +355,15 @@@ Mousetrap.bind("l o g o enter", functio
var time = new Date().getTime();
$(".brand img").attr("src", "/images/logo.php?refresh&time="
+ time);
});
+Mousetrap.bind("u n r e a d a b l e enter", function(e) {
+ document.cookie = 'MD=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT';
+ location.reload(true);
+});
+Mousetrap.bind("r e a d a b l e enter", function(e) {
+ document.cookie = 'MD=1; path=/';
+ location.reload(true);
+});
- $(window).load(function()
- {
- // Fire our scroll, webkit needs onload
- if (window.location.hash)
- {
- scroll(window.location.hash, 0);
- }
- });
-
function fixTimeout() {
Mousetrap.trigger("m i r r o r enter");
setTimeout(function() {