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

[DE] Fix date and list content controls (several controls)

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-28 10:49:34 +03:00
parent 6c2c246cb9
commit 025f4022eb
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/documenteditor/main/app/controller/Links.js
View file

@ -411,11 +411,12 @@ define([
onShowDateActions: function(obj, x, y) { onShowDateActions: function(obj, x, y) {
var props = obj.pr, var props = obj.pr,
specProps = props.get_DateTimePr(), specProps = props.get_DateTimePr(),
id = props.get_InternalId(),
documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder,
controlsContainer = documentHolderView.cmpEl.find('#calendar-control-container'), controlsContainer = documentHolderView.cmpEl.find('#calendar-control-container'),
me = this; me = this;
this._state.dateObj = props;
if (controlsContainer.length < 1) { if (controlsContainer.length < 1) {
controlsContainer = $('<div id="calendar-control-container" style="position: absolute;z-index: 1000;"><div id="id-document-calendar-control" style="position: fixed; left: -1000px; top: -1000px;"></div></div>'); controlsContainer = $('<div id="calendar-control-container" style="position: absolute;z-index: 1000;"><div id="id-document-calendar-control" style="position: fixed; left: -1000px; top: -1000px;"></div></div>');
documentHolderView.cmpEl.append(controlsContainer); documentHolderView.cmpEl.append(controlsContainer);
@ -433,6 +434,9 @@ define([
firstday: 1 firstday: 1
}); });
this.cmpCalendar.on('date:click', function (cmp, date) { this.cmpCalendar.on('date:click', function (cmp, date) {
var props = me._state.dateObj,
specProps = props.get_DateTimePr(),
id = props.get_InternalId();
specProps.put_FullDate(new Date(date)); specProps.put_FullDate(new Date(date));
me.api.asc_SetContentControlProperties(props, id); me.api.asc_SetContentControlProperties(props, id);
controlsContainer.hide(); controlsContainer.hide();
@ -472,13 +476,14 @@ define([
onShowListActions: function(obj, x, y) { onShowListActions: function(obj, x, y) {
var type = obj.type, var type = obj.type,
props = obj.pr, props = obj.pr,
id = props.get_InternalId(),
specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(), specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(),
menu = this.view.listControlMenu, menu = this.view.listControlMenu,
documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder,
menuContainer = menu ? documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, menuContainer = menu ? documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
me = this; me = this;
this._state.listObj = props;
this._fromShowContentControls = true; this._fromShowContentControls = true;
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
@ -489,7 +494,7 @@ define([
}); });
menu.on('item:click', function(menu, item) { menu.on('item:click', function(menu, item) {
setTimeout(function(){ setTimeout(function(){
me.api.asc_SelectContentControlListItem(item.value, id); me.api.asc_SelectContentControlListItem(item.value, me._state.listObj.get_InternalId());
}, 1); }, 1);
}); });