From f628ca5668839821bcaa514843d0e48ffaa12dd2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 6 Mar 2020 14:18:01 +0300 Subject: [PATCH] [DE] Insert date-time --- .../main/app/controller/Toolbar.js | 2 +- .../main/app/view/DateTimeDialog.js | 31 +++++++------------ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 734d31558..3ab21c398 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2986,7 +2986,7 @@ define([ handler: function(result, value) { if (result == 'ok') { if (me.api) { - // me.api.asc_addDateTime(value); + me.api.asc_addDateTime(value); } } Common.NotificationCenter.trigger('edit:complete', me.toolbar); diff --git a/apps/documenteditor/main/app/view/DateTimeDialog.js b/apps/documenteditor/main/app/view/DateTimeDialog.js index 3b54a9905..1ddd84b95 100644 --- a/apps/documenteditor/main/app/view/DateTimeDialog.js +++ b/apps/documenteditor/main/app/view/DateTimeDialog.js @@ -173,7 +173,7 @@ define([ }, _setDefaults: function () { - // this.props = new AscCommonSlide.CAscDateTime(); + this.props = new Asc.CAscDateTime(); if (this.lang) { var item = this.cmbLang.store.findWhere({value: this.lang}); item = item ? item.get('value') : 0x0409; @@ -187,20 +187,18 @@ define([ }, updateFormats: function(lang) { - return; this.props.put_Lang(lang); - var data = this.props.get_DateTimeExamples(), + var formats = this.props.get_FormatsExamples(), arr = []; var store = this.listFormats.store; - for (var name in data) { - if (data[name]) { - var rec = new Common.UI.DataViewModel(); - rec.set({ - format: name, - value: data[name] - }); - arr.push(rec); - } + for (var i = 0, len = formats.length; i < len; i++) + { + var rec = new Common.UI.DataViewModel(); + rec.set({ + format: formats[i], + value: this.props.get_String(formats[i], undefined, lang) + }); + arr.push(rec); } store.reset(arr); var format = this.defaultFormats[lang]; @@ -211,14 +209,9 @@ define([ }, onSelectFormat: function(lisvView, itemView, record) { - return; if (!record) return; - if (this.chUpdate.getValue()=='checked') { - this.props.put_DateTime(record.get('format')); - } else { - this.props.put_DateTime(null); - this.props.put_CustomDateTime(record.get('value')); - } + this.props.put_Format(record.get('format')); + this.props.put_Update(this.chUpdate.getValue()=='checked'); }, onBtnClick: function(event) {