btnParametrs add scroller
This commit is contained in:
parent
4869a9a604
commit
ccb74fe46a
|
@ -190,7 +190,9 @@ define([
|
||||||
caption: this.txtParametrs,
|
caption: this.txtParametrs,
|
||||||
iconCls: 'toolbar__icon icon btn-insertshape',
|
iconCls: 'toolbar__icon icon btn-insertshape',
|
||||||
disabled:true,
|
disabled:true,
|
||||||
menu: new Common.UI.Menu({items: this.createParametrsMenuItems()}),
|
menu: new Common.UI.Menu({
|
||||||
|
maxHeight:115,
|
||||||
|
items: this.createParametrsMenuItems()}),
|
||||||
lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock]
|
lock:[_set.slideDeleted,_set.noSlides,_set.disableOnStart,_set.transitLock]
|
||||||
});
|
});
|
||||||
this.lockedControls.push(this.btnParametrs);
|
this.lockedControls.push(this.btnParametrs);
|
||||||
|
@ -387,9 +389,6 @@ define([
|
||||||
if(effect!=Asc.c_oAscSlideTransitionTypes.None)
|
if(effect!=Asc.c_oAscSlideTransitionTypes.None)
|
||||||
selectedElement.setChecked(true);
|
selectedElement.setChecked(true);
|
||||||
|
|
||||||
var n=Math.floor((minMax[1]-minMax[0])/4) + 1;
|
|
||||||
selectedElement.$el.parent().css('column-count',n);
|
|
||||||
|
|
||||||
if(!this.listEffects.isDisabled()) {
|
if(!this.listEffects.isDisabled()) {
|
||||||
this.numDelay.setDisabled(this.chDelay.getValue()!=='checked');
|
this.numDelay.setDisabled(this.chDelay.getValue()!=='checked');
|
||||||
this.btnParametrs.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
|
this.btnParametrs.setDisabled(effect === Asc.c_oAscSlideTransitionTypes.None);
|
||||||
|
|
Loading…
Reference in a new issue