add checkbox delay
This commit is contained in:
OVSharova
parent
5aa980df91
commit
9cd64f4d33
|
|
@ -70,7 +70,8 @@ define([
|
|||
'transit:applytoall': _.bind(this.onApplyToAllClick,this),
|
||||
'transit:selecteffect': _.bind(this.onEffectSelect, this),
|
||||
'transit:startonclick': _.bind(this.onStartOnClickChange,this),
|
||||
'transit:delay': _.bind(this.onDelayChange,this)
|
||||
'transit:delay': _.bind(this.onDelayChange,this),
|
||||
'transit:checkdelay': _.bind(this.onCheckDelayChange,this)
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -159,16 +160,14 @@ define([
|
|||
transition.put_SlideAdvanceDuration(field.getNumberValue()*1000);
|
||||
props.put_transition(transition);
|
||||
this.api.SetSlideProps(props);
|
||||
this.onCheckDelayChange(field);
|
||||
}
|
||||
},
|
||||
onCheckDelayChange: function(field, newValue, oldValue, eOpts){
|
||||
//this.numDelay.setDisabled(field.getValue()!=='checked');
|
||||
this.view.numDelay.setDisabled(field.getValue()!=='checked');
|
||||
if (this.api && !this._noApply) {
|
||||
var props = new Asc.CAscSlideProps();
|
||||
var transition = new Asc.CAscSlideTransition();
|
||||
//transition.put_SlideAdvanceAfter(field.getValue()=='checked');
|
||||
transition.put_SlideAdvanceAfter(field.getNumberValue()!=0);
|
||||
transition.put_SlideAdvanceAfter(field.getValue()=='checked');
|
||||
props.put_transition(transition);
|
||||
this.api.SetSlideProps(props);
|
||||
}
|
||||
|
|
@ -220,10 +219,8 @@ define([
|
|||
|
||||
if (me.btnParametrs.menu) {
|
||||
value = transition.get_TransitionOption();
|
||||
//if (this._state.EffectType !== value) {*/
|
||||
me.setMenuParametrs(this._state.Effect, value);
|
||||
this._state.EffectType = value;
|
||||
//}
|
||||
}
|
||||
|
||||
value = transition.get_TransitionDuration();
|
||||
|
|
@ -249,8 +246,8 @@ define([
|
|||
}
|
||||
value = transition.get_SlideAdvanceAfter();
|
||||
if (this._state.AdvanceAfter !== value) {
|
||||
//me.chDelay.setValue((value !== null && value !== undefined) ? value : 'indeterminate', true);
|
||||
//me.numDelay.setDisabled(this.chDelay.getValue() !== 'checked');
|
||||
me.chDelay.setValue((value !== null && value !== undefined) ? value : 'indeterminate', true);
|
||||
me.numDelay.setDisabled(me.chDelay.getValue() !== 'checked');
|
||||
this._state.AdvanceAfter = value;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<section id="transitions-panel" class="panel" data-tab="transit">
|
||||
<div class="group flex small" id="transit-field-effects" style=" width: 63%; min-width: 300px; " ></div>
|
||||
<div class="group flex small" id="transit-field-effects" style=" width: 60%; min-width: 300px; " ></div>
|
||||
|
||||
<div class="group small">
|
||||
<span class="btn-slot text x-huge" id="transit-button-parametrs"></span>
|
||||
|
|
@ -17,11 +17,12 @@
|
|||
<div class="separator long"></div>
|
||||
<div class="group small" >
|
||||
<div class="elset">
|
||||
<span class="btn-slot text" id="transit-checkbox-slidenum"></span>
|
||||
<span class="btn-slot text" id="transit-checkbox-startonclick"></span>
|
||||
</div>
|
||||
<div class="elset" style="width:110px;">
|
||||
<span class="btn-slot text" id="label-delay" style="display: inline-block; float: left; font-size: 11px;text-align: left; margin-top: 4px" >Delay</span>
|
||||
<span id="transit-spin-delay" class="btn-slot text spinner" style="display: inline-block; float: right; width: 90px; "></span>
|
||||
<div class="elset" style="width:120px;">
|
||||
<!-- <span class="btn-slot text" id="label-delay" style="display: inline-block; float: left; font-size: 11px;text-align: left; margin-top: 4px" >Delay</span> -->
|
||||
<span id="transit-spin-delay" class="btn-slot text spinner" style="display: inline-block; float: right; "></span>
|
||||
<span class="btn-slot text" id="transit-checkbox-delay" style="display: inline-block; float: left;"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="separator long"></div>
|
||||
|
|
|
|||
|
|
@ -104,6 +104,12 @@ define([
|
|||
me.fireEvent('transit:startonclick',[ me.chStartOnClick,me.chStartOnClick.value, me.chStartOnClick.lastValue]);
|
||||
},me));
|
||||
}
|
||||
if(me.chDelay)
|
||||
{
|
||||
me.chDelay.on('change',_.bind(function (e){
|
||||
me.fireEvent('transit:checkdelay',[ me.chDelay,me.chDelay.value, me.chDelay.lastValue]);
|
||||
},me));
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
|
|
@ -129,7 +135,7 @@ define([
|
|||
{title: this.textUnCover, imageUrl:"btn-menu-comments", value: Asc.c_oAscSlideTransitionTypes.UnCover, id: Common.UI.getId()},
|
||||
{title: this.textCover, imageUrl:"btn-editheader", value: Asc.c_oAscSlideTransitionTypes.Cover, id: Common.UI.getId()},
|
||||
{title: this.textClock, imageUrl:"btn-datetime", value: Asc.c_oAscSlideTransitionTypes.Clock, id: Common.UI.getId()},
|
||||
{title: this.textZoom, imageUrl:"btn-insertequatio", value: Asc.c_oAscSlideTransitionTypes.Zoom, id: Common.UI.getId()}
|
||||
{title: this.textZoom, imageUrl:"btn-addslide", value: Asc.c_oAscSlideTransitionTypes.Zoom, id: Common.UI.getId()}
|
||||
];
|
||||
|
||||
this._arrEffectType = [
|
||||
|
|
@ -163,7 +169,7 @@ define([
|
|||
beforeOpenHandler: function (e) {
|
||||
var cmp = this,
|
||||
menu = cmp.openButton.menu,
|
||||
minMenuColumn = 7;
|
||||
minMenuColumn = 4;
|
||||
|
||||
if (menu.cmpEl) {
|
||||
var itemEl = $(cmp.cmpEl.find('.dataview.inner .style').get(0)).parent();
|
||||
|
|
@ -182,7 +188,7 @@ define([
|
|||
menu.menuAlign = 'tl-tl';
|
||||
var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - columnCount * (itemMargin + itemWidth) - 1;
|
||||
menu.setOffset(Math.min(offset, 0));
|
||||
|
||||
//columnCount * (itemWidth + itemMargin)
|
||||
menu.cmpEl.css({
|
||||
'width': columnCount * (itemWidth + itemMargin),
|
||||
'min-height': cmp.cmpEl.height()
|
||||
|
|
@ -228,14 +234,14 @@ define([
|
|||
cls: 'btn-toolbar x-huge icon-top',
|
||||
caption: this.txtParametrs,
|
||||
split: true,
|
||||
iconCls: 'toolbar__icon btn-res-comment'
|
||||
iconCls: 'toolbar__icon icon btn-insertshape'
|
||||
});
|
||||
|
||||
this.btnApplyToAll = new Common.UI.Button({
|
||||
cls: 'btn-toolbar',
|
||||
caption: this.txtApplyToAll,
|
||||
split: true,
|
||||
iconCls: 'toolbar__icon btn-res-comment'
|
||||
iconCls: 'toolbar__icon btn-changeslide'
|
||||
});
|
||||
|
||||
this.numDuration = new Common.UI.MetricSpinner({
|
||||
|
|
@ -261,10 +267,13 @@ define([
|
|||
});
|
||||
|
||||
this.chStartOnClick = new Common.UI.CheckBox({
|
||||
el: this.$el.find('#transit-checkbox-slidenum'),
|
||||
el: this.$el.find('#transit-checkbox-startonclick'),
|
||||
labelText: this.strStartOnClick
|
||||
});
|
||||
|
||||
this.chDelay = new Common.UI.CheckBox({
|
||||
el: this.$el.find('#transit-checkbox-delay'),
|
||||
labelText: this.strDelay
|
||||
});
|
||||
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
|
||||
},
|
||||
|
||||
|
|
@ -308,7 +317,7 @@ define([
|
|||
this.btnApplyToAll && this.btnApplyToAll.render(this.$el.find('#transit-button-apply'));
|
||||
this.renderComponent('#transit-spin-duration', this.numDuration);
|
||||
this.renderComponent('#transit-spin-delay', this.numDelay);
|
||||
this.renderComponent('#transit-checkbox-slidenum', this.chStartOnClick);
|
||||
this.renderComponent('#transit-checkbox-startonclick', this.chStartOnClick);
|
||||
this.$el.find("#label-duration").innerText=this.strDuration;
|
||||
this.$el.find("#label-delay").innerText=this.strDelay;
|
||||
return this.$el;
|
||||
|
|
@ -393,6 +402,7 @@ define([
|
|||
txtParametrs: 'Parametrs',
|
||||
txtApplyToAll: 'Apply to All Slides',
|
||||
strDuration: 'Duration',
|
||||
strDelay: 'Delay',
|
||||
strStartOnClick: 'Start On Click',
|
||||
|
||||
textNone: 'None',
|
||||
|
|
|
|||
|
|
@ -2,10 +2,6 @@
|
|||
input {
|
||||
text-align: left;
|
||||
}
|
||||
.dropdown-menu li a{
|
||||
padding: 7px 20px;
|
||||
|
||||
}
|
||||
|
||||
.item {
|
||||
background: transparent;
|
||||
|
|
@ -21,7 +17,7 @@
|
|||
border-color: @border-preview-select-ie;
|
||||
border-color: @border-preview-select;
|
||||
}
|
||||
//menu-picker-container
|
||||
|
||||
.style{
|
||||
background: transparent;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue