Re: com web/php: Merge branch 'pull-request/68': js/common.js
| From: | Hannes Magnusson | Date: | Wed, 24 Jun 2015 02:25:08 +0000 |
| Subject: | Re: com web/php: Merge branch 'pull-request/68': js/common.js | ||
| References: | 1 | Groups: | php.webmaster |
| Request: | Send a blank email to php-webmaster+get-21439@lists.php.net to get a copy of this message | ||
This looks like a bad merge. Are you sure everything is OK?
-Hannes
On Tue, Jun 23, 2015 at 3:39 PM, Peter Cowburn <salathe@php.net> wrote:
> Commit: d21f458fc610449296d5153b1636c6a46976b093
> Author: Peter Cowburn <salathe@php.net> Tue, 23 Jun 2015 23:39:22 +0100
> Parents: c6a2b2bbded763c611ecc53e30d273ed04fb1e90 72f7d11ff5a3de8cdf882f25177b10f8b55bada2
> Branches: master
>
> Link:
> http://git.php.net/?p=web/php.git;a=commitdiff;h=d21f458fc610449296d5153b1636c6a46976b093
>
> 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() {
>
>
> --
> PHP Webmaster List Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>