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

Merge branch 'release/v5.1.0' into feature/documentation-translations

Browse source
This commit is contained in:
Julia Radzhabova 2018-02-28 10:49:22 +03:00 committed by GitHub
parent 6139ad0bf7 b44d0ea354
commit 1a67e23b93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 58 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -146,7 +146,7 @@ define([
scope : me
}));
if (this.itemsTemplate)
this.cmpEl.find('ul').append(
this.cmpEl.find('ul').html(
$(this.itemsTemplate({
items : items,
scope : me

2
apps/common/main/resources/less/layout.less
View file

@ -49,7 +49,7 @@
}
> .layout-resizer {
width: 4px;
width: 2px;
cursor: col-resize;
&.move {

24
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -3239,6 +3239,17 @@ define([
caption : '--'
});
var menuParaRefreshField = new Common.UI.MenuItem({
caption: me.textRefreshField
}).on('click', function(item, e){
me.api.asc_UpdateComplexField(item.options.fieldProps);
me.fireEvent('editcomplete', me);
});
var menuParaFieldSeparator = new Common.UI.MenuItem({
caption : '--'
});
this.textMenu = new Common.UI.Menu({
initMenu: function(value){
var isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties()));
@ -3353,6 +3364,14 @@ define([
menuParaTOCSettings.setVisible(in_toc);
menuParaTOCRefresh.setVisible(in_toc);
menuParaTOCSeparator.setVisible(in_toc);
var in_field = me.api.asc_GetCurrentComplexField();
menuParaRefreshField.setVisible(!!in_field);
menuParaRefreshField.setDisabled(disabled);
menuParaFieldSeparator.setVisible(!!in_field);
if (in_field) {
menuParaRefreshField.options.fieldProps = in_field;
}
},
items: [
me.menuSpellPara,
@ -3370,6 +3389,8 @@ define([
menuParaRemoveControl,
menuParaControlSettings,
menuParaControlSeparator,
menuParaRefreshField,
menuParaFieldSeparator,
menuParaTOCSettings,
menuParaTOCRefresh,
menuParaTOCSeparator,
@ -3701,7 +3722,8 @@ define([
textUpdateAll: 'Refresh entire table',
textUpdatePages: 'Refresh page numbers only',
textTOCSettings: 'Table of contents settings',
textTOC: 'Table of contents'
textTOC: 'Table of contents',
textRefreshField: 'Refresh field'
}, DE.Views.DocumentHolder || {}));
});

2
apps/documenteditor/main/resources/less/layout.less
View file

@ -39,7 +39,7 @@ label {
top:0;
right: 0;
bottom: 0;
background-color: #f4f4f4;
background-color: @gray-light;
overflow: hidden;
}

2
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -1,5 +1,5 @@
@tabs-bg-color: #4f6279;
@tabs-bg-color: #446995;
.toolbar {
&:not(.cover) {

6
apps/presentationeditor/main/app/controller/Main.js
View file

@ -146,7 +146,8 @@ define([
'Table': this.txtSldLtTTbl,
'Slide title': this.txtSlideTitle,
'Loading': this.txtLoading,
'Click to add notes': this.txtAddNotes
'Click to add notes': this.txtAddNotes,
'Click to add first slide': this.txtAddFirstSlide
}
});
@ -2006,7 +2007,8 @@ define([
txtLoading: 'Loading...',
txtAddNotes: 'Click to add notes',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
txtAddFirstSlide: 'Click to add first slide'
}
})(), PE.Controllers.Main || {}))
});

2
apps/presentationeditor/main/app/template/StatusBar.template
View file

@ -2,7 +2,7 @@
<div class="statusbar" style="display:table;">
<div class="status-group dropup">
<button id="status-btn-preview" type="button" class="btn small btn-toolbar" style="margin-left: 9px;"><i class="icon"></i></button>
<label id="status-label-pages" class="status-label dropdown-toggle" style="margin-left: 7px;" data-toggle="dropdown"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
<label id="status-label-pages" class="status-label dropdown-toggle" style="margin-left: 7px; display: none;" data-toggle="dropdown"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
<div id="status-goto-box" class="dropdown-menu">
<label style="float:left;line-height:22px;"><%= scope.goToPageText %></label>
<div id="status-goto-page" style="display:inline-block;"></div>

2
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -559,7 +559,7 @@ define([
src.css({height: me._TtHeight + 'px', position: 'absolute', zIndex: '900', display: 'none', 'pointer-events': 'none',
'background-color': '#'+Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())});
src.text(getUserName(UserId));
$('#id_main_view').append(src);
$('#id_main_parent').append(src);
me.fastcoauthtips.push(src);
src.fadeIn(150);
}

5
apps/presentationeditor/main/app/view/Statusbar.js
View file

@ -49,6 +49,9 @@ define([
'use strict';
function _onCountPages(count){
if (this.pages.get('count')<0)
$('#status-label-pages').css('display', 'inline-block');
this.pages.set('count', count);
var isDisabled = (count<=0);
if (this.btnPreview.isDisabled() !== isDisabled)
@ -90,7 +93,7 @@ define([
initialize: function (options) {
_.extend(this, options);
this.pages = new PE.Models.Pages({current:1, count:1});
this.pages = new PE.Models.Pages({current:1, count:-1});
this.pages.on('change', _.bind(_updatePagesCaption,this));
this._state = {no_paragraph: true};
},

2
apps/presentationeditor/main/resources/less/layout.less
View file

@ -50,7 +50,7 @@ label {
top:0;
right: 0;
bottom: 0;
background-color: #f4f4f4;
background-color: @gray-light;
overflow: hidden;
}

7
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1158,6 +1158,10 @@ define([
config.msg = this.errorDataRange;
break;
case Asc.c_oAscError.ID.MaxDataPointsError:
config.msg = this.errorMaxPoints;
break;
case Asc.c_oAscError.ID.VKeyEncrypt:
config.msg = this.errorToken;
break;
@ -2194,7 +2198,8 @@ define([
txtStyle_Percent: 'Percent',
txtStyle_Comma: 'Comma',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
errorMaxPoints: "The maximum number of points in series per chart is 4096."
}
})(), SSE.Controllers.Main || {}))
});

7
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file

@ -1521,7 +1521,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
Common.UI.warning({msg: this.errorStockChart});
} else if (isvalid == Asc.c_oAscError.ID.MaxDataSeriesError) {
Common.UI.warning({msg: this.errorMaxRows});
} else
} else if (isvalid == Asc.c_oAscError.ID.MaxDataPointsError)
Common.UI.warning({msg: this.errorMaxPoints});
else
this.txtDataRange.cmpEl.find('input').focus();
return false;
} else
@ -1773,7 +1775,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
textAltTitle: 'Title',
textAltDescription: 'Description',
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
textSurface: 'Surface'
textSurface: 'Surface',
errorMaxPoints: 'ERROR! The maximum number of points in series per chart is 4096.'
}, SSE.Views.ChartSettingsDlg || {}));
});

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -918,6 +918,7 @@
"SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERROR! The maximum number of points in series per chart is 4096.",
"SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255",
"SSE.Views.ChartSettingsDlg.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
"SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERROR! The maximum number of points in series per chart is 4096.",
"SSE.Views.ChartSettingsDlg.textAlt": "Alternative Text",
"SSE.Views.ChartSettingsDlg.textAltDescription": "Description",
"SSE.Views.ChartSettingsDlg.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",

2
apps/spreadsheeteditor/main/resources/less/layout.less
View file

@ -33,7 +33,7 @@ label {
top:0;
right: 0;
bottom: 0;
background-color: #f4f4f4;
background-color: @gray-light;
overflow: hidden;
}

2
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -1,4 +1,4 @@
@tabs-bg-color: #48795c;
@tabs-bg-color: #40865c;
.toolbar {
&:not(.cover) {

7
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -827,6 +827,10 @@ define([
config.msg = this.errorDataRange;
break;
case Asc.c_oAscError.ID.MaxDataPointsError:
config.msg = this.errorMaxPoints;
break;
case Asc.c_oAscError.ID.FrmlOperandExpected:
config.msg = this.errorOperandExpected;
config.closable = true;
@ -1445,7 +1449,8 @@ define([
txtStyle_Currency: 'Currency',
txtStyle_Percent: 'Percent',
txtStyle_Comma: 'Comma',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.'
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
errorMaxPoints: 'The maximum number of points in series per chart is 4096.'
}
})(), SSE.Controllers.Main || {}))
});