From 49e840d62bb0da1266c981ccbeb973136785e289 Mon Sep 17 00:00:00 2001 From: Rocky Duan Date: Tue, 14 Aug 2012 12:43:15 -0700 Subject: [PATCH] adjust new post button in forum view --- .../coffee/src/discussion/discussion.coffee | 60 ++++++++++--------- lms/static/coffee/src/discussion/main.coffee | 2 + lms/static/js/jquery.autocomplete.js | 1 - lms/static/sass/_discussion.scss | 2 +- lms/templates/discussion/_forum.html | 2 +- lms/templates/discussion/index.html | 2 +- 6 files changed, 38 insertions(+), 31 deletions(-) diff --git a/lms/static/coffee/src/discussion/discussion.coffee b/lms/static/coffee/src/discussion/discussion.coffee index c7e3e5ab8d..329cd19a7e 100644 --- a/lms/static/coffee/src/discussion/discussion.coffee +++ b/lms/static/coffee/src/discussion/discussion.coffee @@ -50,15 +50,13 @@ initializeFollowDiscussion = (discussion) -> success: (response, textStatus) -> $thread = $(response.html) $discussion.children(".threads").prepend($thread) - Discussion.setWmdContent $discussion, $local, "new-post-body", "" - #Discussion.setContentInfo response.content['id'], 'editable', true - Discussion.extendContentInfo response.content['id'], response['annotated_content_info'] - Discussion.initializeContent($thread) - Discussion.bindContentEvents($thread) - $(".new-post-form").addClass("collapsed") + $local(".new-post-form").remove() handleCancelNewPost = (elem) -> - $(".new-post-form").addClass("collapsed") + if $discussion.hasClass("inline-discussion") + $local(".new-post-form").addClass("collapsed") + else + $local(".new-post-form").hide() handleSimilarPost = (elem) -> $title = $local(".new-post-title") @@ -99,30 +97,33 @@ initializeFollowDiscussion = (discussion) -> view = { discussion_id: id } $discussionNonContent = $discussion.children(".discussion-non-content") - $discussionNonContent.append Mustache.render Discussion.newPostTemplate, view - newPostBody = $discussion.find(".new-post-body") - if newPostBody.length + if not $local(".wmd-panel").length + $discussionNonContent.append Mustache.render Discussion.newPostTemplate, view + $newPostBody = $local(".new-post-body") Discussion.makeWmdEditor $discussion, $local, "new-post-body" $input = Discussion.getWmdInput($discussion, $local, "new-post-body") - $input.attr("placeholder", "post a new topic...").bind 'focus', (e) -> - console.log "triggered" + $input.attr("placeholder", "post a new topic...") + if $discussion.hasClass("inline-discussion") + $input.bind 'focus', (e) -> + $local(".new-post-form").removeClass('collapsed') + else $local(".new-post-form").removeClass('collapsed') - $local(".new-post-tags").tagsInput Discussion.tagsInputOptions() + $local(".new-post-tags").tagsInput Discussion.tagsInputOptions() - $local(".new-post-title").blur -> - handleSimilarPost(this) + $local(".new-post-title").blur -> + handleSimilarPost(this) - $local(".hide-similar-posts").click -> - $local(".new-post-similar-posts-wrapper").hide() + $local(".hide-similar-posts").click -> + $local(".new-post-similar-posts-wrapper").hide() - $local(".discussion-submit-post").click -> - handleSubmitNewPost(this) - $local(".discussion-cancel-post").click -> - handleCancelNewPost(this) + $local(".discussion-submit-post").click -> + handleSubmitNewPost(this) + $local(".discussion-cancel-post").click -> + handleCancelNewPost(this) - #$(elem).hide() + $local(".new-post-form").show() handleAjaxReloadDiscussion = (elem, url) -> $elem = $(elem) @@ -153,17 +154,22 @@ initializeFollowDiscussion = (discussion) -> url = $elem.attr("page-url") handleAjaxReloadDiscussion($elem, url) - initializeNewPost() - + if $discussion.hasClass("inline-discussion") + initializeNewPost() + + $discussionSidebar = $(".discussion-sidebar") + if $discussionSidebar.length + $sidebarLocal = Discussion.generateLocal($discussionSidebar) + Discussion.bindLocalEvents $sidebarLocal, + "click .sidebar-new-post-button": (event) -> + initializeNewPost() + Discussion.bindLocalEvents $local, "submit .search-wrapper>.discussion-search-form": (event) -> event.preventDefault() handleAjaxSearch(this) - #"click .discussion-new-post": -> - # handleNewPost(this) - "click .discussion-search-link": -> handleAjaxSearch($local(".search-wrapper>.discussion-search-form")) diff --git a/lms/static/coffee/src/discussion/main.coffee b/lms/static/coffee/src/discussion/main.coffee index 4828c60c4d..ae340aba84 100644 --- a/lms/static/coffee/src/discussion/main.coffee +++ b/lms/static/coffee/src/discussion/main.coffee @@ -19,3 +19,5 @@ $ -> $("section.discussion").each (index, discussion) -> Discussion.initializeDiscussion(discussion) Discussion.bindDiscussionEvents(discussion) + + diff --git a/lms/static/js/jquery.autocomplete.js b/lms/static/js/jquery.autocomplete.js index e7891564d7..8a43f12a36 100644 --- a/lms/static/js/jquery.autocomplete.js +++ b/lms/static/js/jquery.autocomplete.js @@ -538,7 +538,6 @@ processResults(this.options.data, value); } else { this.fetchRemoteData(value, function(remoteData) { - console.log(remoteData); processResults(remoteData, value); }); } diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 21e0638316..dc49521d72 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -762,7 +762,7 @@ $tag-text-color: #5b614f; } } - &.inline-discussion { + &.inline-discussion, .forum-discussion { .new-post-form { margin: 24px 60px; diff --git a/lms/templates/discussion/_forum.html b/lms/templates/discussion/_forum.html index 5a4a0093ef..82cb15ad24 100644 --- a/lms/templates/discussion/_forum.html +++ b/lms/templates/discussion/_forum.html @@ -1,6 +1,6 @@ <%namespace name="renderer" file="_thread.html"/> -
+
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html index 094e10bc2e..5145c84837 100644 --- a/lms/templates/discussion/index.html +++ b/lms/templates/discussion/index.html @@ -22,7 +22,7 @@