work in progress js_uploader plugin, turn java uploader into plugin - not done yet

[friendica.git] / include / main.js

diff --git a/include/main.js b/include/main.js
index d137d4c9c6a9201d840cff6528bc1595b8467eb8..fcd1d6fee0bc4e1a624ff40a969de771b85fb9bb 100644 (file)
--- 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);
+
                                });
                        }) ;
                }