Commit e7cf39b9 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

git-svn-id:...

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49399 954022d7-b5bf-4e40-9824-e11837661b57
parent ef221014
...@@ -975,6 +975,10 @@ Slide.prototype = ...@@ -975,6 +975,10 @@ Slide.prototype =
transitionLock: transitionLock.Get_Id(), layoutLock: layoutLock.Get_Id()}) transitionLock: transitionLock.Get_Id(), layoutLock: layoutLock.Get_Id()})
}, },
isLockRemove: function()
{
//for(var i = 0)
},
recalcAll: function() recalcAll: function()
{ {
this.recalcInfo = this.recalcInfo =
......
...@@ -3631,6 +3631,12 @@ asc_docs_api.prototype.sync_slidePropCallback = function(slide) ...@@ -3631,6 +3631,12 @@ asc_docs_api.prototype.sync_slidePropCallback = function(slide)
obj.lockTiming = !(slide.timingLock.Type === locktype_Mine || slide.timingLock.Type === locktype_None); obj.lockTiming = !(slide.timingLock.Type === locktype_Mine || slide.timingLock.Type === locktype_None);
obj.lockTranzition = !(slide.transitionLock.Type === locktype_Mine || slide.transitionLock.Type === locktype_None); obj.lockTranzition = !(slide.transitionLock.Type === locktype_Mine || slide.transitionLock.Type === locktype_None);
obj.lockBackground = !(slide.backgroundLock.Type === locktype_Mine || slide.backgroundLock.Type === locktype_None); obj.lockBackground = !(slide.backgroundLock.Type === locktype_Mine || slide.backgroundLock.Type === locktype_None);
obj.lockRemove = obj.lockDelete ||
obj.lockLayout ||
obj.lockTiming ||
obj.lockTranzition ||
obj.lockBackground ||slide.isLockedObject() ;
var _len = this.SelectedObjectsStack.length; var _len = this.SelectedObjectsStack.length;
if (_len > 0) if (_len > 0)
......
...@@ -689,6 +689,7 @@ function CAscSlideProps() ...@@ -689,6 +689,7 @@ function CAscSlideProps()
this.lockTiming = null; this.lockTiming = null;
this.lockBackground = null; this.lockBackground = null;
this.lockTranzition = null; this.lockTranzition = null;
this.lockRemove = null;
} }
CAscSlideProps.prototype.get_background = function(){return this.Background;} CAscSlideProps.prototype.get_background = function(){return this.Background;}
...@@ -705,6 +706,8 @@ CAscSlideProps.prototype.get_LockBackground = function(){return this.lockBackgro ...@@ -705,6 +706,8 @@ CAscSlideProps.prototype.get_LockBackground = function(){return this.lockBackgro
CAscSlideProps.prototype.put_LockBackground = function(v){this.lockBackground = v;} CAscSlideProps.prototype.put_LockBackground = function(v){this.lockBackground = v;}
CAscSlideProps.prototype.get_LockTranzition = function(){return this.lockTranzition;} CAscSlideProps.prototype.get_LockTranzition = function(){return this.lockTranzition;}
CAscSlideProps.prototype.put_LockTranzition = function(v){this.lockTranzition = v;} CAscSlideProps.prototype.put_LockTranzition = function(v){this.lockTranzition = v;}
CAscSlideProps.prototype.get_LockRemove = function(){return this.lockRemove;}
CAscSlideProps.prototype.put_LockRemove = function(v){this.lockRemove = v;}
// --------------------------------------------------------------- // ---------------------------------------------------------------
......
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