X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Futil.js;h=b90f33ec7d01424539e79c9a1738e4ebc45132a6;hb=384a50a7800abde62e040ea57872dc06c0519047;hp=10f962fd01f53f86ce1ac97ddbdbcb5976265b50;hpb=73e8c442409b5dcdb5d0affe364fb8fe50a90c37;p=quix0rs-gnu-social.git

diff --git a/js/util.js b/js/util.js
index 10f962fd01..b90f33ec7d 100644
--- a/js/util.js
+++ b/js/util.js
@@ -24,45 +24,6 @@
  * @link      http://status.net/
  */
 
-$(document).ready(function(){
-    if ($('body.user_in').length > 0) {
-        if ($('#'+SN.C.S.NoticeDataText).length) {
-            if (maxLength > 0) {
-                $('#'+SN.C.S.NoticeDataText).bind('keyup', function(e) {
-                    SN.U.Counter();
-                });
-                // run once in case there's something in there
-                SN.U.Counter();
-            }
-
-            $('#'+SN.C.S.NoticeDataText).bind('keydown', function(e) {
-                SN.U.SubmitOnReturn(e, $('#'+SN.C.S.FormNotice));
-            });
-
-            if($('body')[0].id != 'conversation') {
-                $('#'+SN.C.S.NoticeDataText).focus();
-            }
-        }
-
-        $('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_favor').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_group_join').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); });
-        $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); });
-
-        SN.U.FormNoticeXHR();
-
-        SN.U.NoticeReply();
-
-        SN.U.NoticeDataAttach();
-    }
-
-    SN.U.NoticeAttachments();
-});
-
-
 var SN = { // StatusNet
     C: { // Config
         I: { // Init
@@ -78,7 +39,7 @@ var SN = { // StatusNet
             Error: 'error',
             Success: 'success',
             Processing: 'processing',
-            CommendResult: 'command_result',
+            CommandResult: 'command_result',
             FormNotice: 'form_notice',
             NoticeDataText: 'notice_data-text',
             NoticeTextCount: 'notice_text-count',
@@ -90,19 +51,42 @@ var SN = { // StatusNet
     },
 
     U: { // Utils
+        FormNoticeEnhancements: function(form) {
+            form_id = form.attr('id');
+            $('#'+form_id+' #'+SN.C.S.NoticeDataText).unbind('keyup');
+            $('#'+form_id+' #'+SN.C.S.NoticeDataText).unbind('keydown');
+            if (maxLength > 0) {
+                $('#'+form_id+' #'+SN.C.S.NoticeDataText).bind('keyup', function(e) {
+                    SN.U.Counter(form);
+                });
+                // run once in case there's something in there
+                SN.U.Counter(form);
+            }
+
+            $('#'+form_id+' #'+SN.C.S.NoticeDataText).bind('keydown', function(e) {
+                SN.U.SubmitOnReturn(e, form);
+            });
+
+            if($('body')[0].id != 'conversation') {
+                $('#'+form_id+' textarea').focus();
+            }
+        },
+
         SubmitOnReturn: function(event, el) {
             if (event.keyCode == 13 || event.keyCode == 10) {
                 el.submit();
                 event.preventDefault();
                 event.stopPropagation();
-                $('#'+SN.U.NoticeDataText).blur();
+                $('#'+el[0].id+' #'+SN.C.S.NoticeDataText).blur();
                 $('body').focus();
                 return false;
             }
             return true;
         },
 
-        Counter: function() {
+        Counter: function(form) {
+            SN.C.I.FormNoticeCurrent = form;
+            form_id = form.attr('id');
             if (typeof(maxLength) == "undefined") {
                  maxLength = SN.C.I.MaxLength;
             }
@@ -111,34 +95,35 @@ var SN = { // StatusNet
                 return;
             }
 
-            var remaining = maxLength - $('#'+SN.C.S.NoticeDataText).val().length;
-            var counter = $('#'+SN.C.S.NoticeTextCount);
+            var remaining = maxLength - $('#'+form_id+' #'+SN.C.S.NoticeDataText).val().length;
+            var counter = $('#'+form_id+' #'+SN.C.S.NoticeTextCount);
 
             if (remaining.toString() != counter.text()) {
-                if (!SN.C.I.CounterBlackout || remaining == 0) {
+                if (!SN.C.I.CounterBlackout || remaining === 0) {
                     if (counter.text() != String(remaining)) {
                         counter.text(remaining);
                     }
                     if (remaining < 0) {
-                        $('#'+SN.C.S.FormNotice).addClass(SN.C.S.Warning);
+                        form.addClass(SN.C.S.Warning);
                     } else {
-                        $('#'+SN.C.S.FormNotice).removeClass(SN.C.S.Warning);
+                        form.removeClass(SN.C.S.Warning);
                     }
                     // Skip updates for the next 500ms.
                     // On slower hardware, updating on every keypress is unpleasant.
                     if (!SN.C.I.CounterBlackout) {
                         SN.C.I.CounterBlackout = true;
-                        window.setTimeout(SN.U.ClearCounterBlackout, 500);
+                        SN.C.I.FormNoticeCurrent = form;
+                        window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);", 500);
                     }
                 }
             }
         },
 
-        ClearCounterBlackout: function() {
+        ClearCounterBlackout: function(form) {
             // Allow keyup events to poke the counter again
             SN.C.I.CounterBlackout = false;
             // Check if the string changed since we last looked
-            SN.U.Counter(null);
+            SN.U.Counter(form);
         },
 
         FormXHR: function(f) {
@@ -146,6 +131,7 @@ var SN = { // StatusNet
                 form_id = $(this)[0].id;
                 $.ajax({
                     type: 'POST',
+                    dataType: 'xml',
                     url: $(this)[0].action,
                     data: $(this).serialize() + '&ajax=1',
                     beforeSend: function(xhr) {
@@ -157,9 +143,9 @@ var SN = { // StatusNet
                         alert(errorThrown || textStatus);
                     },
                     success: function(data, textStatus) {
-                        if ($('form', data)[0].length > 0) {
-                            form_new = $('form', data)[0];
-                            $('#'+form_id).replaceWith(document._importNode(form_new, true));
+                        if (typeof($('form', data)[0]) != 'undefined') {
+                            form_new = document._importNode($('form', data)[0], true);
+                            $('#'+form_id).replaceWith(form_new);
                             $('#'+form_new.id).each(function() { SN.U.FormXHR($(this)); });
                         }
                         else {
@@ -171,69 +157,72 @@ var SN = { // StatusNet
             });
         },
 
-        FormNoticeXHR: function() {
-            $('#'+SN.C.S.FormNotice).append('<input type="hidden" name="ajax" value="1"/>');
-            $('#'+SN.C.S.FormNotice).ajaxForm({
-                timeout: '60000',
+        FormNoticeXHR: function(form) {
+            form_id = form.attr('id');
+            form.append('<input type="hidden" name="ajax" value="1"/>');
+            form.ajaxForm({
                 dataType: 'xml',
+                timeout: '60000',
                 beforeSend: function(xhr) {
-                    if ($('#'+SN.C.S.NoticeDataText)[0].value.length === 0) {
-                        $('#'+SN.C.S.FormNotice).addClass(SN.C.S.Warning);
+                    if ($('#'+form_id+' #'+SN.C.S.NoticeDataText)[0].value.length === 0) {
+                        form.addClass(SN.C.S.Warning);
                         return false;
                     }
-                    $('#'+SN.C.S.FormNotice).addClass(SN.C.S.Processing);
-                    $('#'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled);
-                    $('#'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled);
+                    form.addClass(SN.C.S.Processing);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled);
                     return true;
                 },
                 error: function (xhr, textStatus, errorThrown) {
-                    $('#'+SN.C.S.FormNotice).removeClass(SN.C.S.Processing);
-                    $('#'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled);
-                    $('#'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled);
+                    form.removeClass(SN.C.S.Processing);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled);
                     if (textStatus == 'timeout') {
                         alert ('Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists');
                     }
                     else {
                         if ($('.'+SN.C.S.Error, xhr.responseXML).length > 0) {
-                            $('#'+SN.C.S.FormNotice).append(document._importNode($('.'+SN.C.S.Error, xhr.responseXML)[0], true));
+                            form.append(document._importNode($('.'+SN.C.S.Error, xhr.responseXML)[0], true));
                         }
                         else {
                             if(jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) < 0) {
                                 alert('Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.');
                             }
                             else {
-                                SN.C.I.NoticeDataText.val('');
-                                SN.U.Counter();
+                                $('#'+form_id+' #'+SN.C.S.NoticeDataText).val('');
+                                SN.U.FormNoticeEnhancements($('#'+form_id));
                             }
                         }
                     }
                 },
                 success: function(data, textStatus) {
+                    var result;
                     if ($('#'+SN.C.S.Error, data).length > 0) {
-                        var result = document._importNode($('p', data)[0], true);
+                        result = document._importNode($('p', data)[0], true);
                         alert(result.textContent || result.innerHTML);
                     }
                     else {
                         if($('body')[0].id == 'bookmarklet') {
                             self.close();
                         }
+
                         if ($('#'+SN.C.S.CommandResult, data).length > 0) {
-                            var result = document._importNode($('p', data)[0], true);
+                            result = document._importNode($('p', data)[0], true);
                             alert(result.textContent || result.innerHTML);
                         }
                         else {
-                             notice = $('li', data)[0];
-                             if ($('#'+notice.id).length == 0) {
+                             notice = document._importNode($('li', data)[0], true);
+                             if ($('#'+notice.id).length === 0) {
                                 var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
                                 var notice_irt = '#notices_primary #notice-'+notice_irt_value;
                                 if($('body')[0].id == 'conversation') {
                                     if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
                                         $(notice_irt).append('<ul class="notices"></ul>');
                                     }
-                                    $($(notice_irt+' .notices')[0]).append(document._importNode(notice, true));
+                                    $($(notice_irt+' .notices')[0]).append(notice);
                                 }
                                 else {
-                                    $("#notices_primary .notices").prepend(document._importNode(notice, true));
+                                    $("#notices_primary .notices").prepend(notice);
                                 }
                                 $('#'+notice.id).css({display:'none'});
                                 $('#'+notice.id).fadeIn(2500);
@@ -241,17 +230,17 @@ var SN = { // StatusNet
                                 SN.U.NoticeReply();
                              }
                         }
-                        $('#'+SN.C.S.NoticeDataText).val('');
-                        $('#'+SN.C.S.NoticeDataAttach).val('');
-                        $('#'+SN.C.S.NoticeInReplyTo).val('');
-                        $('#'+SN.C.S.NoticeDataAttachSelected).remove();
-                        SN.U.Counter();
+                        $('#'+form_id+' #'+SN.C.S.NoticeDataText).val('');
+                        $('#'+form_id+' #'+SN.C.S.NoticeDataAttach).val('');
+                        $('#'+form_id+' #'+SN.C.S.NoticeInReplyTo).val('');
+                        $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove();
+                        SN.U.FormNoticeEnhancements($('#'+form_id));
                     }
                 },
                 complete: function(xhr, textStatus) {
-                    $('#'+SN.C.S.FormNotice).removeClass(SN.C.S.Processing);
-                    $('#'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled);
-                    $('#'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled);
+                    form.removeClass(SN.C.S.Processing);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled);
+                    $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled);
                 }
             });
         },
@@ -276,10 +265,10 @@ var SN = { // StatusNet
                     replyto = '@' + nick + ' ';
                     text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
                     $('#'+SN.C.S.FormNotice+' input#'+SN.C.S.NoticeInReplyTo).val(id);
-                    if (text.get(0).setSelectionRange) {
+                    if (text[0].setSelectionRange) {
                         var len = text.val().length;
-                        text.get(0).setSelectionRange(len,len);
-                        text.get(0).focus();
+                        text[0].setSelectionRange(len,len);
+                        text[0].focus();
                     }
                     return false;
                 }
@@ -299,7 +288,7 @@ var SN = { // StatusNet
                 imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
                 bgClickToClose : true,
                 success : function() {
-                    $('#jOverlayContent').append('<button>&#215;</button>');
+                    $('#jOverlayContent').append('<button class="close">&#215;</button>');
                     $('#jOverlayContent button').click($.closeOverlay);
                 },
                 timeout : 0,
@@ -319,7 +308,7 @@ var SN = { // StatusNet
                     $("a.thumbnail").children('img').hide();
                     anchor.closest(".entry-title").addClass('ov');
 
-                    if (anchor.children('img').length == 0) {
+                    if (anchor.children('img').length === 0) {
                         t = setTimeout(function() {
                             $.get($('address .url')[0].href+'attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
                                 anchor.append(data);
@@ -341,14 +330,71 @@ var SN = { // StatusNet
         NoticeDataAttach: function() {
             NDA = $('#'+SN.C.S.NoticeDataAttach);
             NDA.change(function() {
-                S = '<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button>&#215;</button></div>';
+                S = '<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button class="close">&#215;</button></div>';
                 NDAS = $('#'+SN.C.S.NoticeDataAttachSelected);
-                (NDAS.length > 0) ? NDAS.replaceWith(S) : $('#'+SN.C.S.FormNotice).append(S);
+                if (NDAS.length > 0) {
+                    NDAS.replaceWith(S);
+                }
+                else {
+                    $('#'+SN.C.S.FormNotice).append(S);
+                }
                 $('#'+SN.C.S.NoticeDataAttachSelected+' button').click(function(){
                     $('#'+SN.C.S.NoticeDataAttachSelected).remove();
                     NDA.val('');
                 });
             });
+        },
+
+        NewDirectMessage: function() {
+            NDM = $('.entity_send-a-message a');
+            NDM.attr({'href':NDM.attr('href')+'&ajax=1'});
+            NDM.click(function() {
+                var NDMF = $('.entity_send-a-message form');
+                if (NDMF.length === 0) {
+                    $.get(NDM.attr('href'), null, function(data) {
+                        $('.entity_send-a-message').append(document._importNode($('form', data)[0], true));
+                        NDMF = $('.entity_send-a-message .form_notice');
+                        SN.U.FormNoticeXHR(NDMF);
+                        SN.U.FormNoticeEnhancements(NDMF);
+                        NDMF.append('<button class="close">&#215;</button>');
+                        $('.entity_send-a-message button').click(function(){
+                            NDMF.hide();
+                            return false;
+                        });
+                    });
+                }
+                else {
+                    NDMF.show();
+                    $('.entity_send-a-message textarea').focus();
+                }
+                return false;
+            });
         }
     }
-}
+};
+
+$(document).ready(function(){
+    if ($('body.user_in').length > 0) {
+        $('.'+SN.C.S.FormNotice).each(function() {
+            SN.U.FormNoticeXHR($(this));
+            SN.U.FormNoticeEnhancements($(this));
+        });
+
+        $('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_favor').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_group_join').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); });
+        $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); });
+
+        SN.U.NoticeReply();
+
+        SN.U.NoticeDataAttach();
+
+        SN.U.NewDirectMessage();
+    }
+
+    SN.U.NoticeAttachments();
+});
+