Commit cbd1e0d8 authored by Julia Radzhabova's avatar Julia Radzhabova Committed by GitHub

Merge pull request #16 from ONLYOFFICE/release/v4.1.0

Release/v4.1.0
parents c47166ca 6d981df4
...@@ -312,6 +312,8 @@ define([ ...@@ -312,6 +312,8 @@ define([
me._skipInputChange = true; me._skipInputChange = true;
me.cmpEl.find('ul li:first a').focus(); me.cmpEl.find('ul li:first a').focus();
}, 10); }, 10);
} else if (e.keyCode == Common.UI.Keys.RETURN && $(e.target).val() === me.lastValue){
this._input.trigger('change', { reapply: true });
} else } else
me._skipInputChange = false; me._skipInputChange = false;
}, },
...@@ -333,7 +335,7 @@ define([ ...@@ -333,7 +335,7 @@ define([
var val = $(e.target).val(), var val = $(e.target).val(),
record = {}; record = {};
if (this.lastValue === val) { if (this.lastValue === val && !(extra && extra.reapply)) {
if (extra && extra.onkeydown) if (extra && extra.onkeydown)
this.trigger('combo:blur', this, e); this.trigger('combo:blur', this, e);
return; return;
......
...@@ -154,7 +154,8 @@ define([ ...@@ -154,7 +154,8 @@ define([
maxwidth: undefined, maxwidth: undefined,
maxheight: undefined, maxheight: undefined,
minwidth: 0, minwidth: 0,
minheight: 0 minheight: 0,
enableKeyEvents: true
}; };
var template = '<div class="asc-window<%= modal?" modal":"" %><%= cls?" "+cls:"" %>" id="<%= id %>" style="width:<%= width %>px;">' + var template = '<div class="asc-window<%= modal?" modal":"" %><%= cls?" "+cls:"" %>" id="<%= id %>" style="width:<%= width %>px;">' +
...@@ -182,7 +183,7 @@ define([ ...@@ -182,7 +183,7 @@ define([
} }
function _keydown(event) { function _keydown(event) {
if (!this.isLocked() && this.isVisible()) { if (!this.isLocked() && this.isVisible() && this.initConfig.enableKeyEvents) {
switch (event.keyCode) { switch (event.keyCode) {
case Common.UI.Keys.ESC: case Common.UI.Keys.ESC:
if ( $('.asc-loadmask').length<1 ) { if ( $('.asc-loadmask').length<1 ) {
......
...@@ -198,7 +198,8 @@ define([ ...@@ -198,7 +198,8 @@ define([
var _options = {}; var _options = {};
_.extend(_options, { _.extend(_options, {
cls: 'advanced-settings-dlg', cls: 'advanced-settings-dlg',
header: true header: true,
enableKeyEvents: false
}, options); }, options);
var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34; var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34;
......
...@@ -2194,7 +2194,8 @@ define([ ...@@ -2194,7 +2194,8 @@ define([
var me = this, equationsStore = this.getApplication().getCollection('EquationGroups'); var me = this, equationsStore = this.getApplication().getCollection('EquationGroups');
me.equationPickers = []; me.equationPickers = [];
me.toolbar.btnInsertEquation.menu.removeAll();
for (var i = 0; i < equationsStore.length; ++i) { for (var i = 0; i < equationsStore.length; ++i) {
var equationGroup = equationsStore.at(i); var equationGroup = equationsStore.at(i);
......
...@@ -1186,7 +1186,9 @@ define([ ...@@ -1186,7 +1186,9 @@ define([
] ]
}) })
); );
if (this.mode.isDesktopApp)
this.mnuitemHideTitleBar.hide();
this.btnMarkers.setMenu( this.btnMarkers.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
items: [ items: [
...@@ -1511,10 +1513,9 @@ define([ ...@@ -1511,10 +1513,9 @@ define([
} }
} }
if (mode.isDesktopApp) { if (mode.isDesktopApp)
$('.toolbar-group-native').hide(); $('.toolbar-group-native').hide();
this.mnuitemHideTitleBar.hide();
}
this.btnMailRecepients.setVisible(mode.canCoAuthoring==true && mode.canUseMailMerge); this.btnMailRecepients.setVisible(mode.canCoAuthoring==true && mode.canUseMailMerge);
this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles); this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles);
}, },
......
...@@ -827,15 +827,8 @@ define([ ...@@ -827,15 +827,8 @@ define([
}, },
onNumberFormat: function(btn) { onNumberFormat: function(btn) {
if (this.api) { if (this.api)
var format = btn.options.formatId; this.api.asc_setCellStyle(btn.options.styleName);
if (btn.options.formatId == this.toolbar.ascFormatOptions.Accounting){
var value = Common.localStorage.getItem("sse-settings-reg-settings");
value = (value!==null) ? parseInt(value) : ((this.toolbar.mode.lang) ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.toolbar.mode.lang)) : 0x0409);
format = this.api.asc_getLocaleCurrency(value);
}
this.api.asc_setCellFormat(format);
}
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Number Format'); Common.component.Analytics.trackEvent('ToolBar', 'Number Format');
......
...@@ -979,7 +979,7 @@ define([ ...@@ -979,7 +979,7 @@ define([
iconCls : 'btn-percent-style', iconCls : 'btn-percent-style',
hint : me.tipDigStylePercent, hint : me.tipDigStylePercent,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
formatId : me.ascFormatOptions.Percent styleName : 'Percent'
}); });
me.btnCurrencyStyle = new Common.UI.Button({ me.btnCurrencyStyle = new Common.UI.Button({
...@@ -988,7 +988,7 @@ define([ ...@@ -988,7 +988,7 @@ define([
iconCls : 'btn-currency-style', iconCls : 'btn-currency-style',
hint : me.tipDigStyleAccounting, hint : me.tipDigStyleAccounting,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
formatId : me.ascFormatOptions.Accounting, styleName : 'Currency',
split : true, split : true,
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
style: 'min-width: 120px;', style: 'min-width: 120px;',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment