From bde3b47c026e8945f5fcb5fa75361b0aa0468115 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 10 Oct 2015 13:29:48 +0200
Subject: [PATCH] [WIP] [mobile] Embedded new comment form in HTML
---
.../javascripts/mobile/mobile_comments.js | 34 ++++++++++---------
app/views/shared/_stream_element.mobile.haml | 3 ++
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/app/assets/javascripts/mobile/mobile_comments.js b/app/assets/javascripts/mobile/mobile_comments.js
index 293660655d..c87ac6f285 100644
--- a/app/assets/javascripts/mobile/mobile_comments.js
+++ b/app/assets/javascripts/mobile/mobile_comments.js
@@ -122,27 +122,29 @@
showCommentBox: function(link){
if(!link.hasClass("inactive") || link.hasClass("loading")) { return; }
- var self = this;
- $.ajax({
- url: link.attr("href"),
- beforeSend: function(){
- link.addClass("loading");
- },
- context: link,
- success: function(data) {
- self.appendCommentBox.call(this, link, data);
- },
- error: function() {
- link.removeClass("loading");
- }
- });
+ // var self = this;
+ // $.ajax({
+ // url: link.attr("href"),
+ // beforeSend: function(){
+ // link.addClass("loading");
+ // },
+ // context: link,
+ // success: function(data) {
+ // self.appendCommentBox.call(this, link, data);
+ // },
+ // error: function() {
+ // link.removeClass("loading");
+ // }
+ // });
+ this.appendCommentBox(link);
},
- appendCommentBox: function(link, data) {
+ appendCommentBox: function(link) {
link.removeClass("loading");
link.removeClass("inactive");
var bottomBar = link.closest(".bottom_bar").first();
- bottomBar.append(data);
+ // bottomBar.append(data);
+ var addCommentSwitcher = bottomBar.find(".add-comment-switcher").removeClass('hidden')
var textArea = bottomBar.find("textarea.comment_box").first()[0];
autosize(textArea);
},
diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml
index 778384320c..6ff99ea69e 100644
--- a/app/views/shared/_stream_element.mobile.haml
+++ b/app/views/shared/_stream_element.mobile.haml
@@ -29,3 +29,6 @@
- if defined?(expanded_info) && expanded_info
= render partial: "shared/post_stats", locals: {post: @post}
+
+ .add-comment-switcher{class: ('hidden' unless defined?(expanded_info) && expanded_info)}
+ = render :partial => 'comments/new_comment', :locals =>{:post_id => post.id}
--
GitLab