git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47687 954022d7-b5bf-4e40-9824-e11837661b57

PowerPoint/Drawing/HtmlPage.js

@@ -267,6 +267,10 @@ function CEditorPage(api)
 
     this.Init = function()
     {
+        //-
+        InitPanelAnimation();
+        //-
+
         this.m_oBody = CreateControlContainer(this.Name);
         this.m_oBody.HtmlElement.style.backgroundColor = "#D3D3D3";
 
@@ -2974,6 +2978,8 @@ function CEditorPage(api)
         drDoc.SlideCurrent = lPageNum;
         this.m_oLogicDocument.Set_CurPage(lPageNum);
 
+        this.m_oApi.asc_fireCallback("asc_onSlideTiming", this.m_oLogicDocument.Slides[lPageNum].timing);
+
         // теперь пошлем все шаблоны первой темы
         this.CheckLayouts();
 

PowerPoint/Editor/Format.js

@@ -3693,6 +3693,8 @@ function Slide(presentation, slideLayout, slideNum)
     this.show = true;
     this.showMasterPhAnim = false;
 
+    this.timing = new CAscSlideTiming();
+
     this.presentation = presentation;
     // pointers
     this.Layout = slideLayout;

PowerPoint/Editor/Presentation.js

@@ -324,6 +324,7 @@ function CPresentation( DrawingDocument ) {
 
     this.globalTableStyles = [];
     ///this.globalTableStyles[0] = CreateDefaultStylesForTables();
+    this.DefaultSlideTiming = new CAscSlideTiming();
 
     this.IsExternalFonts = false;
     this.createDefaultTableStyles();

PowerPoint/api.js

@@ -3705,6 +3705,51 @@ asc_docs_api.prototype.DemonstrationGoToSlide = function(slideNum)
     this.WordControl.DemonstrationGoToSlide(slideNum);
 }
 
+asc_docs_api.prototype.ApplySlideTiming = function(oTiming)
+{
+    var _count = this.WordControl.m_oDrawingDocument.SlidesCount;
+    var _cur = this.WordControl.m_oDrawingDocument.SlideCurrent;
+    if (_cur < 0 || _cur >= _count)
+        return;
+    var _curSlide = this.WordControl.m_oLogicDocument.Slides[_cur];
+    _curSlide.timing.applyProps(oTiming);
+}
+asc_docs_api.prototype.SlideTimingApplyToAll = function()
+{
+    var _count = this.WordControl.m_oDrawingDocument.SlidesCount;
+    var _cur = this.WordControl.m_oDrawingDocument.SlideCurrent;
+    var _slides = this.WordControl.m_oLogicDocument.Slides;
+    if (_cur < 0 || _cur >= _count)
+        return;
+    var _curSlide = _slides[_cur];
+
+    _curSlide.timing.makeDuplicate(this.WordControl.m_oLogicDocument.DefaultSlideTiming);
+    var _default = this.WordControl.m_oLogicDocument.DefaultSlideTiming;
+
+    for (var i = 0; i < _count; i++)
+    {
+        if (i == _cur)
+            continue;
+
+        _default.makeDuplicate(_slides[i].timing);
+    }
+}
+asc_docs_api.prototype.SlideTransitionPlay = function()
+{
+    var _count = this.WordControl.m_oDrawingDocument.SlidesCount;
+    var _cur = this.WordControl.m_oDrawingDocument.SlideCurrent;
+    if (_cur < 0 || _cur >= _count)
+        return;
+    var _timing = this.WordControl.m_oLogicDocument.Slides[_cur].timing;
+
+    var _tr     = this.WordControl.m_oDrawingDocument.TransitionSlide;
+    _tr.Type    = _timing.TransitionType;
+    _tr.Param   = _timing.TransitionOption;
+    _tr.Duration = _timing.TransitionDuration;
+
+    _tr.Start();
+}
+
 asc_docs_api.prototype.SetTextBoxInputMode = function(bIsEA)
 {
     this.WordControl.SetTextBoxMode(bIsEA);

PowerPoint/apiCommon.js

@@ -79,6 +79,88 @@ CAscColorScheme.prototype.get_name = function() { return this.Name; }
 
 // ---------------------------------------------------------------
 
+function CAscSlideTiming()
+{
+    this.TransitionType     = c_oAscSlideTransitionTypes.None;
+    this.TransitionOption   = -1;
+    this.TransitionDuration = 2000;
+
+    this.SlideAdvanceOnMouseClick   = true;
+    this.SlideAdvanceAfter          = false;
+    this.SlideAdvanceDuration       = 10000;
+}
+
+CAscSlideTiming.prototype.put_TransitionType = function(v) { this.TransitionType = v; }
+CAscSlideTiming.prototype.get_TransitionType = function() { return this.TransitionType; }
+CAscSlideTiming.prototype.put_TransitionOption = function(v) { this.TransitionOption = v; }
+CAscSlideTiming.prototype.get_TransitionOption = function() { return this.TransitionOption; }
+CAscSlideTiming.prototype.put_TransitionDuration = function(v) { this.TransitionDuration = v; }
+CAscSlideTiming.prototype.get_TransitionDuration = function() { return this.TransitionDuration; }
+
+CAscSlideTiming.prototype.put_SlideAdvanceOnMouseClick = function(v) { this.SlideAdvanceOnMouseClick = v; }
+CAscSlideTiming.prototype.get_SlideAdvanceOnMouseClick = function() { return this.SlideAdvanceOnMouseClick; }
+CAscSlideTiming.prototype.put_SlideAdvanceAfter = function(v) { this.SlideAdvanceAfter = v; }
+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.applyProps = function(v)
+{
+    if (undefined !== v.TransitionType && null !== v.TransitionType)
+        this.TransitionType = v.TransitionType;
+    if (undefined !== v.TransitionOption && null !== v.TransitionOption)
+        this.TransitionOption = v.TransitionOption;
+    if (undefined !== v.TransitionDuration && null !== v.TransitionDuration)
+        this.TransitionDuration = v.TransitionDuration;
+
+    if (undefined !== v.SlideAdvanceOnMouseClick && null !== v.SlideAdvanceOnMouseClick)
+        this.SlideAdvanceOnMouseClick = v.SlideAdvanceOnMouseClick;
+    if (undefined !== v.SlideAdvanceAfter && null !== v.SlideAdvanceAfter)
+        this.SlideAdvanceAfter = v.SlideAdvanceAfter;
+    if (undefined !== v.SlideAdvanceDuration && null !== v.SlideAdvanceDuration)
+        this.SlideAdvanceDuration = v.SlideAdvanceDuration;
+}
+
+CAscSlideTiming.prototype.createDuplicate = function(v)
+{
+    var _slideT = new CAscSlideTiming();
+
+    _slideT.TransitionType     = this.TransitionType;
+    _slideT.TransitionOption   = this.TransitionOption;
+    _slideT.TransitionDuration = this.TransitionDuration;
+
+    _slideT.SlideAdvanceOnMouseClick   = this.SlideAdvanceOnMouseClick;
+    _slideT.SlideAdvanceAfter          = this.SlideAdvanceAfter;
+    _slideT.SlideAdvanceDuration       = this.SlideAdvanceDuration;
+
+    return _slideT;
+}
+
+CAscSlideTiming.prototype.makeDuplicate = function(_slideT)
+{
+    if (!_slideT)
+        return;
+
+    _slideT.TransitionType     = this.TransitionType;
+    _slideT.TransitionOption   = this.TransitionOption;
+    _slideT.TransitionDuration = this.TransitionDuration;
+
+    _slideT.SlideAdvanceOnMouseClick   = this.SlideAdvanceOnMouseClick;
+    _slideT.SlideAdvanceAfter          = this.SlideAdvanceAfter;
+    _slideT.SlideAdvanceDuration       = this.SlideAdvanceDuration;
+}
+
+CAscSlideTiming.prototype.setUndefinedOptions = function()
+{
+    this.TransitionType     = undefined;
+    this.TransitionOption   = undefined;
+    this.TransitionDuration = undefined;
+
+    this.SlideAdvanceOnMouseClick   = undefined;
+    this.SlideAdvanceAfter          = undefined;
+    this.SlideAdvanceDuration       = undefined;
+}
+
 // ---------------------------------------------------------------
 
 function CAscTexture()