Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

[quix0rs-gnu-social.git] / js / util.js

diff --git a/js/util.js b/js/util.js
index d8abbe398b6ed8277b3649b5495954f8ff066906..c22802651a1f270eae9ba4a7714f0ceabf04e239 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -638,13 +638,23 @@ var SN = { // StatusNet
             // Find the notice we're replying to...
             var id = $($('.notice_id', notice)[0]).text();
             var parentNotice = notice;
+            var stripForm = true; // strip a couple things out of reply forms that are inline
 
             // Find the threaded replies view we'll be adding to...
             var list = notice.closest('.notices');
-            if (list.hasClass('threaded-replies')) {
+            if (list.closest('.old-school').length) {
+               // We're replying to an old-school conversation thread;
+               // use the old-style ping into the top form.
+               SN.U.switchInputFormTab("status")
+               replyForm = $('#input_form_status').find('form');
+               stripForm = false;
+            } else if (list.hasClass('threaded-replies')) {
                 // We're replying to a reply; use reply form on the end of this list.
                 // We'll add our form at the end of this; grab the root notice.
                 parentNotice = list.closest('.notice');
+
+                       // See if the form's already open...
+                       var replyForm = $('.notice-reply-form', list);
             } else {
                 // We're replying to a parent notice; pull its threaded list
                 // and we'll add on the end of it. Will add if needed.
@@ -658,18 +668,21 @@ var SN = { // StatusNet
                         SN.U.NoticeInlineReplyPlaceholder(notice);
                     }
                 }
-            }
 
-            // See if the form's already open...
-            var replyForm = $('.notice-reply-form', list);
+                       // See if the form's already open...
+                       var replyForm = $('.notice-reply-form', list);
+            }
 
             var nextStep = function() {
                 // Override...?
                 replyForm.find('input[name=inreplyto]').val(id);
-                replyForm.find('#notice_to').attr('disabled', 'disabled').hide();
-                replyForm.find('#notice_private').attr('disabled', 'disabled').hide();
-                replyForm.find('label[for=notice_to]').hide();
-                replyForm.find('label[for=notice_private]').hide();
+                if (stripForm) {
+                       // Don't do this for old-school reply form, as they don't come back!
+                       replyForm.find('#notice_to').attr('disabled', 'disabled').hide();
+                   replyForm.find('#notice_private').attr('disabled', 'disabled').hide();
+                   replyForm.find('label[for=notice_to]').hide();
+                   replyForm.find('label[for=notice_private]').hide();
+               }
 
                 // Set focus...
                 var text = replyForm.find('textarea');
@@ -1424,28 +1437,13 @@ var SN = { // StatusNet
                 .find('.notice_data-text').focus();
        },
 
-       showMoreGroupMenuItems: function(url) {
-            $.ajax({
-                type: 'GET',
-                dataType: 'xml',
-                url: url,
-                success: function(data, textStatus) {
-                   var groupmenu = $('ul#nav_group');
-                   $('li#nav_timeline_more_group_menu_items').remove();
-                   $("activity\\:object", data).each(function() {
-                       var group = $(this);
-                       var fullname = $('title',group).text();
-                       var nickname = $('poco\\:preferredUsername',group).text();
-                       var url      = $('link[rel="alternate"][type="text/html"]',group).attr('href');
-                       if ($('li#nav_timeline_group_'+nickname, groupmenu).length == 0) {
-                           groupmenu.append('<li id="nav_timeline_group_"' + nickname +'">'+
-                                            '<a href="'+url+'">'+fullname+'</a>'+
-                                            '</li>');
-                       }
-                   });
-                }
-            });
-       }
+        showMoreMenuItems: function(menuid) {
+            $('#'+menuid+' .more_link').remove();
+            var selector = '#'+menuid+' .extended_menu';
+            var extended = $(selector);
+            extended.removeClass('extended_menu');
+            return void(0);
+        }
     },
 
     Init: {