From: Zach Copley Date: Mon, 18 Apr 2011 09:27:56 +0000 (-0700) Subject: More work trying to understand util.js and get my ajax working right X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=583b903559bea750b36f04805ecd42802d4a4367;p=quix0rs-gnu-social.git More work trying to understand util.js and get my ajax working right --- diff --git a/js/util.js b/js/util.js index 811e124086..18475ef803 100644 --- a/js/util.js +++ b/js/util.js @@ -639,6 +639,7 @@ 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; diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php index d768411d73..1e68376cdd 100644 --- a/plugins/QnA/QnAPlugin.php +++ b/plugins/QnA/QnAPlugin.php @@ -431,12 +431,17 @@ class QnAPlugin extends MicroAppPlugin // Output a placeholder input -- clicking on it will // bring up a real answer form - if (empty($answer) && empty($question->closed)) { - $out->elementStart('ul', 'notices threaded-replies xoxo'); - $out->elementStart('li', 'notice-answer-placeholder'); + + // NOTE: this whole ul is just a placeholder + if (empty($question->closed) && empty($answer)) { + $out->elementStart('ul', 'notices qna-dummy'); + $out->elementStart('li', 'qna-dummy-placeholder'); $out->element( 'input', - array('class' => 'placeholder', 'value' => 'Answer...') + array( + 'class' => 'placeholder', + 'value' => _m('Your answer...') + ) ); $out->elementEnd('li'); $out->elementEnd('ul'); @@ -458,7 +463,7 @@ class QnAPlugin extends MicroAppPlugin $nli = new NoticeListItem($notice, $out); $nli->showNotice(); - $out->elementStart('div', array('class' => 'entry-content answer-content')); + $out->elementStart('p', array('class' => 'entry-content answer-content')); if (!empty($answer)) { $form = new QnashowanswerForm($out, $answer); @@ -467,7 +472,7 @@ class QnAPlugin extends MicroAppPlugin $out->text(_m('Answer data is missing.')); } - $out->elementEnd('div'); + $out->elementEnd('p'); // @fixme $out->elementStart('div', array('class' => 'entry-content')); diff --git a/plugins/QnA/actions/qnanewanswer.php b/plugins/QnA/actions/qnanewanswer.php index e94b86fb38..6815abd798 100644 --- a/plugins/QnA/actions/qnanewanswer.php +++ b/plugins/QnA/actions/qnanewanswer.php @@ -76,7 +76,7 @@ class QnanewanswerAction extends Action if ($this->boolean('ajax')) { StatusNet::setApi(true); } - + common_debug("in qnanewanswer"); $this->user = common_current_user(); if (empty($this->user)) { @@ -163,7 +163,7 @@ class QnanewanswerAction extends Action $this->elementStart('body'); - $nli = new NoticeAnswerListItem($notice, $this); + $nli = new NoticeAnswerListItem($notice, $this, $this->question, $answer); $nli->show(); $this->elementEnd('body'); @@ -282,8 +282,8 @@ class QnanewanswerAction extends Action class NoticeAnswerListItem extends NoticeListItem { - protected $question; + protected $answer; /** * constructor @@ -292,10 +292,12 @@ class NoticeAnswerListItem extends NoticeListItem * * @param Notice $notice The notice we'll display */ - function __construct($notice, $out=null) + function __construct($notice, $out=null, $question, $answer) { parent::__construct($notice, $out); - $this->question = $out->question; + $this->question = $question; + $this->answer = $answer; + } function show() @@ -316,4 +318,35 @@ class NoticeAnswerListItem extends NoticeListItem $this->showEnd(); } + /** + * show the content of the notice + * + * Shows the content of the notice. This is pre-rendered for efficiency + * at save time. Some very old notices might not be pre-rendered, so + * they're rendered on the spot. + * + * @return void + */ + function showContent() + { + $this->out->elementStart('p', array('class' => 'entry-content answer-content')); + if ($this->notice->rendered) { + $this->out->raw($this->notice->rendered); + } else { + // XXX: may be some uncooked notices in the DB, + // we cook them right now. This should probably disappear in future + // versions (>> 0.4.x) + $this->out->raw(common_render_content($this->notice->content, $this->notice)); + } + + if (!empty($this->answer)) { + $form = new QnashowanswerForm($this->out, $this->answer); + $form->show(); + } else { + $out->text(_m('Answer data is missing.')); + } + + $this->out->elementEnd('p'); + } + } \ No newline at end of file diff --git a/plugins/QnA/classes/QnA_Question.php b/plugins/QnA/classes/QnA_Question.php index 157eaa7a18..77d5a57fb1 100644 --- a/plugins/QnA/classes/QnA_Question.php +++ b/plugins/QnA/classes/QnA_Question.php @@ -217,6 +217,14 @@ class QnA_Question extends Managed_DataObject $out = new XMLStringer(); + $cls = array('qna_question'); + + if (!empty($question->closed)) { + $cls[] = 'closed'; + } + + $out->elementStart('p', array('class' => implode(' ', $cls))); + if (!empty($question->description)) { $out->elementStart('span', 'question-description'); $out->raw(QnAPlugin::shorten($question->description, $notice)); @@ -237,6 +245,8 @@ class QnA_Question extends Managed_DataObject $out->elementEnd('span'); } + $out->elementEnd('p'); + return $out->getString(); } diff --git a/plugins/QnA/js/qna.js b/plugins/QnA/js/qna.js index c7add55ca6..76dc261736 100644 --- a/plugins/QnA/js/qna.js +++ b/plugins/QnA/js/qna.js @@ -1,28 +1,32 @@ var QnA = { - // hide all the 'close' and 'best' buttons for this question - // @fixme: Should use ID close: function(closeButt) { - notice = $(closeButt).closest('li.hentry.notice.question'); - notice.find('input[name=best],[name=close]').hide(); + var notice = $(closeButt).closest('li.hentry.notice.question'); + + console.log("close"); + + notice.find('input#qna-best-answer,#qna-question-close').hide(); notice.find('textarea').hide(); - notice.find('li.notice-answer-placeholder').hide(); - notice.find('#answer-form').hide(); + + var list = notice.find('ul'); + + console.log("found this many uls: " + list.length); + + notice.find('ul > li.notice-answer-placeholder').remove(); + notice.find('ul > li.notice-answer').remove(); }, init: function() { - var that = this; - QnA.NoticeInlineAnswerSetup(); - $('input[name=close]').live('click', function() { - that.close(this); + $('form.form_question_show').live('submit', function() { + QnA.close(this); }); - $('input[name=best]').live('click', function() { - that.close(this); + $('form.form_answer_show').live('click', function() { + QnA.close(this); }); }, @@ -41,6 +45,7 @@ var QnA = { // Find the threaded replies view we'll be adding to... var list = notice.closest('.notices'); + if (list.hasClass('threaded-replies')) { console.log("NoticeInlineAnswerTrigger - there's already a threaded-replies ul above me"); // We're replying to a reply; use reply form on the end of this list. @@ -48,84 +53,92 @@ var QnA = { parentNotice = list.closest('.notice'); console.log("NoticeInlineAnswerTrigger - trying to find the closed .notice above me"); if (parentNotice.length > 0) { - console.log("NoticeInlineAnswerTrigger - found that closest .notice"); + console.log("NoticeInlineAnswerTrigger - found that closest .notice - length = " + parentNotice.length); } } else { console.log("NoticeInlineAnswerTrigger - this notice does not have a threaded-reples ul"); // 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); - console.log('NoticeInlineAnswerTrigger - looking for threaded-replies ul on the parent notice (on the passed in notice)'); - if (list.length == 0) { - console.log("NoticeInlineAnswerTrigger - there is no threaded-replies ul on the parent notice"); - console.log("NoticeInlineAnswerTrigger - calling NoticeInlineAnswerPlaceholder(notice)"); - QnA.NoticeInlineAnswerPlaceholder(notice); - console.log("NoticeInlineAnswerTrigger - checking once again for a ul.threaded-replies on the notice"); - list = $('ul.threaded-replies', notice); - } } - + + // See if the form's already open... + var answerForm = $('.qna_answer_form', list); var nextStep = function() { console.log("NoticeInlineAnswerTrigger (nextStep) - begin"); - // Set focus... + // Set focus... var text = answerForm.find('textarea'); if (text.length == 0) { throw "No textarea"; } + text.focus(); + console.log("NoticeInlineAnswerTrigger (nextStep) - setting up body click handler to hide open form when clicking away"); $('body').click(function(e) { console.log("body click handler - got click"); + // hide any reply placeholders if the notice has an answer placeholder + var dummyPlaceholders = $('li.qna-dummy-placeholder'); + if (dummyPlaceholders.length > 0) { + console.log("found dummy placholder so hiding reply placeholder"); + dummyPlaceholders.each(function() { + $(this).closest('li.notice').find('li.notice-reply-placeholder').hide(); + }); + } + var openAnswers = $('li.notice-answer'); if (openAnswers.length > 0) { console.log("body click handler - Found one or more open answer forms to close"); var target = $(e.target); + openAnswers.each(function() { console.log("body click handler - found an open answer form"); // Did we click outside this one? var answerItem = $(this); + var parentNotice = answerItem.closest('li.notice'); + parentNotice.find('ul > li.qna-dummy-placeholder').hide(); + if (answerItem.has(e.target).length == 0) { var textarea = answerItem.find('.notice_data-text:first'); var cur = $.trim(textarea.val()); // Only close if there's been no edit. if (cur == '' || cur == textarea.data('initialText')) { console.log("body click handler - no text in answer form, closing it"); - var parentNotice = answerItem.closest('li.notice'); answerItem.remove(); - console.log("body click handler - showing answer placeholder"); - parentNotice.find('li.notice-answer-placeholder').show(); + console.log("body click handler - showing dummy placeholder"); + parentNotice.find('ul > li.qna-dummy-placeholder').show(); + } else { console.log("body click handler - there is text in the answer form, wont close it"); } } }); } - }); - text.focus(); - console.log('body click handler - exit'); + console.log('body click handler - exit'); + }); }; // See if the form's already open... - var answerForm = $('.notice-answer-form', list); + if (answerForm.length > 0 ) { console.log("NoticeInlineAnswerTrigger - found an open .notice-answer-form - doing nextStep()"); nextStep(); } else { console.log("NoticeInlineAnswerTrigger - hiding the answer placeholder"); - var placeholder = list.find('li.notice-answer-placeholder').hide(); + var placeholder = list.find('li.qna-dummy-placeholder').hide(); // Create the answer form entry at the end var answerItem = $('li.notice-answer', list); if (answerItem.length > 0) { - console.log("NoticeInlineAnswerTrigger - Found answer item (notice-answer li)"); + console.log("NoticeInlineAnswerTrigger - Found " + answerItem.length + " answer items (notice-answer li)"); } if (answerItem.length == 0) { @@ -133,8 +146,16 @@ var QnA = { answerItem = $('
  • '); var intermediateStep = function(formMaster) { + + // cache it + if (!QnA.AnswerFormMaster) { + QnA.AnswerFormMaster = formMaster; + } + console.log("NoticeInlineAnswerTrigger - (intermediate) step begin"); var formEl = document._importNode(formMaster, true); + + console.log("NoticeInlineAnswerTrigger - (intermediate step) appending answer form to answer item"); answerItem.append(formEl); console.log("NoticeInlineAnswerTrigger - (intermediate step) appending answer to replies list, after placeholder"); @@ -179,10 +200,11 @@ var QnA = { */ NoticeInlineAnswerSetup: function() { console.log("NoticeInlineAnswerSetup - begin"); - $('li.notice-answer-placeholder input.placeholder') + $('li.qna-dummy-placeholder input.placeholder') .live('focus', function() { var notice = $(this).closest('li.notice'); QnA.NoticeInlineAnswerTrigger(notice); + $(this).hide(); return false; }); console.log("NoticeInlineAnswerSetup - exit"); @@ -190,30 +212,20 @@ var QnA = { AnswerFormSetup: function(form) { console.log("AnswerFormSetup"); - $('input[type=submit]').live('click', function() { - console.log("AnswerFormSetup click"); - QnA.FormAnswerXHR(form); - }); - }, + form.find('textarea').focus(); - NoticeInlineAnswerPlaceholder: function(notice) { - console.log("NoticeInlineAnswerPlaceholder - begin") - var list = notice.find('ul.threaded-replies'); - if (list.length == 0) { - list = $(''); - notice.append(list); - list = notice.find('ul.threaded-replies'); - } + // this is a bad hack + $('form.ajax').die(); + $('form.ajax input[type=submit]').die(); - var placeholder = $('
  • ' + - '' + - '
    • '); - placeholder.find('input') - .val(SN.msg('reply_placeholder')); - list.append(placeholder); - console.log("NoticeInlineAnswerPlaceholder - exit"); - }, + form.live('submit', function(e) { + QnA.FormAnswerXHR($(this)); + e.stopPropagation(); + return false; + }); + SN.Init.AjaxForms(); + }, /** * Setup function -- DOES NOT trigger actions immediately. @@ -343,7 +355,7 @@ var QnA = { console.log("FormAnswerXHR - looking for the closest notice with a notice-reply class"); var replyItem = form.closest('li.notice-answer, .notice-reply'); - + var questionItem = form.closest('li.question'); if (replyItem.length > 0) { console.log("FormAnswerXHR - I found a reply li to append to"); // If this is an inline reply, remove the form... @@ -352,6 +364,7 @@ var QnA = { console.log("FormAnswerXHR - search list for the answer placeholder") var placeholder = list.find('.notice-answer-placeholder'); console.log("FormAnswerXHR - removing reply item"); + replyItem.remove(); var id = $(notice).attr('id'); @@ -359,9 +372,12 @@ var QnA = { if ($("#"+id).length == 0) { console.log("FormAnswerXHR - the notice is not there already so realtime hasn't inserted it before us"); console.log("FormAnswerXHR - inserting new notice before placeholder"); - $(placeholder).removeClass('notice-answer-placeholder').addClass('notice-reply-placeholder'); + //$(placeholder).removeClass('notice-answer-placeholder').addClass('notice-reply-placeholder'); $(notice).insertBefore(placeholder); - placeholder.show(); + placeholder.remove(); + + SN.U.NoticeInlineReplyPlaceholder(questionItem); + } else { // Realtime came through before us... diff --git a/plugins/QnA/lib/qnashowanswerform.php b/plugins/QnA/lib/qnashowanswerform.php index 8db00e0fcd..10d8f3e192 100644 --- a/plugins/QnA/lib/qnashowanswerform.php +++ b/plugins/QnA/lib/qnashowanswerform.php @@ -185,6 +185,6 @@ class QnashowanswerForm extends Form */ function formClass() { - return 'form_show ajax'; + return 'form_answer_show ajax'; } } diff --git a/plugins/QnA/lib/qnashowquestionform.php b/plugins/QnA/lib/qnashowquestionform.php index f11b0e36fa..9ef7a9e4c9 100644 --- a/plugins/QnA/lib/qnashowquestionform.php +++ b/plugins/QnA/lib/qnashowquestionform.php @@ -165,6 +165,6 @@ class QnashowquestionForm extends Form */ function formClass() { - return 'form_close ajax'; + return 'form_question_show ajax'; } }