Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / js / main.js

diff --git a/js/main.js b/js/main.js
index 8cb522743a7f7e7febdfea20d4b278f9c79c8ea7..885e042aa34b5e0e8f9e11bbcbc141c5cf365aae 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -73,7 +73,16 @@
                setupFieldRichtext();
 
                /* popup menus */
+       function close_last_popup_menu() {
+               if(last_popup_menu) {
+               last_popup_menu.hide();
+               last_popup_button.removeClass("selected");
+               last_popup_menu = null;
+               last_popup_button = null;
+               }
+               }
                $('a[rel^=#]').click(function(e){
+                       close_last_popup_menu();
                        menu = $( $(this).attr('rel') );
                        e.preventDefault();
                        e.stopPropagation();
@@ -90,12 +99,7 @@
                        return false;
                });
                $('html').click(function() {
-                       if(last_popup_menu) {
-                               last_popup_menu.hide();
-                               last_popup_button.removeClass("selected");
-                               last_popup_menu = null;
-                               last_popup_button = null;
-                       }
+                                               close_last_popup_menu();
                });
                
                // fancyboxes
@@ -113,6 +117,9 @@
                
                /* nav update event  */
                $('nav').bind('nav-update', function(e,data){;
+                       var invalid = $(data).find('invalid').text();
+                       if(invalid == 1) { window.location.href=window.location.href }
+
                        var net = $(data).find('net').text();
                        if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
                        $('#net-update').html(net);
@@ -207,7 +214,8 @@
        function NavUpdate() {
 
                if(! stopped) {
-                       $.get("ping",function(data) {
+                       var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
+                       $.get(pingCmd,function(data) {
                                $(data).find('result').each(function() {
                                        // send nav-update event
                                        $('nav').trigger('nav-update', this);
@@ -588,7 +596,7 @@ function setupFieldRichtext(){
                theme : "advanced",
                mode : "specific_textareas",
                editor_selector: "fieldRichtext",
-               plugins : "bbcode,paste",
+               plugins : "bbcode,paste, inlinepopups",
                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
                theme_advanced_buttons2 : "",
                theme_advanced_buttons3 : "",