Commit 2a54c189 authored by Oleg Korshul's avatar Oleg Korshul

presentations mobile: context menu bugs

parent 261f2d95
...@@ -815,6 +815,9 @@ function CDrawingDocument() ...@@ -815,6 +815,9 @@ function CDrawingDocument()
this.OnRecalculatePage = function(index, pageObject) this.OnRecalculatePage = function(index, pageObject)
{ {
if (this.m_oWordControl && this.m_oWordControl.MobileTouchManager)
this.m_oWordControl.MobileTouchManager.ClearContextMenu();
editor.sendEvent("asc_onDocumentChanged"); editor.sendEvent("asc_onDocumentChanged");
if (true === this.m_bIsSearching) if (true === this.m_bIsSearching)
...@@ -3884,6 +3887,9 @@ function CThumbnailsManager() ...@@ -3884,6 +3887,9 @@ function CThumbnailsManager()
var word_control = this.m_oWordControl; var word_control = this.m_oWordControl;
if (word_control && word_control.MobileTouchManagerThumbnails)
word_control.MobileTouchManagerThumbnails.ClearContextMenu();
var canvas = word_control.m_oThumbnails.HtmlElement; var canvas = word_control.m_oThumbnails.HtmlElement;
if (null == canvas) if (null == canvas)
return; return;
......
...@@ -940,7 +940,18 @@ ...@@ -940,7 +940,18 @@
}; };
CMobileDelegateThumbnails.prototype.GetContextMenuPosition = function() CMobileDelegateThumbnails.prototype.GetContextMenuPosition = function()
{ {
return { X : 0, Y : 0 }; var aSelected = this.Thumbnails.GetSelectedArray();
var nSlideIndex = Math.min.apply(Math, aSelected);
var ConvertedPos = this.Thumbnails.GetThumbnailPagePosition(nSlideIndex);
var _ret = { X : 0, Y : 0, Mode : AscCommon.MobileTouchContextMenuType.Slide };
if (ConvertedPos)
{
_ret.X = ConvertedPos.X;
_ret.Y = ConvertedPos.Y;
}
return _ret;
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment