Merge pull request #21 from ONLYOFFICE/release/v4.1.0

Release/v4.1.0

apps/presentationeditor/main/app/view/DocumentHolder.js

@@ -188,6 +188,12 @@ define([
 
             var onFocusObject = function(selectedElements) {
                 if (me.mode.isEdit && me.currentMenu && me.currentMenu.isVisible()){
+                    if (me.api.asc_getCurrentFocusObject() === 0 ){ // thumbnails
+                        if (me.slideMenu===me.currentMenu) {
+                            me.currentMenu.options.initMenu({isSlideSelect: me.slideMenu.items[2].isVisible(), fromThumbs: true});
+                            me.currentMenu.alignPosition();
+                        }
+                    } else {
                         var obj = fillMenuProps(selectedElements);
                         if (obj) {
                             if (obj.menu_to_show===me.currentMenu) {
@@ -196,6 +202,7 @@ define([
                             }
                         }
                     }
+                }
             };
 
             var handleDocumentWheel = function(event){
@@ -686,8 +693,11 @@ define([
             };
 
             var onApiCurrentPages = function(number) {
-                if (me.currentMenu && me.currentMenu.isVisible())
+                if (me.currentMenu && me.currentMenu.isVisible()) {
+                    if (me._isFromSlideMenu !== true && me._isFromSlideMenu !== number)
                         me.currentMenu.hide();
+                    me._isFromSlideMenu = number;
+                }
             };
 
             this.setApi = function(o) {
@@ -903,6 +913,7 @@ define([
                 caption     : me.txtDeleteSlide
             }).on('click', _.bind(function(item) {
                 if (me.api){
+                    me._isFromSlideMenu = true;
                     me.api.DeleteSlide();
 
                     me.fireEvent('editcomplete', this);
@@ -1010,6 +1021,7 @@ define([
                         caption : me.txtNewSlide
                     }).on('click', function(item) {
                         if (me.api) {
+                            me._isFromSlideMenu = true;
                             me.api.AddSlide();
 
                             me.fireEvent('editcomplete', this);
@@ -1020,6 +1032,7 @@ define([
                         caption : me.txtDuplicateSlide
                     }).on('click', function(item){
                         if (me.api) {
+                            me._isFromSlideMenu = true;
                             me.api.DublicateSlide();
 
                             me.fireEvent('editcomplete', this);