Merge branch 'hotfix/v4.1.2' of https://github.com/ONLYOFFICE/web-apps into hotfix/v4.1.2

apps/common/main/lib/controller/ReviewChanges.js

@@ -201,7 +201,7 @@ define([
                         if (typeof value == 'object') {
                             _.each(value, function(obj) {
                                 if (typeof obj === 'string')
-                                    changetext += (' ' + obj);
+                                    changetext += (' ' + Common.Utils.String.htmlEncode(obj));
                                 else {
                                     switch (obj) {
                                         case 0:
@@ -220,7 +220,7 @@ define([
                                 }
                             })
                         } else if (typeof value === 'string') {
-                            changetext +=  (' ' + value);
+                            changetext +=  (' ' + Common.Utils.String.htmlEncode(value));
                         }
                     break;
                     case Asc.c_oAscRevisionsChangeType.TextRem:
@@ -228,7 +228,7 @@ define([
                         if (typeof value == 'object') {
                             _.each(value, function(obj) {
                                 if (typeof obj === 'string')
-                                    changetext += (' ' + obj);
+                                    changetext += (' ' + Common.Utils.String.htmlEncode(obj));
                                 else {
                                     switch (obj) {
                                         case 0:
@@ -247,7 +247,7 @@ define([
                                 }
                             })
                         } else if (typeof value === 'string') {
-                            changetext +=  (' ' + value);
+                            changetext +=  (' ' + Common.Utils.String.htmlEncode(value));
                         }
                     break;
                     case Asc.c_oAscRevisionsChangeType.ParaAdd:

apps/common/main/lib/view/OpenDialog.js

@@ -104,15 +104,21 @@ define([
                 this.$window.find('.tool').hide();
                 this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
                 if (this.type == Asc.c_oAscAdvancedOptionsID.DRM) {
-                    var me = this;
-                    me.inputPwd = new Common.UI.InputField({
+                    this.inputPwd = new Common.UI.InputField({
                         el: $('#id-password-txt'),
                         type: 'password',
                         allowBlank: false,
                         validateOnBlur: false
                     });
-                } else
+                    this.$window.find('input').on('keypress', _.bind(this.onKeyPress, this));
+                } else {
+                    var me = this;
                     this.initCodePages();
+                    this.onPrimary = function() {
+                        me.onBtnClick();
+                        return false;
+                    };
+                }
             }
         },
 
@@ -138,9 +144,9 @@ define([
             this.close();
         },
 
-        onPrimary: function() {
-            this.onBtnClick();
-            return false;
+        onKeyPress: function(event) {
+            if (event.keyCode == Common.UI.Keys.RETURN)
+                this.onBtnClick();
         },
 
         initCodePages: function () {