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

PowerPoint/Drawing/HtmlPage.js

@@ -260,10 +260,6 @@ function CEditorPage(api)
 
     this.Init = function()
     {
-        //-
-        InitPanelAnimation();
-        //-
-
         this.m_oBody = CreateControlContainer(this.Name);
         this.m_oBody.HtmlElement.style.backgroundColor = "#D3D3D3";
 
@@ -2601,8 +2597,6 @@ 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/api.js

@@ -1483,6 +1483,8 @@ asc_docs_api.prototype.SetSlideProps = function(prop)
     var arr_ind = this.WordControl.Thumbnails.GetSelectedArray();
     var _back_fill = prop.get_background();
 
+    if (_back_fill)
+    {
         if (_back_fill.get_type() == c_oAscFill.FILL_TYPE_NOFILL)
         {
             this.WordControl.m_oLogicDocument.changeBackground(null, arr_ind);
@@ -1548,6 +1550,13 @@ asc_docs_api.prototype.SetSlideProps = function(prop)
             }
             this.WordControl.m_oLogicDocument.changeBackground(bg, arr_ind);
         }
+    }
+
+    var _timing = prop.get_timing();
+    if (_timing)
+    {
+        this.ApplySlideTiming(_timing);
+    }
 }
 
 asc_docs_api.prototype.put_LineCap = function(_cap)
@@ -3314,6 +3323,8 @@ asc_docs_api.prototype.sync_slidePropCallback = function(slide)
         }
     }
 
+    obj.Timing = slide.timing;
+
     var _len = this.SelectedObjectsStack.length;
     if (_len > 0)
     {

PowerPoint/apiCommon.js

@@ -505,10 +505,13 @@ function CorrectUniFill(asc_fill, unifill)
 function CAscSlideProps()
 {
     this.Background = null;
+    this.Timing = null;
 }
 
 CAscSlideProps.prototype.get_background = function(){return this.Background;}
 CAscSlideProps.prototype.put_background = function(v){this.Background = v;}
+CAscSlideProps.prototype.get_timing = function(){return this.Timing;}
+CAscSlideProps.prototype.put_timing = function(v){this.Timing = v;}
 
 // ---------------------------------------------------------------