cleaned up the conditions on when to and when not to relay.

[friendica.git] / include / main.js

diff --git a/include/main.js b/include/main.js
index 0e9c6ee75117c1c77d4507ce1fde7b8da807f28c..d59c992235962d7a7d1819b84d2f7e7a14764ced 100644 (file)
--- a/include/main.js
+++ b/include/main.js
@@ -149,7 +149,7 @@
                prev = 'live-' + src;
 
                in_progress = true;
-               var udargs = ((netargs.length) ? '/?f=' + netargs : '?f=');
+               var udargs = ((netargs.length) ? '/' + netargs : '');
                var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
 
                $.get(update_url,function(data) {
@@ -174,7 +174,8 @@
                                else { 
 
                                        $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
-                                       $('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
+                                       if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
+                                               $('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
                                        $('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
                                        $('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
                                        $('#' + ident + ' ' + '.my-comment-photo').each(function() {
@@ -341,6 +342,14 @@
                });
        }
 
+       function contactgroupChangeMember(gid,cid) {
+               $('body').css('cursor', 'wait');
+               $.get('contactgroup/' + gid + '/' + cid, function(data) {
+                               $('body').css('cursor', 'auto');
+               });
+       }
+
+
 function checkboxhighlight(box) {
   if($(box).is(':checked')) {
        $(box).addClass('checkeditem');
@@ -394,3 +403,4 @@ Array.prototype.remove = function(item) {
   this.length = from < 0 ? this.length + from : from;
   return this.push.apply(this, rest);
 };
+