Unverified Commit 76248544 authored by Steffen van Bergerem's avatar Steffen van Bergerem
Browse files

Merge pull request #7235 from AugierLe42e/md-editor-mobile-view 

Markdown editor final chapter: add editor on publisher, comments and conversation of mobile view
parents a6fb85d1 f4cdec03

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ If so, please delete it since it will prevent the federation from working proper 
* Add markdown editor for comments and conversations [#7482](https://github.com/diaspora/diaspora/pull/7482)

* Improve responsive header in desktop version [#7509](https://github.com/diaspora/diaspora/pull/7509)

* Support cmd+enter to submit posts, comments and conversations [#7524](https://github.com/diaspora/diaspora/pull/7524)

* Add markdown editor for posts, comments and conversations on mobile [#7235](https://github.com/diaspora/diaspora/pull/7235)



# 0.6.8.0

app/assets/javascripts/mobile/mobile.js

+4 −2
Original line number Diff line number Diff line 
// @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

app/assets/javascripts/mobile/mobile_comments.js

+2 −0
Original line number Diff line number Diff line
@@ -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));

app/assets/javascripts/mobile/mobile_conversations.js

+1 −0
Original line number Diff line number Diff line 
(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);

app/assets/javascripts/mobile/publisher.js

+2 −0
Original line number Diff line number Diff line
@@ -46,4 +46,6 @@ $(document).ready(function(){ 
    evt.preventDefault();

    $("#new_status_message").submit();

  });



  new Diaspora.MarkdownEditor("#status_message_text");

});