[v.17] Fix missing not saved warning

docs/CHANGELOG.md

@@ -3,6 +3,7 @@ Changelog
 
 3.2.3 (Unreleased)
 --------------------
+- Fix #400: Fixed missing `not saved` warning
 - Enh #411: Standardization of Modal Button Positions
 
 3.2.2 (July 9, 2024)

module.json

@@ -10,7 +10,7 @@
   ],
   "version": "3.2.3",
   "humhub": {
-    "minVersion": "1.16"
+    "minVersion": "1.17"
   },
   "homepage": "https://github.com/humhub/mail",
   "authors": [

resources/js/humhub.mail.ConversationView.js

@@ -31,6 +31,15 @@ humhub.module('mail.ConversationView', function (module, require, $) {
         });
     };
 
+    ConversationView.prototype.onbeforeunloadCheck = function () {
+        var replyRichtext = this.getReplyRichtext();
+        if (replyRichtext && $(replyRichtext.$[0]).closest('form').find('textarea').val().trim().length) {
+            return client.confirmUnload();
+        }
+
+        return true;
+    };
+
     ConversationView.prototype.loader = function (load) {
         if (load !== false) {
             loader.set(this.$);
@@ -172,6 +181,10 @@ humhub.module('mail.ConversationView', function (module, require, $) {
     };
 
     ConversationView.prototype.loadMessage = function (evt) {
+        if (!this.onbeforeunloadCheck()) {
+            return false;
+        }
+
         var messageId = object.isNumber(evt) ? evt : evt.$trigger.data('message-id');
         var that = this;
         this.loader();

resources/js/humhub.mail.messenger.bundle.js

@@ -31,6 +31,15 @@ humhub.module('mail.ConversationView', function (module, require, $) {
         });
     };
 
+    ConversationView.prototype.onbeforeunloadCheck = function () {
+        var replyRichtext = this.getReplyRichtext();
+        if (replyRichtext && $(replyRichtext.$[0]).closest('form').find('textarea').val().trim().length) {
+            return client.confirmUnload();
+        }
+
+        return true;
+    };
+
     ConversationView.prototype.loader = function (load) {
         if (load !== false) {
             loader.set(this.$);
@@ -172,6 +181,10 @@ humhub.module('mail.ConversationView', function (module, require, $) {
     };
 
     ConversationView.prototype.loadMessage = function (evt) {
+        if (!this.onbeforeunloadCheck()) {
+            return false;
+        }
+
         var messageId = object.isNumber(evt) ? evt : evt.$trigger.data('message-id');
         var that = this;
         this.loader();
@@ -415,7 +428,7 @@ humhub.module('mail.ConversationView', function (module, require, $) {
 
     module.export = ConversationView;
 });
-
+
 humhub.module('mail.ConversationEntry', function (module, require, $) {
 
     var Widget = require('ui.widget').Widget;
@@ -439,7 +452,7 @@ humhub.module('mail.ConversationEntry', function (module, require, $) {
     };
 
     module.export = ConversationEntry;
-});
+});
 humhub.module('mail.inbox', function (module, require, $) {
     var Widget = require('ui.widget').Widget;
     var Filter = require('ui.filter').Filter;
@@ -703,7 +716,7 @@ humhub.module('mail.inbox', function (module, require, $) {
         toggleInbox: toggleInbox
     });
 });
-
+
 humhub.module('mail.conversation', function (module, require, $) {
     var Widget = require('ui.widget').Widget;
     var modal = require('ui.modal');

widgets/ConversationView.php

@@ -8,6 +8,7 @@
 
 namespace humhub\modules\mail\widgets;
 
+use Yii;
 use humhub\widgets\JsWidget;
 use humhub\modules\mail\helpers\Url;