diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index a1fe5f3cb..02c617407 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -378,6 +378,7 @@ define([
this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this));
this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this));
+ this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this));
Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this));
} else if (this.mode.isRestrictedEdit) {
this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this));
@@ -1730,6 +1731,7 @@ define([
(new DE.Views.ControlSettingsDialog({
props: props,
api: me.api,
+ lang: me._state.lang,
handler: function(result, value) {
if (result == 'ok') {
me.api.asc_SetContentControlProperties(value, id);
@@ -2932,6 +2934,10 @@ define([
}
},
+ onTextLanguage: function(langId) {
+ this._state.lang = langId;
+ },
+
textEmptyImgUrl : 'You need to specify image URL.',
textWarning : 'Warning',
textFontSizeErr : 'The entered value is incorrect.
Please enter a numeric value between 1 and 100',
diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template
index f5d339807..0f48db92a 100644
--- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template
+++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template
@@ -89,4 +89,30 @@
+
+
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
index 2b5aa2208..99b65c0be 100644
--- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js
@@ -63,7 +63,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
items: [
{panelId: 'id-adv-control-settings-general', panelCaption: this.strGeneral},
{panelId: 'id-adv-control-settings-lock', panelCaption: this.textLock},
- {panelId: 'id-adv-control-settings-list', panelCaption: this.textCombobox}
+ {panelId: 'id-adv-control-settings-list', panelCaption: this.textCombobox},
+ {panelId: 'id-adv-control-settings-date', panelCaption: this.textDate}
],
contentTemplate: _.template(contentTemplate)({
scope: this
@@ -196,6 +197,35 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
});
this.btnDown.on('click', _.bind(this.onMoveItem, this, false));
+ // date picker
+ var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0407 }, {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
+ { value: 0x040B }, { value: 0x040C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
+ { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
+ data.forEach(function(item) {
+ var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);
+ item.displayValue = langinfo[1];
+ item.langName = langinfo[0];
+ });
+
+ this.cmbLang = new Common.UI.ComboBox({
+ el : $('#control-settings-lang'),
+ menuStyle : 'min-width: 100%; max-height: 185px;',
+ cls : 'input-group-nr',
+ editable : false,
+ data : data
+ });
+ this.cmbLang.setValue(0x0409);
+ this.cmbLang.on('selected',function(combo, record) {
+ me.updateFormats(record.value);
+ });
+
+ this.listFormats = new Common.UI.ListView({
+ el: $('#control-settings-format'),
+ store: new Common.UI.DataViewStore(),
+ scrollAlwaysVisible: true
+ });
+ // this.listFormats.on('item:select', _.bind(this.onSelectFormat, this));
+
this.afterRender();
},
@@ -283,6 +313,15 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
}
*/
this.disableListButtons();
+
+ //for date picker
+ // this.btnsCategory[3].setVisible(type == 'date');
+ if (this.options.lang) {
+ var item = this.cmbLang.store.findWhere({value: this.options.lang});
+ item = item ? item.get('value') : 0x0409;
+ this.cmbLang.setValue(item)
+ }
+ this.updateFormats(this.cmbLang.getValue());
}
},
@@ -316,6 +355,12 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
// }, this);
// props.set_ListItems(arr);
+ //for date picker
+ // var rec = this.listFormats.getSelectedRec();
+ // if (rec) {
+ // props.set_DateFormat(rec.get('format'));
+ // }
+
return props;
},
@@ -426,6 +471,28 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
this.list.cmpEl.find('.listview').focus();
},
+ updateFormats: function(lang) {
+ // this.props.put_Lang(lang);
+ // var data = this.props.get_DateTimeExamples(),
+ // 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);
+ // }
+ // }
+ // store.reset(arr);
+ // this.listFormats.selectByIndex(0);
+ // var rec = this.listFormats.getSelectedRec();
+ // this.listFormats.scrollToRecord(rec);
+ // this.onSelectFormat(this.listFormats, null, rec);
+ },
+
textTitle: 'Content Control Settings',
textName: 'Title',
textTag: 'Tag',
@@ -448,7 +515,10 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
textDown: 'Down',
textCombobox: 'Combo box',
textDisplayName: 'Display name',
- textValue: 'Value'
+ textValue: 'Value',
+ textDate: 'Date Format',
+ textLang: 'Language',
+ textFormat: 'Formats'
}, DE.Views.ControlSettingsDialog || {}))
});
\ No newline at end of file