Merge branch 'release/v6.3.0' into develop

apps/api/documents/api.js

@@ -402,7 +402,7 @@
 
                 if (typeof _config.document.fileType === 'string' && _config.document.fileType != '') {
                     _config.document.fileType = _config.document.fileType.toLowerCase();
-                    var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|docm|dot|dotm|dotx|fodt|ott|fb2))$/
+                    var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|docm|dot|dotm|dotx|fodt|ott|fb2|xml))$/
                                     .exec(_config.document.fileType);
                     if (!type) {
                         window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it.");

apps/common/main/lib/component/TableStyler.js

@@ -677,10 +677,12 @@ define([
             };
 
             me.setTableColor = function(color) {
+                table_content.toggleClass('transparent', color == 'transparent');
                 table_content.css('background-color', (color == 'transparent' ) ? color : ('#'+color));
             };
 
             me.setCellsColor = function(color) {
+                !me.spacingMode && table_content.toggleClass('transparent', color == 'transparent');
                 cells_content.css('background-color', (color == 'transparent' ) ? color : ('#'+color));
             };
 

apps/common/main/lib/component/Window.js

@@ -455,7 +455,7 @@ define([
             if (!options.width) options.width = 'auto';
             
             var template =  '<div class="info-box">' +
-                                '<% if (typeof iconCls !== "undefined") { %><div class="icon img-commonctrl img-no-theme-filter <%= iconCls %>"></div><% } %>' +
+                                '<% if (typeof iconCls !== "undefined") { %><div class="icon img-commonctrl img-colored <%= iconCls %>"></div><% } %>' +
                                 '<div class="text" <% if (typeof iconCls == "undefined") { %> style="padding-left:10px;" <% } %>><span><%= msg %></span>' +
                                     '<% if (dontshow) { %><div class="dont-show-checkbox"></div><% } %>' +
                                 '</div>' +

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

@@ -190,6 +190,7 @@ define([
                 this.api.asc_registerCallback('asc_onHideComment', _.bind(this.onApiHideComment, this));
                 this.api.asc_registerCallback('asc_onUpdateCommentPosition', _.bind(this.onApiUpdateCommentPosition, this));
                 this.api.asc_registerCallback('asc_onDocumentPlaceChanged', _.bind(this.onDocumentPlaceChanged, this));
+                this.api.asc_registerCallback('asc_onDeleteComment', _.bind(this.onDeleteComment, this)); // only for PE, when del or ctrl+x pressed
             }
         },
 
@@ -1051,6 +1052,12 @@ define([
             }
         },
 
+        onDeleteComment: function (id, comment) {
+            if (this.api) {
+                this.api.asc_RemoveAllComments(!this.mode.canDeleteComments, true);// 1 param = true if remove only my comments, 2 param - remove current comments
+            }
+        },
+
         // internal
 
         updateComments: function (needRender, disableSort, loadText) {

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

@@ -647,20 +647,24 @@ define([
                     warn = false;
                 if (plugins.plugins && plugins.plugins.length>0)
                     arr = plugins.plugins;
-                var val = plugins.config.autostart || plugins.config.autoStartGuid;
-                if (typeof (val) == 'string')
-                    val = [val];
-                warn = !!plugins.config.autoStartGuid;
-                autostart = val || [];
+                if (plugins && plugins.config) {
+                    var val = plugins.config.autostart || plugins.config.autoStartGuid;
+                    if (typeof (val) == 'string')
+                        val = [val];
+                    warn = !!plugins.config.autoStartGuid;
+                    autostart = val || [];
+                }
 
                 plugins = this.serverPlugins;
                 if (plugins.plugins && plugins.plugins.length>0)
                     arr = arr.concat(plugins.plugins);
-                val = plugins.config.autostart || plugins.config.autoStartGuid;
-                if (typeof (val) == 'string')
-                    val = [val];
-                (warn || plugins.config.autoStartGuid) && console.warn("Obsolete: The autoStartGuid parameter is deprecated. Please check the documentation for new plugin connection configuration.");
-                autostart = autostart.concat(val || []);
+                if (plugins && plugins.config) {
+                    val = plugins.config.autostart || plugins.config.autoStartGuid;
+                    if (typeof (val) == 'string')
+                        val = [val];
+                    (warn || plugins.config.autoStartGuid) && console.warn("Obsolete: The autoStartGuid parameter is deprecated. Please check the documentation for new plugin connection configuration.");
+                    autostart = autostart.concat(val || []);
+                }
 
                 this.autostart = autostart;
                 this.parsePlugins(arr, false);

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

@@ -8,18 +8,35 @@ define([
     'use strict';
 
     Common.UI.Themes = new (function() {
-        var sdk_themes_relation = {
+        var sdk_themes_alias = {
             'theme-light': 'flat',
             'theme-dark': 'flatDark'
         };
 
-        sdk_themes_relation.contains = function (name) {
+        sdk_themes_alias.contains = function (name) {
             return !!this[name];
         }
 
+        var refresh_sdk_colors = function () {
+            var style = getComputedStyle(document.body);
+            if ( !!window.DE ) {
+                var color_background_normal = style.getPropertyValue('--background-normal');
+                this.api.asc_setSkin({
+                    "RulerOutline": style.getPropertyValue('--border-toolbar')
+                    , "RulerMarkersFillColor": color_background_normal
+                    , "RulerMarkersFillColorOld": color_background_normal
+                    , "RulerTableColor1": color_background_normal
+                });
+            }
+        }
         return {
+            THEME_LIGHT_ID: 'theme-light',
+            THEME_DARK_ID: 'theme-dark',
+
             init: function (api) {
                 var me = this;
+                refresh_sdk_colors = refresh_sdk_colors.bind(this);
+
                 $(window).on('storage', function (e) {
                     if ( e.key == 'ui-theme' ) {
                         me.setTheme(e.originalEvent.newValue);
@@ -28,12 +45,14 @@ define([
 
                 this.api = api;
                 var theme_name = Common.localStorage.getItem('ui-theme', 'theme-light');
-                api.asc_setSkin(sdk_themes_relation[theme_name]);
+                api.asc_setSkin(sdk_themes_alias[theme_name]);
 
                 if ( !$('body').hasClass(theme_name) ) {
                     $('body').addClass(theme_name);
                 }
 
+                refresh_sdk_colors();
+
                 // app.eventbus.addListeners({
                 //    'FileMenu': {
                 //         'settings:apply': function (menu) {
@@ -49,7 +68,7 @@ define([
             },
 
             current: function () {
-                return Common.localStorage.getItem('ui-theme', 'theme-light');
+                return Common.localStorage.getItem('ui-theme') || 'theme-light';
             },
 
             isDarkTheme: function () {
@@ -57,23 +76,13 @@ define([
             },
 
             setTheme: function (name) {
-                if ( sdk_themes_relation.contains(name) ) {
+                if ( sdk_themes_alias.contains(name) ) {
                     var classname = document.documentElement.className.replace(/theme-\w+\s?/, '');
                     document.body.className = classname;
 
                     $('body').addClass(name);
-                    this.api.asc_setSkin(sdk_themes_relation[name]);
-
-                    var style = getComputedStyle(document.body);
-                    if ( !!window.DE ) {
-                        var color_background_normal = style.getPropertyValue('--background-normal');
-                        this.api.asc_setSkin({
-                            "RulerOutline": style.getPropertyValue('--border-toolbar')
-                            , "RulerMarkersFillColor": color_background_normal
-                            , "RulerMarkersFillColorOld": color_background_normal
-                            , "RulerTableColor1": color_background_normal
-                        });
-                    }
+                    this.api.asc_setSkin(sdk_themes_alias[name]);
+                    refresh_sdk_colors();
 
                     Common.localStorage.setItem('ui-theme', name);
                     Common.NotificationCenter.trigger('uitheme:changed', name);

apps/common/main/lib/util/utils.js

@@ -120,7 +120,7 @@ Common.Utils = _.extend(new(function() {
         me = this,
         checkSize = function() {
             var scale = {};
-            if ( !!window.AscCommon )
+            if ( !!window.AscCommon && !!window.AscCommon.checkDeviceScale )
                 scale = window.AscCommon.checkDeviceScale();
             else {
                 var str_mq_150 = "screen and (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), " +
@@ -140,7 +140,7 @@ Common.Utils = _.extend(new(function() {
             if ( scale.devicePixelRatio < 1.5 ) {
                 $root.removeClass('pixel-ratio__1_5 pixel-ratio__2');
             } else
-            if ( !(scale.devicePixelRatio < 1.5) && !(scale.devicePixelRatio > 2) ) {
+            if ( !(scale.devicePixelRatio < 1.5) && scale.devicePixelRatio < 2 ) {
                 $root.removeClass('pixel-ratio__2');
                 $root.addClass('pixel-ratio__1_5');
             } else {
@@ -1086,4 +1086,4 @@ Common.Utils.UserInfoParser = new(function() {
             return _intersection(commentGroups.remove, groups);
         }
     }
-})();
+})();

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

@@ -77,7 +77,7 @@ define([
                         '<div class="user-name" data-can-copy="true">',
                             '<div class="color" style="display: inline-block; background-color: <% if (msg.get("usercolor")!==null) { %><%=msg.get("usercolor")%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getUserName(msg.get("username")) %>',
                         '</div>',
-                        '<label class="message user-select" data-can-copy="true"><%= msg.get("message") %></label>',
+                        '<label class="message user-select" data-can-copy="true" tabindex="-1" oo_editor_input="true"><%= msg.get("message") %></label>',
                     '<% } %>',
             '</li>'].join(''),