Зацикливание презентаций в режиме просмотра

slide/Drawing/Transitions.js

@@ -3062,6 +3062,10 @@ function CDemonstrationManager(htmlpage)
                 if (oThis.IsPlayMode)
                 {
                     oThis.SlideNum++;
+                    if(oThis.SlideNum === oThis.SlidesCount && oThis.HtmlPage.m_oApi.WordControl.m_oLogicDocument.isLoopShowMode())
+                    {
+                        oThis.SlideNum = 0;
+                    }
                     oThis.HtmlPage.m_oApi.sync_DemonstrationSlideChanged(oThis.SlideNum);
                     oThis.StartSlide(true, false);
                 }
@@ -3121,7 +3125,7 @@ function CDemonstrationManager(htmlpage)
 
         if (this.SlideNum >= this.SlidesCount)
         {
-            if (this.HtmlPage.m_oApi.m_oLogicDocument.isLoopShowMode())
+            if (this.HtmlPage.m_oApi.WordControl.m_oLogicDocument.isLoopShowMode())
                 this.SlideNum = 0;
             else
             {
@@ -3147,6 +3151,13 @@ function CDemonstrationManager(htmlpage)
             this.StartSlideBackward();
             this.HtmlPage.m_oApi.sync_DemonstrationSlideChanged(this.SlideNum);
         }
+        else if(this.HtmlPage.m_oApi.WordControl.m_oLogicDocument.isLoopShowMode())
+        {
+            this.CorrectSlideNum();
+            this.SlideNum = this.SlidesCount;
+            this.StartSlideBackward();
+            this.HtmlPage.m_oApi.sync_DemonstrationSlideChanged(this.SlideNum);
+        }
     }
 
     this.GoToSlide = function(slideNum)

slide/apiCommon.js

@@ -11,6 +11,7 @@ function CAscSlideTiming()
     this.SlideAdvanceOnMouseClick   = undefined;
     this.SlideAdvanceAfter          = undefined;
     this.SlideAdvanceDuration       = undefined;
+    this.ShowLoop                   = undefined;
 }
 
 CAscSlideTiming.prototype.put_TransitionType = function(v) { this.TransitionType = v; }
@@ -26,6 +27,8 @@ CAscSlideTiming.prototype.put_SlideAdvanceAfter = function(v) { this.SlideAdvanc
 CAscSlideTiming.prototype.get_SlideAdvanceAfter = function() { return this.SlideAdvanceAfter; }
 CAscSlideTiming.prototype.put_SlideAdvanceDuration = function(v) { this.SlideAdvanceDuration = v; }
 CAscSlideTiming.prototype.get_SlideAdvanceDuration = function() { return this.SlideAdvanceDuration; }
+CAscSlideTiming.prototype.put_ShowLoop = function(v) {this.ShowLoop = v;};
+CAscSlideTiming.prototype.get_ShowLoop = function() {return this.ShowLoop;};
 
 CAscSlideTiming.prototype.applyProps = function(v)
 {
@@ -42,6 +45,8 @@ CAscSlideTiming.prototype.applyProps = function(v)
         this.SlideAdvanceAfter = v.SlideAdvanceAfter;
     if (undefined !== v.SlideAdvanceDuration && null !== v.SlideAdvanceDuration)
         this.SlideAdvanceDuration = v.SlideAdvanceDuration;
+    if (undefined !== v.ShowLoop && null !== v.ShowLoop)
+        this.ShowLoop = v.ShowLoop;
 }
 
 CAscSlideTiming.prototype.createDuplicate = function(v)
@@ -55,6 +60,7 @@ CAscSlideTiming.prototype.createDuplicate = function(v)
     _slideT.SlideAdvanceOnMouseClick   = this.SlideAdvanceOnMouseClick;
     _slideT.SlideAdvanceAfter          = this.SlideAdvanceAfter;
     _slideT.SlideAdvanceDuration       = this.SlideAdvanceDuration;
+    _slideT.ShowLoop                   = this.ShowLoop;
 
     return _slideT;
 }
@@ -71,6 +77,7 @@ CAscSlideTiming.prototype.makeDuplicate = function(_slideT)
     _slideT.SlideAdvanceOnMouseClick   = this.SlideAdvanceOnMouseClick;
     _slideT.SlideAdvanceAfter          = this.SlideAdvanceAfter;
     _slideT.SlideAdvanceDuration       = this.SlideAdvanceDuration;
+    _slideT.ShowLoop                   = this.ShowLoop;
 }
 
 CAscSlideTiming.prototype.setUndefinedOptions = function()
@@ -82,6 +89,7 @@ CAscSlideTiming.prototype.setUndefinedOptions = function()
     this.SlideAdvanceOnMouseClick   = undefined;
     this.SlideAdvanceAfter          = undefined;
     this.SlideAdvanceDuration       = undefined;
+    this.ShowLoop                   = undefined;
 }
 
 CAscSlideTiming.prototype.setDefaultParams = function()
@@ -93,6 +101,7 @@ CAscSlideTiming.prototype.setDefaultParams = function()
     this.SlideAdvanceOnMouseClick   = true;
     this.SlideAdvanceAfter          = false;
     this.SlideAdvanceDuration       = 10000;
+    this.ShowLoop                   = true;
 }
 
 CAscSlideTiming.prototype.Write_ToBinary = function(w)
@@ -121,6 +130,7 @@ CAscSlideTiming.prototype.Write_ToBinary = function(w)
     w.WriteBool(AscFormat.isRealNumber(this.SlideAdvanceDuration));
     if(AscFormat.isRealNumber(this.SlideAdvanceDuration))
         w.WriteLong(this.SlideAdvanceDuration);
+    AscFormat.writeBool(w, this.ShowLoop);
 };
 
 CAscSlideTiming.prototype.Read_FromBinary = function(r)
@@ -146,6 +156,7 @@ CAscSlideTiming.prototype.Read_FromBinary = function(r)
 
     if(r.GetBool())
         this.SlideAdvanceDuration = r.GetLong();
+    this.ShowLoop = AscFormat.readBool(r);
 };
 
 // ---------------------------------------------------------------