X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=js%2Futil.js;h=c22802651a1f270eae9ba4a7714f0ceabf04e239;hb=ec53e68cf2490fe3a9ed74914c0c96d31cabe8c0;hp=18475ef803eef4ed56dfbdde653d7b68c7295ecd;hpb=583b903559bea750b36f04805ecd42802d4a4367;p=quix0rs-gnu-social.git

diff --git a/js/util.js b/js/util.js
index 18475ef803..c22802651a 100644
--- a/js/util.js
+++ b/js/util.js
@@ -95,7 +95,6 @@ var SN = { // StatusNet
          * @access private
          */
         FormNoticeEnhancements: function(form) {
-            console.log("FormNoticeEnhancements - begin");
             if (jQuery.data(form[0], 'ElementData') === undefined) {
                 MaxLength = form.find('.count').text();
                 if (typeof(MaxLength) == 'undefined') {
@@ -321,7 +320,6 @@ var SN = { // StatusNet
          * @access public
          */
         FormNoticeXHR: function(form) {
-            console.log("FormNoticeXHR - begin");
             SN.C.I.NoticeDataGeo = {};
             form.append('<input type="hidden" name="ajax" value="1"/>');
 
@@ -428,7 +426,6 @@ var SN = { // StatusNet
 
                                 var id = $(notice).attr('id');
                                 if ($("#"+id).length == 0) {
-                                    console.log("inserting before placeholder");
                                     $(notice).insertBefore(placeholder);
                                 } else {
                                     // Realtime came through before us...
@@ -639,22 +636,30 @@ var SN = { // StatusNet
          */
         NoticeInlineReplyTrigger: function(notice, initialText) {
             // Find the notice we're replying to...
-            console.log('NoticeInlineReplyTrigger');
             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.
                 list = $('ul.threaded-replies', notice);
                 if (list.length == 0) {
-                    console.log("list = 0");
                     SN.U.NoticeInlineReplyPlaceholder(notice);
                     list = $('ul.threaded-replies', notice);
                 } else {
@@ -663,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');
@@ -740,7 +748,7 @@ var SN = { // StatusNet
                 list = notice.find('ul.threaded-replies');
             }
             var placeholder = $('<li class="notice-reply-placeholder">' +
-                                    '<input class="placeholder">' +
+                                    '<input class="placeholder" />' +
                                 '</li>');
             placeholder.find('input')
                 .val(SN.msg('reply_placeholder'));
@@ -1427,7 +1435,15 @@ var SN = { // StatusNet
                     SN.Init.NoticeFormSetup(form);
                 })
                 .find('.notice_data-text').focus();
-	}
+	},
+
+        showMoreMenuItems: function(menuid) {
+            $('#'+menuid+' .more_link').remove();
+            var selector = '#'+menuid+' .extended_menu';
+            var extended = $(selector);
+            extended.removeClass('extended_menu');
+            return void(0);
+        }
     },
 
     Init: {