From 008b899422519e8692d9f2852d0905bf3483bfb0 Mon Sep 17 00:00:00 2001
From: Augier <contact@c-henry.fr>
Date: Thu, 1 Dec 2016 12:04:42 +0100
Subject: [PATCH] Markdown editor on publisher, conversations and mobile
 comments

---
 app/assets/javascripts/mobile/mobile.js       |  6 +++--
 .../javascripts/mobile/mobile_comments.js     |  2 ++
 .../mobile/mobile_conversations.js            |  1 +
 app/assets/javascripts/mobile/publisher.js    |  2 ++
 app/assets/stylesheets/markdown-editor.scss   |  1 +
 .../stylesheets/mobile/markdown_editor.scss   | 22 +++++++++++++++++++
 app/assets/stylesheets/mobile/mobile.scss     |  2 ++
 7 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/stylesheets/mobile/markdown_editor.scss

diff --git a/app/assets/javascripts/mobile/mobile.js b/app/assets/javascripts/mobile/mobile.js
index f0fb64c39..0bb660573 100644
--- a/app/assets/javascripts/mobile/mobile.js
+++ b/app/assets/javascripts/mobile/mobile.js
@@ -1,9 +1,9 @@
-// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
-
 /*   Copyright (c) 2010-2011, Diaspora Inc.  This file is
  *   licensed under the Affero General Public License version 3 or later.  See
  *   the COPYRIGHT file.
  */
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 //= require jquery-textchange
 //= require charcount
 //= require js-routes
@@ -18,6 +18,8 @@
 //= require helpers/i18n
 //= require helpers/profile_photo_uploader
 //= require helpers/tags_autocomplete
+//= require bootstrap-markdown/bootstrap-markdown
+//= require helpers/markdown_editor
 //= require widgets/timeago
 //= require mobile/mobile_application
 //= require mobile/mobile_file_uploader
diff --git a/app/assets/javascripts/mobile/mobile_comments.js b/app/assets/javascripts/mobile/mobile_comments.js
index 0dbfa662f..a10c60639 100644
--- a/app/assets/javascripts/mobile/mobile_comments.js
+++ b/app/assets/javascripts/mobile/mobile_comments.js
@@ -11,6 +11,8 @@
     initialize: function() {
       var self = this;
 
+      new Diaspora.MarkdownEditor(".comment_box");
+
       this.stream().on("tap click", "a.show-comments", function(evt){
         evt.preventDefault();
         self.toggleComments($(this));
diff --git a/app/assets/javascripts/mobile/mobile_conversations.js b/app/assets/javascripts/mobile/mobile_conversations.js
index bf88bb5ff..5d42b5813 100644
--- a/app/assets/javascripts/mobile/mobile_conversations.js
+++ b/app/assets/javascripts/mobile/mobile_conversations.js
@@ -1,6 +1,7 @@
 (function() {
   Diaspora.Mobile.Conversations = {
     initialize: function() {
+      new Diaspora.MarkdownEditor(".conversation-message-text");
       if (Diaspora.Page !== "ConversationsNew") { return; }
       $(document).on("ajax:success", "form#new-conversation", this.conversationCreateSuccess);
       $(document).on("ajax:error", "form#new-conversation", this.conversationCreateError);
diff --git a/app/assets/javascripts/mobile/publisher.js b/app/assets/javascripts/mobile/publisher.js
index 6954631cf..f50c6aa71 100644
--- a/app/assets/javascripts/mobile/publisher.js
+++ b/app/assets/javascripts/mobile/publisher.js
@@ -46,4 +46,6 @@ $(document).ready(function(){
     evt.preventDefault();
     $("#new_status_message").submit();
   });
+
+  new Diaspora.MarkdownEditor("#status_message_text");
 });
diff --git a/app/assets/stylesheets/markdown-editor.scss b/app/assets/stylesheets/markdown-editor.scss
index d2657f5ad..e5e3b5a77 100644
--- a/app/assets/stylesheets/markdown-editor.scss
+++ b/app/assets/stylesheets/markdown-editor.scss
@@ -42,6 +42,7 @@
 
   .btn-group {
     margin-bottom: 8px;
+    &:first-child { margin-left: 0; }
 
     [class^="entypo-"],
     [class*="entypo-"] {
diff --git a/app/assets/stylesheets/mobile/markdown_editor.scss b/app/assets/stylesheets/mobile/markdown_editor.scss
new file mode 100644
index 000000000..1c804f263
--- /dev/null
+++ b/app/assets/stylesheets/mobile/markdown_editor.scss
@@ -0,0 +1,22 @@
+.md-editor {
+  border: 1px solid $light-grey;
+  border-radius: $btn-border-radius-base;
+  overflow: hidden;
+
+  &.active { border-color: $text-grey; }
+
+  &::after,
+  &::before {
+    clear: both;
+    content: ' ';
+    display: table;
+  }
+
+  textarea {
+    border: 0;
+    border-radius: 0;
+    min-height: 6rem;
+    resize: none;
+    width: 100%;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index 38aca56f8..7911cddab 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -16,6 +16,8 @@
 @import "mobile/stream_element";
 @import "mobile/comments";
 @import 'mobile/openid_connect_error_page';
+@import 'markdown-editor';
+@import 'mobile/markdown_editor';
 
 @import 'typography';