Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
Release/v4.1.0
This commit is contained in:
Julia Radzhabova 2016-08-30 11:35:30 +03:00 committed by GitHub
parent d7b05c7ada 7dc8c7534b
commit 59bac2b215
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -188,6 +188,12 @@ define([
var onFocusObject = function(selectedElements) { var onFocusObject = function(selectedElements) {
if (me.mode.isEdit && me.currentMenu && me.currentMenu.isVisible()){ 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); var obj = fillMenuProps(selectedElements);
if (obj) { if (obj) {
if (obj.menu_to_show===me.currentMenu) { if (obj.menu_to_show===me.currentMenu) {
@ -196,6 +202,7 @@ define([
} }
} }
} }
}
}; };
var handleDocumentWheel = function(event){ var handleDocumentWheel = function(event){
@ -686,8 +693,11 @@ define([
}; };
var onApiCurrentPages = function(number) { 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.currentMenu.hide();
me._isFromSlideMenu = number;
}
}; };
this.setApi = function(o) { this.setApi = function(o) {
@ -903,6 +913,7 @@ define([
caption : me.txtDeleteSlide caption : me.txtDeleteSlide
}).on('click', _.bind(function(item) { }).on('click', _.bind(function(item) {
if (me.api){ if (me.api){
me._isFromSlideMenu = true;
me.api.DeleteSlide(); me.api.DeleteSlide();
me.fireEvent('editcomplete', this); me.fireEvent('editcomplete', this);
@ -1010,6 +1021,7 @@ define([
caption : me.txtNewSlide caption : me.txtNewSlide
}).on('click', function(item) { }).on('click', function(item) {
if (me.api) { if (me.api) {
me._isFromSlideMenu = true;
me.api.AddSlide(); me.api.AddSlide();
me.fireEvent('editcomplete', this); me.fireEvent('editcomplete', this);
@ -1020,6 +1032,7 @@ define([
caption : me.txtDuplicateSlide caption : me.txtDuplicateSlide
}).on('click', function(item){ }).on('click', function(item){
if (me.api) { if (me.api) {
me._isFromSlideMenu = true;
me.api.DublicateSlide(); me.api.DublicateSlide();
me.fireEvent('editcomplete', this); me.fireEvent('editcomplete', this);