diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-05 07:37:01 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-05 07:37:01 +0100 |
| commit | 830a56723c37e206f2114c4bc4ade080f475cba9 (patch) | |
| tree | 01741f63f64cdd7f430fd70deba74cc510a20846 /include/main.js | |
| parent | cbace1639e7eb9c543a2ba0b51619a7f4164ae64 (diff) | |
| parent | bb0c24bd4fd159cc005f60a0808a4b37b91060b0 (diff) | |
| download | volse-hubzilla-830a56723c37e206f2114c4bc4ade080f475cba9.tar.gz volse-hubzilla-830a56723c37e206f2114c4bc4ade080f475cba9.tar.bz2 volse-hubzilla-830a56723c37e206f2114c4bc4ade080f475cba9.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/main.js')
| -rw-r--r-- | include/main.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/main.js b/include/main.js index d137d4c9c..fcd1d6fee 100644 --- a/include/main.js +++ b/include/main.js @@ -44,10 +44,11 @@ $('#pause').html(''); } } - if(event.keyCode == '36') { - event.preventDefault(); - if(homebase) + if(event.keyCode == '36' && event.shiftKey == true) { + if(homebase !== undefined) { + event.preventDefault(); document.location = homebase; + } } }); }); @@ -82,8 +83,12 @@ if(mail == 0) { mail = ''; } $('#mail-update').html(mail); var intro = $(this).find('intro').text(); + var register = $(this).find('register').text(); if(intro == 0) { intro = ''; } + if(register != 0 && intro != '') { intro = intro+'/'+register; } + if(register != 0 && intro == '') { intro = '0/'+register; } $('#notify-update').html(intro); + }); }) ; } |