Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Some edit

Browse source
This commit is contained in:
OVSharova 2021-07-26 11:20:16 +03:00
parent a012f31c34
commit f18b8fea32
3 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/presentationeditor/main/app/controller/Transitions.js
View file

@ -82,11 +82,6 @@ define([
setConfig: function (data, api) { setConfig: function (data, api) {
this.setApi(api); this.setApi(api);
this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onFocusObject, this)); this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onFocusObject, this));
if (data) {
this.currentUserId = data.config.user.id;
this.sdkViewName = data['sdkviewname'] || this.sdkViewName;
}
return this; return this;
}, },
setApi: function (api) { setApi: function (api) {
@ -122,9 +117,6 @@ define([
onAppReady: function (config) { onAppReady: function (config) {
var me = this; var me = this;
/*if (me.view) {
me.applySettings();
}*/
}, },
onPreviewClick: function(){ onPreviewClick: function(){
if (this.api) { if (this.api) {

8
apps/presentationeditor/main/app/template/Transitions.template
View file

@ -15,13 +15,13 @@
</div> </div>
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>
<div class="group small"> <div class="group small" >
<div class="elset"> <div class="elset">
<span class="btn-slot text" id="transit-checkbox-slidenum"></span> <span class="btn-slot text" id="transit-checkbox-slidenum"></span>
</div> </div>
<div class="elset"> <div class="elset" style="width:110px;">
<span class="btn-slot text" id="label-delay" style="display: inline-block; float: left; width: 8px;font-size: 11px;text-align: left; margin-top: 4px" >Delay</span> <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: 30px; "></span> <span id="transit-spin-delay" class="btn-slot text spinner" style="display: inline-block; float: right; width: 90px; "></span>
</div> </div>
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>

21
apps/presentationeditor/main/app/view/Transitions.js
View file

@ -63,6 +63,7 @@ define([
me.listEffects.on('click', _.bind(function (combo,record){ me.listEffects.on('click', _.bind(function (combo,record){
me.fireEvent('transit:selecteffect',[combo,record]); me.fireEvent('transit:selecteffect',[combo,record]);
},me)); },me));
} }
if(me.btnPreview) if(me.btnPreview)
{ {
@ -223,12 +224,13 @@ define([
iconCls: 'toolbar__icon btn-rem-comment' iconCls: 'toolbar__icon btn-rem-comment'
}); });
this.btnParametrs = new Common.UI.Button({ this.btnParametrs = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
caption: this.txtParametrs, caption: this.txtParametrs,
split: true, split: true,
iconCls: 'toolbar__icon btn-res-comment' iconCls: 'toolbar__icon btn-res-comment'
}); });
this.btnApplyToAll = new Common.UI.Button({ this.btnApplyToAll = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
caption: this.txtApplyToAll, caption: this.txtApplyToAll,
@ -246,6 +248,7 @@ define([
minValue: 0, minValue: 0,
disabled: false disabled: false
}); });
this.numDelay = new Common.UI.MetricSpinner({ this.numDelay = new Common.UI.MetricSpinner({
el: this.$el.find('#transit-spin-delay'), el: this.$el.find('#transit-spin-delay'),
step: 1, step: 1,
@ -256,10 +259,12 @@ define([
minValue: 0, minValue: 0,
disabled: false disabled: false
}); });
this.chStartOnClick = new Common.UI.CheckBox({ this.chStartOnClick = new Common.UI.CheckBox({
el: this.$el.findById('#transit-checkbox-slidenum'), el: this.$el.findById('#transit-checkbox-slidenum'),
labelText: this.strStartOnClick labelText: this.strStartOnClick
}); });
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
}, },
@ -274,9 +279,6 @@ define([
(new Promise(function (accept, reject) { (new Promise(function (accept, reject) {
accept(); accept();
})).then(function(){ })).then(function(){
var menuTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><div><%= caption %></div>' +
'<% if (options.description !== null) { %><label style="display: block;color: #a5a5a5;cursor: pointer;white-space: normal;"><%= options.description %></label>' +
'<% } %></a>');
var itemsMenu=[]; var itemsMenu=[];
_.each(me._arrEffectType, function (item){ _.each(me._arrEffectType, function (item){
itemsMenu.push( itemsMenu.push(
@ -294,10 +296,7 @@ define([
items: itemsMenu items: itemsMenu
}) })
); );
setEvents.call(me);
setEvents.call(me);
}); });
}, },
@ -382,9 +381,9 @@ define([
if(effect!=Asc.c_oAscSlideTransitionTypes.None) if(effect!=Asc.c_oAscSlideTransitionTypes.None)
selectedElement.setChecked(true); selectedElement.setChecked(true);
this.btnParametrs.setDisabled(effect==Asc.c_oAscSlideTransitionTypes.None); this.btnParametrs.setDisabled(effect===Asc.c_oAscSlideTransitionTypes.None);
this.btnPreview.setDisabled(effect==Asc.c_oAscSlideTransitionTypes.None); this.btnPreview.setDisabled(effect===Asc.c_oAscSlideTransitionTypes.None);
this.numDuration.setDisabled(effect==Asc.c_oAscSlideTransitionTypes.None); this.numDuration.setDisabled(effect===Asc.c_oAscSlideTransitionTypes.None);
return selectedElement; return selectedElement;
}, },