Edit rules for lock

apps/presentationeditor/main/app/controller/Toolbar.js

@@ -2414,7 +2414,7 @@ define([
 
                 var transitController    = me.getApplication().getController('Transitions');
                 transitController.setApi(me.api).setConfig({toolbar: me,mode:config}).createToolbarPanel();
-
+                Array.prototype.push.apply(me.toolbar.lockControls,transitController.getView().getButtons());
                 me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
 
                 if (!(config.customization && config.customization.compactHeader)) {

apps/presentationeditor/main/app/controller/Transitions.js

@@ -82,35 +82,26 @@ define([
          },
         setConfig: function (config) {
             this.appConfig = config.mode;
-            //this.setApi(config.api);
 
             this.view = this.createView('PE.Views.Transitions', {
                 toolbar: config.toolbar,
                 mode: config.mode
             });
-            this.applyLayout();
             return this;
         },
-        applyLayout: function () {
-            this.lockToolbar(PE.enumLock.disableOnStart, true);
-        },
 
         setApi: function (api) {
             this.api = api;
             this.api.asc_registerCallback('asc_onFocusObject',          _.bind(this.onFocusObject, this));
-            this.api.asc_registerCallback('asc_onDocumentContentReady',     _.bind(this.onDocumentContentReady, this));
+            this.api.asc_registerCallback('asc_onCountPages',           _.bind(this.onApiCountPagesRestricted, this));
             return this;
         },
-        onDocumentContentReady: function ()
+        onApiCountPagesRestricted: function (count){
-        {
+            if (this._state.no_slides !== (count<=0)) {
-            this.lockToolbar(PE.enumLock.disableOnStart, false);
+                this._state.no_slides = (count<=0);
-            this._state.activated = true;
+                this.lockToolbar(PE.enumLock.noSlides, this._state.no_slides);
+            }
         },
-        /*setMode: function(mode) {
-            this.appConfig = mode;
-            //this.view = this.createView('PE.Views.Transitions', { mode: mode });
-            return this;
-        },*/
 
         loadDocument: function(data) {
             this.document = data.doc;
@@ -211,16 +202,9 @@ define([
                 props.put_transition(transition);
                 this.api.SetSlideProps(props);
             }
-
         },
         onFocusObject:function(selectedObjects){
-            var me = this,
+            var me = this;
-            slides_none=me.view.toolbar._state.no_slides;
-            if(slides_none!=undefined && me._state.no_slides!== slides_none) {
-                me.lockToolbar(PE.enumLock.noSlides, slides_none);
-                me._state.no_slides!== slides_none;
-               //me.view.setDisabled(slides_note);
-            }
             for (var i=0; i<selectedObjects.length; i++) {
 
 
@@ -232,27 +216,21 @@ define([
                 if (eltype == Asc.c_oAscTypeSelectElement.Slide) {
 
                     var slide_deleted = undefined,
-                        slide_layout_lock = undefined,
+                        locked_transition=undefined,
-                        locked_transition = undefined,
                         pr;
                     me._state.activated=me.view.toolbar.activated;
                     pr=selectedObjects[i].get_ObjectValue();
                     slide_deleted = pr.get_LockDelete();
-                    slide_layout_lock = pr.get_LockLayout();
+                    locked_transition = pr.get_LockTransition();
-                    //locked_transition = pr.get_LockTransition();
 
                    if (slide_deleted !== undefined && me._state.slidecontrolsdisable !== slide_deleted) {
                         if (me._state.activated) me._state.slidecontrolsdisable = slide_deleted;
                         me.lockToolbar(PE.enumLock.slideDeleted, slide_deleted);
-                    }
+                   }
-                     if (slide_layout_lock !== undefined && me._state.slidelayoutdisable !== slide_layout_lock ) {
+                   if (locked_transition !== undefined && me._state.lockedtransition !== locked_transition ) {
-                        if (me._state.activated) me._state.slidelayoutdisable = slide_layout_lock;
-                        me.lockToolbar(PE.enumLock.slideLock, slide_layout_lock);
-                    }
-                    /*if (locked_transition !== undefined && me._state.lockedtransition !== locked_transition ) {
                         if (me._state.activated) me._state.lockedtransition = locked_transition;
-                        me.lockToolbar(PE.enumLock.slideLock, locked_transition);
+                        me.lockToolbar(PE.enumLock.transitLock, locked_transition);
-                    }*/
+                   }
 
                 }
                 this.changeSettings(pr);

apps/presentationeditor/main/app/view/Toolbar.js

@@ -82,7 +82,8 @@ define([
         noTextSelected:  'no-text',
         inEquation: 'in-equation',
         commentLock: 'can-comment',
-        noColumns: 'no-columns'
+        noColumns: 'no-columns',
+        transitLock: 'transit-lock'
     };
 
     PE.Views.Toolbar =  Common.UI.Mixtbar.extend(_.extend((function(){

apps/presentationeditor/main/app/view/Transitions.js

@@ -62,7 +62,6 @@ define([
                 me.listEffects.on('click', _.bind(function (combo,record){
                     me.fireEvent('transit:selecteffect',[combo,record]);
                 },me));
-
             }
             if(me.btnPreview){
                 me.btnPreview.on('click', _.bind(function(btn){
@@ -72,13 +71,11 @@ define([
             if(me.btnParametrs) {
                 me.btnParametrs.on('click', function (e) {
                     me.fireEvent('transit:parametrs', ['current']);
-
                 });
 
                 me.btnParametrs.menu.on('item:click', function (menu, item, e) {
                     me.fireEvent('transit:parametrs', [item]);
                 });
-
             }
             if(me.btnApplyToAll){
                 me.btnApplyToAll.on('click', _.bind(function(btn){
@@ -139,7 +136,7 @@ define([
                     itemHeight: 40,
                     enableKeyEvents: true,
                     disabled:true,
-                    lock:[_set.slideDeleted,_set.slideLock,_set.disableOnStart],
+                    lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock],
                     beforeOpenHandler: function (e) {
                         var cmp = this,
                             menu = cmp.openButton.menu//,
@@ -184,7 +181,7 @@ define([
                     split: false,
                     disabled:true,
                     iconCls: 'toolbar__icon btn-preview',
-                    lock:[_set.slideDeleted,_set.slideLock,_set.disableOnStart]
+                    lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock]
                 });
                 this.lockedControls.push(this.btnPreview);
 
@@ -194,7 +191,7 @@ define([
                     iconCls: 'toolbar__icon icon btn-insertshape',
                     disabled:true,
                     menu: new Common.UI.Menu({items: this.createParametrsMenuItems()}),
-                    lock:[_set.slideDeleted,_set.slideLock,_set.disableOnStart]
+                    lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock]
                 });
                 this.lockedControls.push(this.btnParametrs);
 
@@ -204,7 +201,7 @@ define([
                     split: true,
                     disabled:true,
                     iconCls: 'toolbar__icon btn-changeslide',
-                    lock:[_set.slideDeleted,_set.slideLock,_set.disableOnStart]
+                    lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock]
                 });
                 this.lockedControls.push(this.btnApplyToAll);
 
@@ -217,7 +214,7 @@ define([
                     maxValue: 300,
                     minValue: 0,
                     disabled: true,
-                    lock:[_set.slideDeleted,_set.slideLock,_set.disableOnStart]
+                    lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock]
                 });
                 this.lockedControls.push(this.numDuration);
 
@@ -230,7 +227,7 @@ define([
                     maxValue: 300,
                     minValue: 0,
                     disabled: true,
-                    lock:[_set.slideDeleted,_set.slideLock,_set.disableOnStart]
+                    lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock]
                 });
                 this.lockedControls.push(this.numDelay);
 
@@ -238,7 +235,7 @@ define([
                     el: this.$el.find('#transit-checkbox-startonclick'),
                     labelText: this.strStartOnClick,
                     disabled:true,
-                    lock:[_set.slideDeleted,_set.slideLock,_set.disableOnStart]
+                    lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock]
                 })
                 this.lockedControls.push(this.chStartOnClick);
 
@@ -246,7 +243,7 @@ define([
                     el: this.$el.find('#transit-checkbox-delay'),
                     labelText: this.strDelay,
                     disabled:true,
-                    lock:[_set.slideDeleted,_set.slideLock,_set.disableOnStart]
+                    lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock]
                 });
                 this.lockedControls.push(this.chDelay);
 
@@ -383,11 +380,16 @@ define([
                         }
                     }
                 });
+
+
                 if(selectedElement==undefined)
                     selectedElement=this.btnParametrs.menu.items[minMax[0]];
                 if(effect!=Asc.c_oAscSlideTransitionTypes.None)
                     selectedElement.setChecked(true);
 
+                var n=Math.floor((minMax[1]-minMax[0])/4) + 1;
+                selectedElement.$el.parent().css('column-count',n);
+
                 if(!this.listEffects.isDisabled()) {
                     this.numDelay.setDisabled(this.chDelay.getValue()!=='checked');
                     this.btnParametrs.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);