- Fix: Richtext loses mark state

- Fix: New comment scroll behavior not used in comment edit view
- Chng: Updated `humhub-prosemirror-richtext` to v1.0.12

composer.json

@@ -42,7 +42,7 @@
         "kartik-v/yii2-widgets": "*",
         "mistic100/randomcolor": "^1.0",
         "npm-asset/at.js": "^1.5.1",
-        "npm-asset/humhub-prosemirror-richtext": "1.0.11",
+        "npm-asset/humhub-prosemirror-richtext": "1.0.12",
         "npm-asset/socket.io-client": "^2.0",
         "nqxcode/zendsearch": "^2.0",
         "phpoffice/phpspreadsheet": "^1.0",

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "ab0519aaab9316c7e13fcb134ad8b179",
-    "content-hash": "a327ad5900c5d79d65d2fba92d89b795",
+    "hash": "61be65de1816248e0396cb748b17fe24",
+    "content-hash": "20fc7d5ac78d51f333d8012029d4ad8d",
     "packages": [
         {
             "name": "bower-asset/animate.css",
@@ -2517,10 +2517,10 @@
         },
         {
             "name": "npm-asset/humhub-prosemirror-richtext",
-            "version": "1.0.11",
+            "version": "1.0.12",
             "dist": {
                 "type": "tar",
-                "url": "https://registry.npmjs.org/humhub-prosemirror-richtext/-/humhub-prosemirror-richtext-1.0.11.tgz",
+                "url": "https://registry.npmjs.org/humhub-prosemirror-richtext/-/humhub-prosemirror-richtext-1.0.12.tgz",
                 "reference": null,
                 "shasum": null
             },

protected/humhub/docs/CHANGELOG.md

@@ -1,6 +1,13 @@
 HumHub Change Log
 =================
 
+1.3.6  (October 11, 2018)
+---------------------------
+- Fix: Richtext loses mark state
+- Fix: New comment scroll behavior not used in edit comment
+- Chng: Updated `humhub-prosemirror-richtext` to v1.0.12
+
+
 1.3.5  (October 10, 2018)
 ---------------------------
 

protected/humhub/modules/comment/resources/js/humhub.comment.js

@@ -221,11 +221,11 @@ humhub.module('comment', function (module, require, $) {
     };
 
     var scrollActive = function(evt) {
-        evt.$trigger.parent().addClass('scrollActive')
+        evt.$trigger.closest('.comment-create-input-group').addClass('scrollActive')
     };
 
     var scrollInactive = function(evt) {
-        evt.$trigger.parent().removeClass('scrollActive');
+        evt.$trigger.closest('.comment-create-input-group').removeClass('scrollActive');
     };
 
     module.export({

protected/humhub/modules/comment/views/comment/edit.php

@@ -24,8 +24,13 @@ $submitUrl = Url::to(['/comment/comment/edit', 'id' => $comment->id, 'contentMod
             <?= $form->field($comment, 'message')->widget(RichTextField::class, [
                 'id' => 'comment_input_'.$comment->id,
                 'layout' => RichTextField::LAYOUT_INLINE,
+                'pluginOptions' => ['maxHeight' => '300px'],
                 'placeholder' => Yii::t('CommentModule.views_edit', 'Edit your comment...'),
-                'focus' => true
+                'focus' => true,
+                'events' => [
+                    'scroll-active' => 'comment.scrollActive',
+                    'scroll-inactive' => 'comment.scrollInactive'
+                ]
             ])->label(false) ?>
 
             <div class="comment-buttons">