Commit 2773a333 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

правильная работа при проигрувании презентации и нажатии назад при обратном переходе

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52820 954022d7-b5bf-4e40-9824-e11837661b57
parent cdac1279
...@@ -2791,6 +2791,7 @@ function CDemonstrationManager(htmlpage) ...@@ -2791,6 +2791,7 @@ function CDemonstrationManager(htmlpage)
this.StartSlideBackward = function() this.StartSlideBackward = function()
{ {
var _is_transition = oThis.Transition.IsPlaying();
oThis.StopTransition(); oThis.StopTransition();
if (oThis.SlideNum == oThis.SlidesCount) if (oThis.SlideNum == oThis.SlidesCount)
...@@ -2816,13 +2817,15 @@ function CDemonstrationManager(htmlpage) ...@@ -2816,13 +2817,15 @@ function CDemonstrationManager(htmlpage)
var _slides = oThis.HtmlPage.m_oLogicDocument.Slides; var _slides = oThis.HtmlPage.m_oLogicDocument.Slides;
var _timing = _slides[oThis.SlideNum].timing; var _timing = _slides[oThis.SlideNum].timing;
if (_timing.TransitionType != c_oAscSlideTransitionTypes.None && _timing.TransitionDuration > 0) if (!_is_transition && (_timing.TransitionType != c_oAscSlideTransitionTypes.None && _timing.TransitionDuration > 0))
{ {
oThis.StartTransition(_timing, false, true); oThis.StartTransition(_timing, false, true);
return; return;
} }
oThis.SlideNum--; if (!_is_transition)
oThis.SlideNum--;
oThis.OnPaintSlide(false); oThis.OnPaintSlide(false);
} }
......
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