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

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

Browse source 
Release/v4.1.0
This commit is contained in:
Julia Radzhabova 2016-08-24 16:47:32 +03:00 committed by GitHub
parent c47166ca47 6d981df473
commit cbd1e0d8a0
7 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/component/ComboBox.js
View file

@ -312,6 +312,8 @@ define([
me._skipInputChange = true;
me.cmpEl.find('ul li:first a').focus();
}, 10);
} else if (e.keyCode == Common.UI.Keys.RETURN && $(e.target).val() === me.lastValue){
this._input.trigger('change', { reapply: true });
} else
me._skipInputChange = false;
},
@ -333,7 +335,7 @@ define([
var val = $(e.target).val(),
record = {};
if (this.lastValue === val) {
if (this.lastValue === val && !(extra && extra.reapply)) {
if (extra && extra.onkeydown)
this.trigger('combo:blur', this, e);
return;

5
apps/common/main/lib/component/Window.js
View file

@ -154,7 +154,8 @@ define([
maxwidth: undefined,
maxheight: undefined,
minwidth: 0,
minheight: 0
minheight: 0,
enableKeyEvents: true
};
var template = '<div class="asc-window<%= modal?" modal":"" %><%= cls?" "+cls:"" %>" id="<%= id %>" style="width:<%= width %>px;">' +
@ -182,7 +183,7 @@ define([
}
function _keydown(event) {
if (!this.isLocked() && this.isVisible()) {
if (!this.isLocked() && this.isVisible() && this.initConfig.enableKeyEvents) {
switch (event.keyCode) {
case Common.UI.Keys.ESC:
if ( $('.asc-loadmask').length<1 ) {

3
apps/common/main/lib/view/Plugins.js
View file

@ -198,7 +198,8 @@ define([
var _options = {};
_.extend(_options, {
cls: 'advanced-settings-dlg',
header: true
header: true,
enableKeyEvents: false
}, options);
var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34;

3
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -2194,7 +2194,8 @@ define([
var me = this, equationsStore = this.getApplication().getCollection('EquationGroups');
me.equationPickers = [];
me.toolbar.btnInsertEquation.menu.removeAll();
for (var i = 0; i < equationsStore.length; ++i) {
var equationGroup = equationsStore.at(i);

9
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1186,7 +1186,9 @@ define([
]
})
);
if (this.mode.isDesktopApp)
this.mnuitemHideTitleBar.hide();
this.btnMarkers.setMenu(
new Common.UI.Menu({
items: [
@ -1511,10 +1513,9 @@ define([
}
}
if (mode.isDesktopApp) {
if (mode.isDesktopApp)
$('.toolbar-group-native').hide();
this.mnuitemHideTitleBar.hide();
}
this.btnMailRecepients.setVisible(mode.canCoAuthoring==true && mode.canUseMailMerge);
this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles);
},

11
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -827,15 +827,8 @@ define([
},
onNumberFormat: function(btn) {
if (this.api) {
var format = btn.options.formatId;
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);
}
if (this.api)
this.api.asc_setCellStyle(btn.options.styleName);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Number Format');

4
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -979,7 +979,7 @@ define([
iconCls : 'btn-percent-style',
hint : me.tipDigStylePercent,
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({
@ -988,7 +988,7 @@ define([
iconCls : 'btn-currency-style',
hint : me.tipDigStyleAccounting,
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,
menu : new Common.UI.Menu({
style: 'min-width: 120px;',