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

Merge branch 'develop' into feature/bootstrap-3.3.7

Browse source
This commit is contained in:
Julia Radzhabova 2016-11-11 12:16:32 +03:00
parent 60afcdaff4 c8bcbf0feb
commit 994ee98c00
52 changed files with 393 additions and 523 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/api/documents/api.js
View file

@ -110,7 +110,8 @@
compactToolbar: false, compactToolbar: false,
leftMenu: true, leftMenu: true,
rightMenu: true, rightMenu: true,
toolbar: true toolbar: true,
header: true
}, },
plugins: { plugins: {
autoStartGuid: 'asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}', autoStartGuid: 'asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}',

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

@ -453,7 +453,7 @@ define([
if (!me.tiles) me.tiles = []; if (!me.tiles) me.tiles = [];
if (storeCount !== me.tiles.length) { if (storeCount !== me.tiles.length) {
for (j = me.tiles.length; j < storeCount; ++j) { for (j = me.tiles.length; j < storeCount; ++j) {
me.tiles.push(null); me.tiles.unshift(null);
} }
} }

8
apps/common/main/lib/component/MenuItem.js
View file

@ -336,6 +336,14 @@ define([
if (!me.menu.isOver) if (!me.menu.isOver)
me.cmpEl.removeClass('over'); me.cmpEl.removeClass('over');
}, 200); }, 200);
if (e && e.type !== 'focusout') { // when mouseleave from clicked menu item with submenu
var focused = me.cmpEl.children(':focus');
if (focused.length>0) {
focused.blur();
me.cmpEl.closest('ul').focus();
}
}
} }
} }
}); });

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

@ -641,6 +641,11 @@ define([
$(document).on('keydown.' + this.cid, this.binding.keydown); $(document).on('keydown.' + this.cid, this.binding.keydown);
var me = this; var me = this;
setTimeout(function () {
me.fireEvent('animate:before', me);
}, 10);
if (this.options.animate !== false) { if (this.options.animate !== false) {
this.$window.css({ this.$window.css({
'-webkit-transform': 'scale(0.8)', '-webkit-transform': 'scale(0.8)',

14
apps/common/main/lib/view/Comments.js
View file

@ -473,19 +473,17 @@ define([
}); });
me.on({ me.on({
'show': function () { 'show': function () {
// me.calculateSizeOfContent();
me.commentsView.autoHeightTextBox(); me.commentsView.autoHeightTextBox();
me.$window.find('textarea').keydown(function (event) {
var text = me.$window.find('textarea');
if (text && text.length)
text.focus();
text.keydown(function (event) {
if (event.keyCode == Common.UI.Keys.ESC) { if (event.keyCode == Common.UI.Keys.ESC) {
me.hide(); me.hide();
} }
}); });
},
'animate:before': function () {
var text = me.$window.find('textarea');
if (text && text.length)
text.focus();
} }
}); });
} }

6
apps/common/main/lib/view/ReviewChanges.js
View file

@ -447,7 +447,7 @@ define([
this.btnPrev = new Common.UI.Button({ this.btnPrev = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'review-prev', iconCls: 'img-commonctrl review-prev',
value: 1, value: 1,
hint: this.txtPrev, hint: this.txtPrev,
hintAnchor: 'top' hintAnchor: 'top'
@ -456,7 +456,7 @@ define([
this.btnNext = new Common.UI.Button({ this.btnNext = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'review-next', iconCls: 'img-commonctrl review-next',
value: 2, value: 2,
hint: this.txtNext, hint: this.txtNext,
hintAnchor: 'top' hintAnchor: 'top'
@ -507,7 +507,7 @@ define([
this.btnClose = new Common.UI.Button({ this.btnClose = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'review-close', iconCls: 'img-commonctrl review-close',
hint: this.txtClose, hint: this.txtClose,
hintAnchor: 'top' hintAnchor: 'top'
}); });

6
apps/common/main/lib/view/SearchDialog.js
View file

@ -171,6 +171,8 @@
this.txtSearch.on('keydown', null, 'search', _.bind(this.onKeyPress, this)); this.txtSearch.on('keydown', null, 'search', _.bind(this.onKeyPress, this));
this.txtReplace.on('keydown', null, 'replace', _.bind(this.onKeyPress, this)); this.txtReplace.on('keydown', null, 'replace', _.bind(this.onKeyPress, this));
this.on('animate:before', _.bind(this.focus, this));
return this; return this;
}, },
@ -189,10 +191,10 @@
focus: function() { focus: function() {
var me = this; var me = this;
_.delay(function(){ setTimeout(function(){
me.txtSearch.focus(); me.txtSearch.focus();
me.txtSearch.select(); me.txtSearch.select();
}, 300); }, 10);
}, },
onKeyPress: function(event) { onKeyPress: function(event) {

6
apps/common/main/resources/less/asc-mixins.less
View file

@ -138,8 +138,10 @@
@common-controls-width: 100px; @common-controls-width: 100px;
.img-commonctrl, .img-commonctrl,
.theme-colorpalette .color-transparent, .palette-color-ext .color-transparent, .dropdown-menu li .checked:before, .input-error:before { .theme-colorpalette .color-transparent, .palette-color-ext .color-transparent, .dropdown-menu li .checked:before, .input-error:before,
background: e(%("url(%s)",'@{common-image-path}/@{common-controls}')) no-repeat; .btn-toolbar .btn-icon.img-commonctrl {
background-image: e(%("url(%s)",'@{common-image-path}/@{common-controls}'));
background-repeat: no-repeat;
@media @media
only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (-webkit-min-device-pixel-ratio: 2),

48
apps/common/main/resources/less/combo-dataview.less
View file

@ -199,9 +199,8 @@
.combo-template(64px); .combo-template(64px);
} }
.combo-pattern { .combo-textart(@combo-dataview-height: 62px, @combo-dataview-item-margins: 4px) {
@combo-dataview-button-width: 15px; @combo-dataview-button-width: 15px;
@combo-dataview-height: 40px;
height: @combo-dataview-height; height: @combo-dataview-height;
@ -216,16 +215,8 @@
} }
.item { .item {
margin: 4px 0 4px 4px; margin: @combo-dataview-item-margins 0 @combo-dataview-item-margins @combo-dataview-item-margins;
.box-shadow(none); .box-shadow(none);
&:hover {
.box-shadow(0 0 0 1px @gray);
}
// &.selected {
// .box-shadow(0 0 0 2px @primary);
// }
} }
&.disabled { &.disabled {
@ -235,6 +226,16 @@
} }
} }
} }
};
.combo-pattern {
.combo-textart(40px);
.item {
&:hover {
.box-shadow(0 0 0 1px @gray);
}
}
.dropdown-menu { .dropdown-menu {
padding-right: 2px; padding-right: 2px;
@ -247,31 +248,22 @@
}; };
.combo-textart { .combo-textart {
@combo-dataview-button-width: 15px; .combo-textart();
@combo-dataview-height: 62px; }
height: @combo-dataview-height; .combo-chart-style {
.combo-textart(58px, 2px);
.view {
margin-right: -@combo-dataview-button-width;
padding-right: @combo-dataview-button-width;
}
.button {
width: @combo-dataview-button-width;
height: @combo-dataview-height;
}
.item { .item {
margin: 4px 0 4px 4px; margin-left: 4px;
.box-shadow(none); .box-shadow(0 0 0 1px @gray);
} }
&.disabled { &.disabled {
.item { .item {
&:hover:not(.selected) { &:hover:not(.selected) {
.box-shadow(none); .box-shadow(0 0 0 1px @gray);
} }
} }
} }
}; }

5
apps/common/main/resources/less/review-changes.less
View file

@ -41,11 +41,6 @@
height: 19px; height: 19px;
} }
.btn-toolbar {
span.btn-icon {
.background-ximage('@{common-image-path}/@{common-controls}', '@{common-image-path}/@{common-controls2x}', 100px);
}
}
.review-prev {background-position: -40px -250px;} .review-prev {background-position: -40px -250px;}
button.active > .review-prev, button.active > .review-prev,
button:active > .review-prev {background-position: -60px -250px !important;} button:active > .review-prev {background-position: -60px -250px !important;}

17
apps/documenteditor/main/app/controller/Main.js
View file

@ -61,10 +61,14 @@ define([
var mapCustomizationElements = { var mapCustomizationElements = {
about: 'button#left-btn-about', about: 'button#left-btn-about',
feedback: 'button#left-btn-support', feedback: 'button#left-btn-support',
goback: '#fm-btn-back > a, #header-back > div', goback: '#fm-btn-back > a, #header-back > div'
};
var mapCustomizationExtElements = {
toolbar: '#viewport #toolbar', toolbar: '#viewport #toolbar',
leftMenu: '#viewport #left-menu', leftMenu: '#viewport #left-menu, #viewport #id-toolbar-full-placeholder-btn-settings, #viewport #id-toolbar-short-placeholder-btn-settings',
rightMenu: '#viewport #right-menu' rightMenu: '#viewport #right-menu',
header: '#viewport #header'
}; };
Common.localStorage.setId('text'); Common.localStorage.setId('text');
@ -316,6 +320,7 @@ define([
this._state.lostEditingRights = !this._state.lostEditingRights; this._state.lostEditingRights = !this._state.lostEditingRights;
this.api.asc_coAuthoringDisconnect(); this.api.asc_coAuthoringDisconnect();
this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights(); this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights();
Common.NotificationCenter.trigger('api:disconnect');
if (!old_rights) if (!old_rights)
Common.UI.warning({ Common.UI.warning({
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
@ -996,13 +1001,15 @@ define([
this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view';
var headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header'); var headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header');
this.appOptions.canBranding = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object'); this.appOptions.canBranding = (licType!==Asc.c_oLicenseResult.Error) && (typeof this.editorConfig.customization == 'object');
if (this.appOptions.canBranding) if (this.appOptions.canBranding)
headerView.setBranding(this.editorConfig.customization); headerView.setBranding(this.editorConfig.customization);
params.asc_getTrial() && headerView.setDeveloperMode(true); params.asc_getTrial() && headerView.setDeveloperMode(true);
this.appOptions.canRename && headerView.setCanRename(true); this.appOptions.canRename && headerView.setCanRename(true);
this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object');
this.applyModeCommonElements(); this.applyModeCommonElements();
this.applyModeEditorElements(); this.applyModeEditorElements();
@ -1441,6 +1448,8 @@ define([
if (!this.appOptions.isDesktopApp) if (!this.appOptions.isDesktopApp)
this.appOptions.customization.about = true; this.appOptions.customization.about = true;
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
if (this.appOptions.canBrandingExt)
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);
} }
Common.NotificationCenter.trigger('layout:changed', 'main'); Common.NotificationCenter.trigger('layout:changed', 'main');

8
apps/documenteditor/main/app/template/ChartSettings.template
View file

@ -38,11 +38,13 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small"> <td class="padding-small" colspan=2>
<div id="chart-button-type" style=""></div> <div id="chart-button-type" style=""></div>
</td> </td>
<td class="padding-small"> </tr>
<div id="chart-button-style" style=""></div> <tr>
<td class="padding-small" colspan=2>
<div class="" id="chart-combo-style" style="width: 100%;"></div>
</td> </td>
</tr> </tr>
<tr> <tr>

130
apps/documenteditor/main/app/view/ChartSettings.js
View file

@ -44,6 +44,7 @@ define([
'underscore', 'underscore',
'backbone', 'backbone',
'common/main/lib/component/Button', 'common/main/lib/component/Button',
'common/main/lib/component/ComboDataView',
'documenteditor/main/app/view/ImageSettingsAdvanced' 'documenteditor/main/app/view/ImageSettingsAdvanced'
], function (menuTemplate, $, _, Backbone) { ], function (menuTemplate, $, _, Backbone) {
'use strict'; 'use strict';
@ -152,22 +153,27 @@ define([
value = props.get_SeveralChartStyles(); value = props.get_SeveralChartStyles();
if (this._state.SeveralCharts && value) { if (this._state.SeveralCharts && value) {
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); this.cmbChartStyle.fieldPicker.deselectAll();
btnIconEl.css('background-image', 'none'); this.cmbChartStyle.menuPicker.deselectAll();
this.mnuChartStylePicker.selectRecord(null, true);
this._state.ChartStyle = null; this._state.ChartStyle = null;
} else { } else {
value = this.chartProps.getStyle(); value = this.chartProps.getStyle();
if (this._state.ChartStyle!==value) { if (this._state.ChartStyle!==value || this._isChartStylesChanged) {
var record = this.mnuChartStylePicker.store.findWhere({data: value}); this.cmbChartStyle.suspendEvents();
this.mnuChartStylePicker.selectRecord(record, true); var rec = this.cmbChartStyle.menuPicker.store.findWhere({data: value});
if (record) { this.cmbChartStyle.menuPicker.selectRecord(rec);
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); this.cmbChartStyle.resumeEvents();
btnIconEl.css('background-image', 'url(' + record.get('imageUrl') + ')');
if (this._isChartStylesChanged) {
if (rec)
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true);
else
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true);
} }
this._state.ChartStyle=value; this._state.ChartStyle=value;
} }
} }
this._isChartStylesChanged = false;
this._noApply = false; this._noApply = false;
@ -443,34 +449,15 @@ define([
this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);
}, },
onSelectStyle: function(btn, picker, itemView, record) { onSelectStyle: function(combo, record) {
if (this._noApply) return; if (this._noApply) return;
var rawData = {},
isPickerSelect = _.isFunction(record.toJSON);
if (isPickerSelect){
if (record.get('selected')) {
rawData = record.toJSON();
} else {
// record deselected
return;
}
} else {
rawData = record;
}
var style = 'url(' + rawData.imageUrl + ')';
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon');
btnIconEl.css('background-image', style);
if (this.api && !this._noApply && this.chartProps) { if (this.api && !this._noApply && this.chartProps) {
var props = new Asc.asc_CImgProperty(); var props = new Asc.asc_CImgProperty();
this.chartProps.putStyle(rawData.data); this.chartProps.putStyle(record.get('data'));
props.put_ChartProperties(this.chartProps); props.put_ChartProperties(this.chartProps);
this.api.ImgApply(props); this.api.ImgApply(props);
} }
this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);
}, },
@ -481,64 +468,51 @@ define([
updateChartStyles: function(styles) { updateChartStyles: function(styles) {
var me = this; var me = this;
this._isChartStylesChanged = true;
if (!this.btnChartStyle) { if (!this.cmbChartStyle) {
this.btnChartStyle = new Common.UI.Button({ this.cmbChartStyle = new Common.UI.ComboDataView({
cls : 'btn-large-dataview', itemWidth: 50,
iconCls : 'item-wrap', itemHeight: 50,
menu : new Common.UI.Menu({ menuMaxHeight: 270,
menuAlign: 'tr-br', enableKeyEvents: true,
items: [ cls: 'combo-chart-style'
{ template: _.template('<div id="id-chart-menu-style" style="width: 245px; margin: 0 5px;"></div>') }
]
})
}); });
this.btnChartStyle.render($('#chart-button-style')); this.cmbChartStyle.render($('#chart-combo-style'));
this.lockedControls.push(this.btnChartStyle); this.cmbChartStyle.openButton.menu.cmpEl.css({
this.mnuChartStylePicker = new Common.UI.DataView({ 'min-width': 178,
el: $('#id-chart-menu-style'), 'max-width': 178
style: 'max-height: 411px;',
parentMenu: this.btnChartStyle.menu,
store: new Common.UI.DataViewStore(),
itemTemplate: _.template('<div id="<%= id %>" class="item-wrap" style="background-image: url(<%= imageUrl %>); background-position: 0 0;"></div>')
}); });
this.cmbChartStyle.on('click', _.bind(this.onSelectStyle, this));
if (this.btnChartStyle.menu) { this.cmbChartStyle.openButton.menu.on('show:after', function () {
this.btnChartStyle.menu.on('show:after', function () { me.cmbChartStyle.menuPicker.scroller.update({alwaysVisibleY: true});
me.mnuChartStylePicker.scroller.update({alwaysVisibleY: true}); });
}); this.lockedControls.push(this.cmbChartStyle);
}
this.mnuChartStylePicker.on('item:click', _.bind(this.onSelectStyle, this, this.btnChartStyle));
} }
if (styles && styles.length>0){ if (styles && styles.length>0){
var stylesStore = this.mnuChartStylePicker.store; var stylesStore = this.cmbChartStyle.menuPicker.store;
if (stylesStore) { if (stylesStore) {
var stylearray = [], var count = stylesStore.length;
selectedIdx = -1, if (count>0 && count==styles.length) {
selectedUrl; var data = stylesStore.models;
_.each(styles, function(item, index){ _.each(styles, function(style, index){
stylearray.push({ data[index].set('imageUrl', style.asc_getImageUrl());
imageUrl: item.asc_getImageUrl(),
data : item.asc_getStyle(),
tip : me.textStyle + ' ' + item.asc_getStyle()
}); });
if (me._state.ChartStyle == item.asc_getStyle()) { } else {
selectedIdx = index; var stylearray = [],
selectedUrl = item.asc_getImageUrl(); selectedIdx = -1;
} _.each(styles, function(item, index){
stylearray.push({
}); imageUrl: item.asc_getImageUrl(),
data : item.asc_getStyle(),
stylesStore.reset(stylearray, {silent: false}); tip : me.textStyle + ' ' + item.asc_getStyle()
});
});
stylesStore.reset(stylearray, {silent: false});
}
} }
} }
this.mnuChartStylePicker.selectByIndex(selectedIdx, true);
if (selectedIdx>=0 && this.btnChartStyle.cmpEl) {
var style = 'url(' + selectedUrl + ')';
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon');
btnIconEl.css('background-image', style);
}
}, },
setLocked: function (locked) { setLocked: function (locked) {

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

@ -2696,21 +2696,21 @@ define([
checkable : true, checkable : true,
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP valign : Asc.c_oAscVAlign.Top
}).on('click', _.bind(paragraphVAlign, me)), }).on('click', _.bind(paragraphVAlign, me)),
me.menuParagraphCenter = new Common.UI.MenuItem({ me.menuParagraphCenter = new Common.UI.MenuItem({
caption : me.centerCellText, caption : me.centerCellText,
checkable : true, checkable : true,
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR valign : Asc.c_oAscVAlign.Center
}).on('click', _.bind(paragraphVAlign, me)), }).on('click', _.bind(paragraphVAlign, me)),
me.menuParagraphBottom = new Common.UI.MenuItem({ me.menuParagraphBottom = new Common.UI.MenuItem({
caption : me.bottomCellText, caption : me.bottomCellText,
checkable : true, checkable : true,
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM valign : Asc.c_oAscVAlign.Bottom
}).on('click', _.bind(paragraphVAlign, me)) }).on('click', _.bind(paragraphVAlign, me))
] ]
}) })
@ -2915,9 +2915,9 @@ define([
menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
if ( isInShape || isInChart ) { if ( isInShape || isInChart ) {
var align = value.imgProps.value.get_VerticalTextAlign(); var align = value.imgProps.value.get_VerticalTextAlign();
me.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top);
me.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center);
me.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom);
var dir = value.imgProps.value.get_Vert(); var dir = value.imgProps.value.get_Vert();
me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal); me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal);

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

@ -1197,7 +1197,7 @@ define([
] ]
}) })
); );
if (this.mode.isDesktopApp) if (this.mode.isDesktopApp || this.mode.canBrandingExt && this.mode.customization && this.mode.customization.header===false)
this.mnuitemHideTitleBar.hide(); this.mnuitemHideTitleBar.hide();
this.btnMarkers.setMenu( this.btnMarkers.setMenu(

2
apps/documenteditor/main/locale/cs.json
View file

@ -107,7 +107,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Poslat", "Common.Views.Chat.textSend": "Poslat",
"Common.Views.Comments.textAdd": "Přidat", "Common.Views.Comments.textAdd": "Přidat",
"Common.Views.Comments.textAddComment": "Přidat komentář", "Common.Views.Comments.textAddComment": "Přidat",
"Common.Views.Comments.textAddCommentToDoc": "Přidat komentář k dokumentu", "Common.Views.Comments.textAddCommentToDoc": "Přidat komentář k dokumentu",
"Common.Views.Comments.textAddReply": "Přidat odpověď", "Common.Views.Comments.textAddReply": "Přidat odpověď",
"Common.Views.Comments.textAnonym": "Návštěvník", "Common.Views.Comments.textAnonym": "Návštěvník",

2
apps/documenteditor/main/locale/de.json
View file

@ -112,7 +112,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Senden", "Common.Views.Chat.textSend": "Senden",
"Common.Views.Comments.textAdd": "Hinzufügen", "Common.Views.Comments.textAdd": "Hinzufügen",
"Common.Views.Comments.textAddComment": "Kommentar hinzufügen", "Common.Views.Comments.textAddComment": "Hinzufügen",
"Common.Views.Comments.textAddCommentToDoc": "Kommentar zum Dokument hinzufügen", "Common.Views.Comments.textAddCommentToDoc": "Kommentar zum Dokument hinzufügen",
"Common.Views.Comments.textAddReply": "Antwort hinzufügen", "Common.Views.Comments.textAddReply": "Antwort hinzufügen",
"Common.Views.Comments.textAnonym": "Gast", "Common.Views.Comments.textAnonym": "Gast",

2
apps/documenteditor/main/locale/es.json
View file

@ -112,7 +112,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "Aceptar", "Common.Views.AdvancedSettingsWindow.okButtonText": "Aceptar",
"Common.Views.Chat.textSend": "Enviar", "Common.Views.Chat.textSend": "Enviar",
"Common.Views.Comments.textAdd": "Añadir", "Common.Views.Comments.textAdd": "Añadir",
"Common.Views.Comments.textAddComment": "Añadir comentario", "Common.Views.Comments.textAddComment": "Añadir",
"Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento", "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento",
"Common.Views.Comments.textAddReply": "Añadir respuesta", "Common.Views.Comments.textAddReply": "Añadir respuesta",
"Common.Views.Comments.textAnonym": "Visitante", "Common.Views.Comments.textAnonym": "Visitante",

10
apps/documenteditor/main/locale/fr.json
View file

@ -69,9 +69,9 @@
"Common.UI.ComboDataView.emptyComboText": "Aucun style", "Common.UI.ComboDataView.emptyComboText": "Aucun style",
"Common.UI.ExtendedColorDialog.addButtonText": "Ajouter", "Common.UI.ExtendedColorDialog.addButtonText": "Ajouter",
"Common.UI.ExtendedColorDialog.cancelButtonText": "Annuler", "Common.UI.ExtendedColorDialog.cancelButtonText": "Annuler",
"Common.UI.ExtendedColorDialog.textCurrent": "Actuel", "Common.UI.ExtendedColorDialog.textCurrent": "Actuelle",
"Common.UI.ExtendedColorDialog.textHexErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 000000 à FFFFFF.", "Common.UI.ExtendedColorDialog.textHexErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 000000 à FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Nouveau", "Common.UI.ExtendedColorDialog.textNew": "Nouvelle",
"Common.UI.ExtendedColorDialog.textRGBErr": "La valeur saisie est incorrecte. <br>Entrez une valeur numérique de 0 à 255.", "Common.UI.ExtendedColorDialog.textRGBErr": "La valeur saisie est incorrecte. <br>Entrez une valeur numérique de 0 à 255.",
"Common.UI.HSBColorPicker.textNoColor": "Pas de couleur", "Common.UI.HSBColorPicker.textNoColor": "Pas de couleur",
"Common.UI.SearchDialog.textHighlight": "Surligner les résultats", "Common.UI.SearchDialog.textHighlight": "Surligner les résultats",
@ -112,8 +112,8 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Envoyer", "Common.Views.Chat.textSend": "Envoyer",
"Common.Views.Comments.textAdd": "Ajouter", "Common.Views.Comments.textAdd": "Ajouter",
"Common.Views.Comments.textAddComment": "Ajouter un commentaire", "Common.Views.Comments.textAddComment": "Ajouter",
"Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au Document", "Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au document",
"Common.Views.Comments.textAddReply": "Ajouter une réponse", "Common.Views.Comments.textAddReply": "Ajouter une réponse",
"Common.Views.Comments.textAnonym": "Invité", "Common.Views.Comments.textAnonym": "Invité",
"Common.Views.Comments.textCancel": "Annuler", "Common.Views.Comments.textCancel": "Annuler",
@ -1397,7 +1397,7 @@
"DE.Views.TableSettingsAdvanced.txtPt": "Point", "DE.Views.TableSettingsAdvanced.txtPt": "Point",
"DE.Views.TextArtSettings.strColor": "Couleur", "DE.Views.TextArtSettings.strColor": "Couleur",
"DE.Views.TextArtSettings.strFill": "Remplissage", "DE.Views.TextArtSettings.strFill": "Remplissage",
"DE.Views.TextArtSettings.strSize": "Size", "DE.Views.TextArtSettings.strSize": "Taille",
"DE.Views.TextArtSettings.strStroke": "Trait", "DE.Views.TextArtSettings.strStroke": "Trait",
"DE.Views.TextArtSettings.strTransparency": "Opacité", "DE.Views.TextArtSettings.strTransparency": "Opacité",
"DE.Views.TextArtSettings.strType": "Type", "DE.Views.TextArtSettings.strType": "Type",

2
apps/documenteditor/main/locale/pt.json
View file

@ -107,7 +107,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Enviar", "Common.Views.Chat.textSend": "Enviar",
"Common.Views.Comments.textAdd": "Adicionar", "Common.Views.Comments.textAdd": "Adicionar",
"Common.Views.Comments.textAddComment": "Adicionar comentário", "Common.Views.Comments.textAddComment": "Adicionar",
"Common.Views.Comments.textAddCommentToDoc": "Adicionar comentário ao documento", "Common.Views.Comments.textAddCommentToDoc": "Adicionar comentário ao documento",
"Common.Views.Comments.textAddReply": "Adicionar resposta", "Common.Views.Comments.textAddReply": "Adicionar resposta",
"Common.Views.Comments.textAnonym": "Visitante", "Common.Views.Comments.textAnonym": "Visitante",

2
apps/documenteditor/main/locale/sl.json
View file

@ -107,7 +107,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Pošlji", "Common.Views.Chat.textSend": "Pošlji",
"Common.Views.Comments.textAdd": "Dodaj", "Common.Views.Comments.textAdd": "Dodaj",
"Common.Views.Comments.textAddComment": "Dodaj komentar", "Common.Views.Comments.textAddComment": "Dodaj",
"Common.Views.Comments.textAddCommentToDoc": "K dokumentu dodaj komentar", "Common.Views.Comments.textAddCommentToDoc": "K dokumentu dodaj komentar",
"Common.Views.Comments.textAddReply": "Dodaj odgovor", "Common.Views.Comments.textAddReply": "Dodaj odgovor",
"Common.Views.Comments.textAnonym": "Gost", "Common.Views.Comments.textAnonym": "Gost",

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

@ -61,10 +61,14 @@ define([
var mapCustomizationElements = { var mapCustomizationElements = {
about: 'button#left-btn-about', about: 'button#left-btn-about',
feedback: 'button#left-btn-support', feedback: 'button#left-btn-support',
goback: '#fm-btn-back > a, #header-back > div', goback: '#fm-btn-back > a, #header-back > div'
};
var mapCustomizationExtElements = {
toolbar: '#viewport #toolbar', toolbar: '#viewport #toolbar',
leftMenu: '#viewport #left-menu', leftMenu: '#viewport #left-menu, #viewport #id-toolbar-full-placeholder-btn-settings, #viewport #id-toolbar-short-placeholder-btn-settings',
rightMenu: '#viewport #right-menu' rightMenu: '#viewport #right-menu',
header: '#viewport #header'
}; };
Common.localStorage.setId('presentation'); Common.localStorage.setId('presentation');
@ -303,6 +307,7 @@ define([
this._state.lostEditingRights = !this._state.lostEditingRights; this._state.lostEditingRights = !this._state.lostEditingRights;
this.api.asc_coAuthoringDisconnect(); this.api.asc_coAuthoringDisconnect();
this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights(); this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights();
Common.NotificationCenter.trigger('api:disconnect');
if (!old_rights) if (!old_rights)
Common.UI.warning({ Common.UI.warning({
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
@ -761,13 +766,15 @@ define([
this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view';
var headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header'); var headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header');
this.appOptions.canBranding = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object'); this.appOptions.canBranding = (licType!==Asc.c_oLicenseResult.Error) && (typeof this.editorConfig.customization == 'object');
if (this.appOptions.canBranding) if (this.appOptions.canBranding)
headerView.setBranding(this.editorConfig.customization); headerView.setBranding(this.editorConfig.customization);
params.asc_getTrial() && headerView.setDeveloperMode(true); params.asc_getTrial() && headerView.setDeveloperMode(true);
this.appOptions.canRename && headerView.setCanRename(true); this.appOptions.canRename && headerView.setCanRename(true);
this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object');
this.applyModeCommonElements(); this.applyModeCommonElements();
this.applyModeEditorElements(); this.applyModeEditorElements();
@ -1194,6 +1201,8 @@ define([
if (!this.appOptions.isDesktopApp) if (!this.appOptions.isDesktopApp)
this.appOptions.customization.about = true; this.appOptions.customization.about = true;
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
if (this.appOptions.canBrandingExt)
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);
} }
Common.NotificationCenter.trigger('layout:changed', 'main'); Common.NotificationCenter.trigger('layout:changed', 'main');

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

@ -466,9 +466,9 @@ define([
btnVerticalAlign = this.toolbar.btnVerticalAlign; btnVerticalAlign = this.toolbar.btnVerticalAlign;
switch (v) { switch (v) {
case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP: index = 0; align = 'btn-align-top'; break; case Asc.c_oAscVAlign.Top: index = 0; align = 'btn-align-top'; break;
case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR: index = 1; align = 'btn-align-middle'; break; case Asc.c_oAscVAlign.Center: index = 1; align = 'btn-align-middle'; break;
case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM: index = 2; align = 'btn-align-bottom'; break; case Asc.c_oAscVAlign.Bottom: index = 2; align = 'btn-align-bottom'; break;
default: index = -255; align = 'btn-align-middle'; break; default: index = -255; align = 'btn-align-middle'; break;
} }

14
apps/presentationeditor/main/app/template/ChartSettings.template
View file

@ -18,14 +18,14 @@
</td> </td>
</tr> </tr>
</table> </table>
<table cols="2"> <table cols="1">
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan=2> <td>
<label class="header"><%= scope.textChartType %></label> <label class="header"><%= scope.textChartType %></label>
</td> </td>
</tr> </tr>
@ -33,17 +33,19 @@
<td class="padding-small"> <td class="padding-small">
<div id="chart-button-type" style=""></div> <div id="chart-button-type" style=""></div>
</td> </td>
</tr>
<tr>
<td class="padding-small"> <td class="padding-small">
<div id="chart-button-style" style=""></div> <div id="chart-combo-style" style=""></div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan=2> <td>
<button type="button" class="btn btn-text-default" id="chart-button-edit-data" style="width:115px;"><%= scope.textEditData %></button> <button type="button" class="btn btn-text-default" id="chart-button-edit-data" style="width:115px;"><%= scope.textEditData %></button>
</td> </td>
</tr> </tr>

132
apps/presentationeditor/main/app/view/ChartSettings.js
View file

@ -43,7 +43,8 @@ define([
'jquery', 'jquery',
'underscore', 'underscore',
'backbone', 'backbone',
'common/main/lib/component/Button' 'common/main/lib/component/Button',
'common/main/lib/component/ComboDataView'
], function (menuTemplate, $, _, Backbone) { ], function (menuTemplate, $, _, Backbone) {
'use strict'; 'use strict';
@ -134,22 +135,27 @@ define([
value = props.get_SeveralChartStyles(); value = props.get_SeveralChartStyles();
if (this._state.SeveralCharts && value) { if (this._state.SeveralCharts && value) {
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); this.cmbChartStyle.fieldPicker.deselectAll();
btnIconEl.css('background-image', 'none'); this.cmbChartStyle.menuPicker.deselectAll();
this.mnuChartStylePicker.selectRecord(null, true);
this._state.ChartStyle = null; this._state.ChartStyle = null;
} else { } else {
value = props.getStyle(); value = props.getStyle();
if (this._state.ChartStyle!==value) { if (this._state.ChartStyle!==value || this._isChartStylesChanged) {
var record = this.mnuChartStylePicker.store.findWhere({data: value}); this.cmbChartStyle.suspendEvents();
this.mnuChartStylePicker.selectRecord(record, true); var rec = this.cmbChartStyle.menuPicker.store.findWhere({data: value});
if (record) { this.cmbChartStyle.menuPicker.selectRecord(rec);
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); this.cmbChartStyle.resumeEvents();
btnIconEl.css('background-image', 'url(' + record.get('imageUrl') + ')');
if (this._isChartStylesChanged) {
if (rec)
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true);
else
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true);
} }
this._state.ChartStyle=value; this._state.ChartStyle=value;
} }
} }
this._isChartStylesChanged = false;
this._noApply = false; this._noApply = false;
@ -352,33 +358,14 @@ define([
this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);
}, },
onSelectStyle: function(btn, picker, itemView, record) { onSelectStyle: function(combo, record) {
if (this._noApply) return; if (this._noApply) return;
var rawData = {},
isPickerSelect = _.isFunction(record.toJSON);
if (isPickerSelect){
if (record.get('selected')) {
rawData = record.toJSON();
} else {
// record deselected
return;
}
} else {
rawData = record;
}
var style = 'url(' + rawData.imageUrl + ')';
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon');
btnIconEl.css('background-image', style);
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
var props = new Asc.CAscChartProp(); var props = new Asc.CAscChartProp();
props.putStyle(rawData.data); props.putStyle(record.get('data'));
this.api.ChartApply(props); this.api.ChartApply(props);
} }
this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);
}, },
@ -389,64 +376,51 @@ define([
updateChartStyles: function(styles) { updateChartStyles: function(styles) {
var me = this; var me = this;
this._isChartStylesChanged = true;
if (!this.btnChartStyle) { if (!this.cmbChartStyle) {
this.btnChartStyle = new Common.UI.Button({ this.cmbChartStyle = new Common.UI.ComboDataView({
cls : 'btn-large-dataview', itemWidth: 50,
iconCls : 'item-wrap', itemHeight: 50,
menu : new Common.UI.Menu({ menuMaxHeight: 270,
menuAlign: 'tr-br', enableKeyEvents: true,
items: [ cls: 'combo-chart-style'
{ template: _.template('<div id="id-chart-menu-style" style="width: 245px; margin: 0 5px;"></div>') }
]
})
}); });
this.btnChartStyle.render($('#chart-button-style')); this.cmbChartStyle.render($('#chart-combo-style'));
this.lockedControls.push(this.btnChartStyle); this.cmbChartStyle.openButton.menu.cmpEl.css({
this.mnuChartStylePicker = new Common.UI.DataView({ 'min-width': 178,
el: $('#id-chart-menu-style'), 'max-width': 178
style: 'max-height: 411px;',
parentMenu: this.btnChartStyle.menu,
store: new Common.UI.DataViewStore(),
itemTemplate: _.template('<div id="<%= id %>" class="item-wrap" style="background-image: url(<%= imageUrl %>); background-position: 0 0;"></div>')
}); });
this.cmbChartStyle.on('click', _.bind(this.onSelectStyle, this));
if (this.btnChartStyle.menu) { this.cmbChartStyle.openButton.menu.on('show:after', function () {
this.btnChartStyle.menu.on('show:after', function () { me.cmbChartStyle.menuPicker.scroller.update({alwaysVisibleY: true});
me.mnuChartStylePicker.scroller.update({alwaysVisibleY: true}); });
}); this.lockedControls.push(this.cmbChartStyle);
}
this.mnuChartStylePicker.on('item:click', _.bind(this.onSelectStyle, this, this.btnChartStyle));
} }
if (styles && styles.length>0){ if (styles && styles.length>0){
var stylesStore = this.mnuChartStylePicker.store; var stylesStore = this.cmbChartStyle.menuPicker.store;
if (stylesStore) { if (stylesStore) {
var stylearray = [], var count = stylesStore.length;
selectedIdx = -1, if (count>0 && count==styles.length) {
selectedUrl; var data = stylesStore.models;
_.each(styles, function(item, index){ _.each(styles, function(style, index){
stylearray.push({ data[index].set('imageUrl', style.asc_getImageUrl());
imageUrl: item.asc_getImageUrl(),
data : item.asc_getStyle(),
tip : me.textStyle + ' ' + item.asc_getStyle()
}); });
if (me._state.ChartStyle == item.asc_getStyle()) { } else {
selectedIdx = index; var stylearray = [],
selectedUrl = item.asc_getImageUrl(); selectedIdx = -1;
} _.each(styles, function(item, index){
stylearray.push({
}); imageUrl: item.asc_getImageUrl(),
data : item.asc_getStyle(),
stylesStore.reset(stylearray, {silent: false}); tip : me.textStyle + ' ' + item.asc_getStyle()
});
});
stylesStore.reset(stylearray, {silent: false});
}
} }
} }
this.mnuChartStylePicker.selectByIndex(selectedIdx, true);
if (selectedIdx>=0 && this.btnChartStyle.cmpEl) {
var style = 'url(' + selectedUrl + ')';
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon');
btnIconEl.css('background-image', style);
}
}, },
onWidthChange: function(field, newValue, oldValue, eOpts){ onWidthChange: function(field, newValue, oldValue, eOpts){

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

@ -2169,19 +2169,19 @@ define([
caption : me.topCellText, caption : me.topCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP value : Asc.c_oAscVAlign.Top
}).on('click', _.bind(onItemClick, me)), }).on('click', _.bind(onItemClick, me)),
me.menuParagraphCenter = new Common.UI.MenuItem({ me.menuParagraphCenter = new Common.UI.MenuItem({
caption : me.centerCellText, caption : me.centerCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR value : Asc.c_oAscVAlign.Center
}).on('click', _.bind(onItemClick, me)), }).on('click', _.bind(onItemClick, me)),
me.menuParagraphBottom = new Common.UI.MenuItem({ me.menuParagraphBottom = new Common.UI.MenuItem({
caption : me.bottomCellText, caption : me.bottomCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM value : Asc.c_oAscVAlign.Bottom
}).on('click', _.bind(onItemClick, me)) }).on('click', _.bind(onItemClick, me))
] ]
}) })
@ -2345,9 +2345,9 @@ define([
menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
if (isInShape || isInChart) { if (isInShape || isInChart) {
var align = value.shapeProps.value.get_VerticalTextAlign(); var align = value.shapeProps.value.get_VerticalTextAlign();
me.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top);
me.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center);
me.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom);
var dir = value.shapeProps.value.get_Vert(); var dir = value.shapeProps.value.get_Vert();
me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal); me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal);

8
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -453,7 +453,7 @@ define([
icls : 'btn-align-top', icls : 'btn-align-top',
checkable : true, checkable : true,
toggleGroup : 'valignGroup', toggleGroup : 'valignGroup',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP value : Asc.c_oAscVAlign.Top
}, },
{ {
caption : me.textAlignMiddle, caption : me.textAlignMiddle,
@ -461,7 +461,7 @@ define([
icls : 'btn-align-middle', icls : 'btn-align-middle',
checkable : true, checkable : true,
toggleGroup : 'valignGroup', toggleGroup : 'valignGroup',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR, value : Asc.c_oAscVAlign.Center,
checked : true checked : true
}, },
{ {
@ -470,7 +470,7 @@ define([
icls : 'btn-align-bottom', icls : 'btn-align-bottom',
checkable : true, checkable : true,
toggleGroup : 'valignGroup', toggleGroup : 'valignGroup',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM value : Asc.c_oAscVAlign.Bottom
} }
] ]
}) })
@ -1157,7 +1157,7 @@ define([
] ]
}) })
); );
if (this.mode.isDesktopApp) if (this.mode.isDesktopApp || this.mode.canBrandingExt && this.mode.customization && this.mode.customization.header===false)
this.mnuitemHideTitleBar.hide(); this.mnuitemHideTitleBar.hide();
this.mnuZoomOut = new Common.UI.Button({ this.mnuZoomOut = new Common.UI.Button({

2
apps/presentationeditor/main/locale/cs.json
View file

@ -49,7 +49,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Poslat", "Common.Views.Chat.textSend": "Poslat",
"Common.Views.Comments.textAdd": "Přidat", "Common.Views.Comments.textAdd": "Přidat",
"Common.Views.Comments.textAddComment": "Přidat komentář", "Common.Views.Comments.textAddComment": "Přidat",
"Common.Views.Comments.textAddCommentToDoc": "Přidat komentář k dokumentu", "Common.Views.Comments.textAddCommentToDoc": "Přidat komentář k dokumentu",
"Common.Views.Comments.textAddReply": "Přidat odpověď", "Common.Views.Comments.textAddReply": "Přidat odpověď",
"Common.Views.Comments.textAnonym": "Návštěvník", "Common.Views.Comments.textAnonym": "Návštěvník",

2
apps/presentationeditor/main/locale/de.json
View file

@ -54,7 +54,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Senden", "Common.Views.Chat.textSend": "Senden",
"Common.Views.Comments.textAdd": "Hinzufügen", "Common.Views.Comments.textAdd": "Hinzufügen",
"Common.Views.Comments.textAddComment": "Kommentar hinzufügen", "Common.Views.Comments.textAddComment": "Hinzufügen",
"Common.Views.Comments.textAddCommentToDoc": "Kommentar zum Dokument hinzufügen", "Common.Views.Comments.textAddCommentToDoc": "Kommentar zum Dokument hinzufügen",
"Common.Views.Comments.textAddReply": "Antwort hinzufügen", "Common.Views.Comments.textAddReply": "Antwort hinzufügen",
"Common.Views.Comments.textAnonym": "Gast", "Common.Views.Comments.textAnonym": "Gast",

8
apps/presentationeditor/main/locale/en.json
View file

@ -592,11 +592,13 @@
"PE.Views.DocumentHolder.advancedParagraphText": "Text Advanced Settings", "PE.Views.DocumentHolder.advancedParagraphText": "Text Advanced Settings",
"PE.Views.DocumentHolder.advancedShapeText": "Shape Advanced Settings", "PE.Views.DocumentHolder.advancedShapeText": "Shape Advanced Settings",
"PE.Views.DocumentHolder.advancedTableText": "Table Advanced Settings", "PE.Views.DocumentHolder.advancedTableText": "Table Advanced Settings",
"PE.Views.DocumentHolder.alignmentText": "Alignment",
"PE.Views.DocumentHolder.belowText": "Below", "PE.Views.DocumentHolder.belowText": "Below",
"PE.Views.DocumentHolder.bottomCellText": "Align Bottom", "PE.Views.DocumentHolder.bottomCellText": "Align Bottom",
"PE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment", "PE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment",
"PE.Views.DocumentHolder.cellText": "Cell", "PE.Views.DocumentHolder.cellText": "Cell",
"PE.Views.DocumentHolder.centerCellText": "Align Center", "PE.Views.DocumentHolder.centerCellText": "Align Center",
"PE.Views.DocumentHolder.centerText": "Center",
"PE.Views.DocumentHolder.columnText": "Column", "PE.Views.DocumentHolder.columnText": "Column",
"PE.Views.DocumentHolder.deleteColumnText": "Delete Column", "PE.Views.DocumentHolder.deleteColumnText": "Delete Column",
"PE.Views.DocumentHolder.deleteRowText": "Delete Row", "PE.Views.DocumentHolder.deleteRowText": "Delete Row",
@ -616,9 +618,11 @@
"PE.Views.DocumentHolder.insertRowBelowText": "Row Below", "PE.Views.DocumentHolder.insertRowBelowText": "Row Below",
"PE.Views.DocumentHolder.insertRowText": "Insert Row", "PE.Views.DocumentHolder.insertRowText": "Insert Row",
"PE.Views.DocumentHolder.insertText": "Insert", "PE.Views.DocumentHolder.insertText": "Insert",
"PE.Views.DocumentHolder.leftText": "Left",
"PE.Views.DocumentHolder.mergeCellsText": "Merge Cells", "PE.Views.DocumentHolder.mergeCellsText": "Merge Cells",
"PE.Views.DocumentHolder.originalSizeText": "Default Size", "PE.Views.DocumentHolder.originalSizeText": "Default Size",
"PE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink", "PE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink",
"PE.Views.DocumentHolder.rightText": "Right",
"PE.Views.DocumentHolder.rowText": "Row", "PE.Views.DocumentHolder.rowText": "Row",
"PE.Views.DocumentHolder.selectText": "Select", "PE.Views.DocumentHolder.selectText": "Select",
"PE.Views.DocumentHolder.splitCellsText": "Split Cell...", "PE.Views.DocumentHolder.splitCellsText": "Split Cell...",
@ -728,10 +732,6 @@
"PE.Views.DocumentHolder.txtUnderbar": "Bar under text", "PE.Views.DocumentHolder.txtUnderbar": "Bar under text",
"PE.Views.DocumentHolder.txtUngroup": "Ungroup", "PE.Views.DocumentHolder.txtUngroup": "Ungroup",
"PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
"PE.Views.DocumentHolder.alignmentText": "Alignment",
"PE.Views.DocumentHolder.leftText": "Left",
"PE.Views.DocumentHolder.rightText": "Right",
"PE.Views.DocumentHolder.centerText": "Center",
"PE.Views.DocumentPreview.goToSlideText": "Go to Slide", "PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
"PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}", "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
"PE.Views.DocumentPreview.txtClose": "Close Slideshow", "PE.Views.DocumentPreview.txtClose": "Close Slideshow",

2
apps/presentationeditor/main/locale/es.json
View file

@ -54,7 +54,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "Aceptar", "Common.Views.AdvancedSettingsWindow.okButtonText": "Aceptar",
"Common.Views.Chat.textSend": "Enviar", "Common.Views.Chat.textSend": "Enviar",
"Common.Views.Comments.textAdd": "Añadir", "Common.Views.Comments.textAdd": "Añadir",
"Common.Views.Comments.textAddComment": "Añadir comentario", "Common.Views.Comments.textAddComment": "Añadir",
"Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento", "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento",
"Common.Views.Comments.textAddReply": "Añadir respuesta", "Common.Views.Comments.textAddReply": "Añadir respuesta",
"Common.Views.Comments.textAnonym": "Visitante", "Common.Views.Comments.textAnonym": "Visitante",

18
apps/presentationeditor/main/locale/fr.json
View file

@ -23,7 +23,7 @@
"Common.UI.SearchDialog.textTitle": "Recherche", "Common.UI.SearchDialog.textTitle": "Recherche",
"Common.UI.SearchDialog.textTitle2": "Recherche", "Common.UI.SearchDialog.textTitle2": "Recherche",
"Common.UI.SearchDialog.textWholeWords": "Seulement les mots entiers", "Common.UI.SearchDialog.textWholeWords": "Seulement les mots entiers",
"Common.UI.SearchDialog.txtBtnHideReplace": "Cacher Remplacer", "Common.UI.SearchDialog.txtBtnHideReplace": "Masquer le champ de remplacement",
"Common.UI.SearchDialog.txtBtnReplace": "Remplacer", "Common.UI.SearchDialog.txtBtnReplace": "Remplacer",
"Common.UI.SearchDialog.txtBtnReplaceAll": "Remplacer tout", "Common.UI.SearchDialog.txtBtnReplaceAll": "Remplacer tout",
"Common.UI.SynchronizeTip.textDontShow": "N'afficher plus ce message", "Common.UI.SynchronizeTip.textDontShow": "N'afficher plus ce message",
@ -54,8 +54,8 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Envoyer", "Common.Views.Chat.textSend": "Envoyer",
"Common.Views.Comments.textAdd": "Ajouter", "Common.Views.Comments.textAdd": "Ajouter",
"Common.Views.Comments.textAddComment": "Ajouter un commentaire", "Common.Views.Comments.textAddComment": "Ajouter",
"Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au Document", "Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au document",
"Common.Views.Comments.textAddReply": "Ajouter une réponse", "Common.Views.Comments.textAddReply": "Ajouter une réponse",
"Common.Views.Comments.textAnonym": "Invité", "Common.Views.Comments.textAnonym": "Invité",
"Common.Views.Comments.textCancel": "Annuler", "Common.Views.Comments.textCancel": "Annuler",
@ -587,7 +587,7 @@
"PE.Views.ChartSettings.textStyle": "Style", "PE.Views.ChartSettings.textStyle": "Style",
"PE.Views.ChartSettings.textWidth": "Largeur", "PE.Views.ChartSettings.textWidth": "Largeur",
"PE.Views.DocumentHolder.aboveText": "Au-dessus", "PE.Views.DocumentHolder.aboveText": "Au-dessus",
"PE.Views.DocumentHolder.addCommentText": "Ajouter un commentaire", "PE.Views.DocumentHolder.addCommentText": "Ajouter commentaire",
"PE.Views.DocumentHolder.advancedImageText": "Paramètres avancés de l'image", "PE.Views.DocumentHolder.advancedImageText": "Paramètres avancés de l'image",
"PE.Views.DocumentHolder.advancedParagraphText": "Paramètres avancés du texte", "PE.Views.DocumentHolder.advancedParagraphText": "Paramètres avancés du texte",
"PE.Views.DocumentHolder.advancedShapeText": "Paramètres avancés de la forme", "PE.Views.DocumentHolder.advancedShapeText": "Paramètres avancés de la forme",
@ -607,7 +607,7 @@
"PE.Views.DocumentHolder.direct270Text": "Rotate at 270°", "PE.Views.DocumentHolder.direct270Text": "Rotate at 270°",
"PE.Views.DocumentHolder.direct90Text": "Rotate at 90°", "PE.Views.DocumentHolder.direct90Text": "Rotate at 90°",
"PE.Views.DocumentHolder.directHText": "Horizontal", "PE.Views.DocumentHolder.directHText": "Horizontal",
"PE.Views.DocumentHolder.directionText": "Text Direction", "PE.Views.DocumentHolder.directionText": "Orientation du texte",
"PE.Views.DocumentHolder.editChartText": "Modifier les données", "PE.Views.DocumentHolder.editChartText": "Modifier les données",
"PE.Views.DocumentHolder.editHyperlinkText": "Modifier le lien hypertexte", "PE.Views.DocumentHolder.editHyperlinkText": "Modifier le lien hypertexte",
"PE.Views.DocumentHolder.hyperlinkText": "Lien hypertexte", "PE.Views.DocumentHolder.hyperlinkText": "Lien hypertexte",
@ -894,7 +894,7 @@
"PE.Views.RightMenu.txtShapeSettings": "Paramètres de la forme", "PE.Views.RightMenu.txtShapeSettings": "Paramètres de la forme",
"PE.Views.RightMenu.txtSlideSettings": "Paramètres de la diapositive", "PE.Views.RightMenu.txtSlideSettings": "Paramètres de la diapositive",
"PE.Views.RightMenu.txtTableSettings": "Paramètres du tableau", "PE.Views.RightMenu.txtTableSettings": "Paramètres du tableau",
"PE.Views.RightMenu.txtTextArtSettings": "Text Art Settings", "PE.Views.RightMenu.txtTextArtSettings": "Paramètres de texte d'art",
"PE.Views.ShapeSettings.strBackground": "Couleur d'arrière-plan", "PE.Views.ShapeSettings.strBackground": "Couleur d'arrière-plan",
"PE.Views.ShapeSettings.strChange": "Modifier la forme automatique", "PE.Views.ShapeSettings.strChange": "Modifier la forme automatique",
"PE.Views.ShapeSettings.strColor": "Couleur", "PE.Views.ShapeSettings.strColor": "Couleur",
@ -1049,7 +1049,7 @@
"PE.Views.SlideSizeSettings.textSlideSize": "Taille de la diapositive", "PE.Views.SlideSizeSettings.textSlideSize": "Taille de la diapositive",
"PE.Views.SlideSizeSettings.textTitle": "Paramètres de taille", "PE.Views.SlideSizeSettings.textTitle": "Paramètres de taille",
"PE.Views.SlideSizeSettings.textWidth": "Largeur", "PE.Views.SlideSizeSettings.textWidth": "Largeur",
"PE.Views.SlideSizeSettings.txt35": "35 mm Slides", "PE.Views.SlideSizeSettings.txt35": "Diapositives 35 mm",
"PE.Views.SlideSizeSettings.txtA3": "A3 Paper (297x420 mm)", "PE.Views.SlideSizeSettings.txtA3": "A3 Paper (297x420 mm)",
"PE.Views.SlideSizeSettings.txtA4": "A4 Paper (210x297 mm)", "PE.Views.SlideSizeSettings.txtA4": "A4 Paper (210x297 mm)",
"PE.Views.SlideSizeSettings.txtB4": "B4 (ICO) Paper (250x353 mm)", "PE.Views.SlideSizeSettings.txtB4": "B4 (ICO) Paper (250x353 mm)",
@ -1135,7 +1135,7 @@
"PE.Views.TextArtSettings.strForeground": "Couleur de premier plan", "PE.Views.TextArtSettings.strForeground": "Couleur de premier plan",
"PE.Views.TextArtSettings.strPattern": "Modèle", "PE.Views.TextArtSettings.strPattern": "Modèle",
"PE.Views.TextArtSettings.strSize": "Size", "PE.Views.TextArtSettings.strSize": "Size",
"PE.Views.TextArtSettings.strStroke": "Stroke", "PE.Views.TextArtSettings.strStroke": "Trait",
"PE.Views.TextArtSettings.strTransparency": "Opacité", "PE.Views.TextArtSettings.strTransparency": "Opacité",
"PE.Views.TextArtSettings.strType": "Type", "PE.Views.TextArtSettings.strType": "Type",
"PE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.", "PE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.",
@ -1158,7 +1158,7 @@
"PE.Views.TextArtSettings.textTemplate": "Template", "PE.Views.TextArtSettings.textTemplate": "Template",
"PE.Views.TextArtSettings.textTexture": "From Texture", "PE.Views.TextArtSettings.textTexture": "From Texture",
"PE.Views.TextArtSettings.textTile": "Tile", "PE.Views.TextArtSettings.textTile": "Tile",
"PE.Views.TextArtSettings.textTransform": "Transform", "PE.Views.TextArtSettings.textTransform": "Transformer",
"PE.Views.TextArtSettings.txtBrownPaper": "Papier brun", "PE.Views.TextArtSettings.txtBrownPaper": "Papier brun",
"PE.Views.TextArtSettings.txtCanvas": "Toile", "PE.Views.TextArtSettings.txtCanvas": "Toile",
"PE.Views.TextArtSettings.txtCarton": "Carton", "PE.Views.TextArtSettings.txtCarton": "Carton",

2
apps/presentationeditor/main/locale/pt.json
View file

@ -49,7 +49,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Enviar", "Common.Views.Chat.textSend": "Enviar",
"Common.Views.Comments.textAdd": "Adicionar", "Common.Views.Comments.textAdd": "Adicionar",
"Common.Views.Comments.textAddComment": "Adicionar comentário", "Common.Views.Comments.textAddComment": "Adicionar",
"Common.Views.Comments.textAddCommentToDoc": "Adicionar comentário ao documento", "Common.Views.Comments.textAddCommentToDoc": "Adicionar comentário ao documento",
"Common.Views.Comments.textAddReply": "Adicionar resposta", "Common.Views.Comments.textAddReply": "Adicionar resposta",
"Common.Views.Comments.textAnonym": "Visitante", "Common.Views.Comments.textAnonym": "Visitante",

2
apps/presentationeditor/main/locale/sl.json
View file

@ -49,7 +49,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Pošlji", "Common.Views.Chat.textSend": "Pošlji",
"Common.Views.Comments.textAdd": "Dodaj", "Common.Views.Comments.textAdd": "Dodaj",
"Common.Views.Comments.textAddComment": "Dodaj komentar", "Common.Views.Comments.textAddComment": "Dodaj",
"Common.Views.Comments.textAddCommentToDoc": "K dokumentu dodaj komentar", "Common.Views.Comments.textAddCommentToDoc": "K dokumentu dodaj komentar",
"Common.Views.Comments.textAddReply": "Dodaj odgovor", "Common.Views.Comments.textAddReply": "Dodaj odgovor",
"Common.Views.Comments.textAnonym": "Gost", "Common.Views.Comments.textAnonym": "Gost",

8
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -821,7 +821,7 @@ define([
if (index_column!==undefined || index_row!==undefined) { if (index_column!==undefined || index_row!==undefined) {
var data = dataarray[(index_column!==undefined) ? (index_column-1) : (index_row-1)]; var data = dataarray[(index_column!==undefined) ? (index_column-1) : (index_row-1)];
var str = Common.Utils.String.format((index_column!==undefined) ? this.textChangeColumnWidth : this.textChangeRowHeight, data.asc_getSizeCCOrPt().toFixed(2), data.asc_getSizePx()); var str = Common.Utils.String.format((index_column!==undefined) ? this.textChangeColumnWidth : this.textChangeRowHeight, data.asc_getSizeCCOrPt().toFixed(2), data.asc_getSizePx().toFixed());
if (row_columnTip.ref && row_columnTip.ref.isVisible()) { if (row_columnTip.ref && row_columnTip.ref.isVisible()) {
if (row_columnTip.text != str) { if (row_columnTip.text != str) {
row_columnTip.text = str; row_columnTip.text = str;
@ -1216,9 +1216,9 @@ define([
align = value.asc_getVerticalTextAlign(), align = value.asc_getVerticalTextAlign(),
direct = value.asc_getVert(); direct = value.asc_getVert();
isObjLocked = isObjLocked || value.asc_getLocked(); isObjLocked = isObjLocked || value.asc_getLocked();
documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top);
documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center);
documentHolder.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); documentHolder.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom);
documentHolder.menuParagraphDirectH.setChecked(direct == Asc.c_oAscVertDrawingText.normal); documentHolder.menuParagraphDirectH.setChecked(direct == Asc.c_oAscVertDrawingText.normal);
documentHolder.menuParagraphDirect90.setChecked(direct == Asc.c_oAscVertDrawingText.vert); documentHolder.menuParagraphDirect90.setChecked(direct == Asc.c_oAscVertDrawingText.vert);

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

@ -66,10 +66,14 @@ define([
var mapCustomizationElements = { var mapCustomizationElements = {
about: 'button#left-btn-about', about: 'button#left-btn-about',
feedback: 'button#left-btn-support', feedback: 'button#left-btn-support',
goback: '#fm-btn-back > a, #header-back > div', goback: '#fm-btn-back > a, #header-back > div'
};
var mapCustomizationExtElements = {
toolbar: '#viewport #toolbar', toolbar: '#viewport #toolbar',
leftMenu: '#viewport #left-menu', leftMenu: '#viewport #left-menu, #viewport #id-toolbar-full-placeholder-btn-settings, #viewport #id-toolbar-short-placeholder-btn-settings',
rightMenu: '#viewport #right-menu' rightMenu: '#viewport #right-menu',
header: '#viewport #header'
}; };
Common.localStorage.setId('table'); Common.localStorage.setId('table');
@ -331,6 +335,7 @@ define([
this._state.lostEditingRights = !this._state.lostEditingRights; this._state.lostEditingRights = !this._state.lostEditingRights;
this.api.asc_coAuthoringDisconnect(); this.api.asc_coAuthoringDisconnect();
this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights(); this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights();
Common.NotificationCenter.trigger('api:disconnect');
if (!old_rights) if (!old_rights)
Common.UI.warning({ Common.UI.warning({
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
@ -773,10 +778,12 @@ define([
this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false); this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
this.appOptions.canRename = !!this.permissions.rename; this.appOptions.canRename = !!this.permissions.rename;
this.appOptions.canBranding = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object'); this.appOptions.canBranding = (licType!==Asc.c_oLicenseResult.Error) && (typeof this.editorConfig.customization == 'object');
if (this.appOptions.canBranding) if (this.appOptions.canBranding)
this.headerView.setBranding(this.editorConfig.customization); this.headerView.setBranding(this.editorConfig.customization);
this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object');
params.asc_getTrial() && this.headerView.setDeveloperMode(true); params.asc_getTrial() && this.headerView.setDeveloperMode(true);
this.appOptions.canRename && this.headerView.setCanRename(true); this.appOptions.canRename && this.headerView.setCanRename(true);
} }
@ -1160,6 +1167,10 @@ define([
config.msg = this.errorCopyMultiselectArea; config.msg = this.errorCopyMultiselectArea;
break; break;
case Asc.c_oAscError.ID.PrintMaxPagesCount:
config.msg = this.errorPrintMaxPagesCount;
break;
default: default:
config.msg = this.errorDefaultMessage.replace('%1', id); config.msg = this.errorDefaultMessage.replace('%1', id);
break; break;
@ -1319,6 +1330,8 @@ define([
if (!this.appOptions.isDesktopApp) if (!this.appOptions.isDesktopApp)
this.appOptions.customization.about = true; this.appOptions.customization.about = true;
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
if (this.appOptions.canBrandingExt)
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);
} }
this.stackLongActions.pop({id: InitApplication, type: Asc.c_oAscAsyncActionType.BlockInteraction}); this.stackLongActions.pop({id: InitApplication, type: Asc.c_oAscAsyncActionType.BlockInteraction});
@ -1994,7 +2007,8 @@ define([
titleLicenseExp: 'License expired', titleLicenseExp: 'License expired',
openErrorText: 'An error has occurred while opening the file', openErrorText: 'An error has occurred while opening the file',
saveErrorText: 'An error has occurred while saving the file', saveErrorText: 'An error has occurred while saving the file',
errorCopyMultiselectArea: 'This command cannot be used with multiple selections.<br>Select a single range and try again.' errorCopyMultiselectArea: 'This command cannot be used with multiple selections.<br>Select a single range and try again.',
errorPrintMaxPagesCount: 'Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.<br>This restriction will be eliminated in upcoming releases.'
} }
})(), SSE.Controllers.Main || {})) })(), SSE.Controllers.Main || {}))
}); });

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

@ -1183,7 +1183,7 @@ define([
'command+shift+l,ctrl+shift+l': function(e) { 'command+shift+l,ctrl+shift+l': function(e) {
var state = me._state.filter; var state = me._state.filter;
me._state.filter = undefined; me._state.filter = undefined;
if (me.editMode && me.api) { if (me.editMode && me.api && !me._state.multiselect) {
if (me._state.tablename || state) if (me._state.tablename || state)
me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.filter, !state); me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.filter, !state);
else else
@ -1557,13 +1557,10 @@ define([
onApiSelectionChanged: function(info) { onApiSelectionChanged: function(info) {
if (!this.editMode) return; if (!this.editMode) return;
var selectionType = info.asc_getFlags().asc_getSelectionType(); var selectionType = info.asc_getFlags().asc_getSelectionType(),
var coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false; coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false,
if (this._disableEditOptions(selectionType, coauth_disable)) { editOptionsDisabled = this._disableEditOptions(selectionType, coauth_disable),
return; me = this,
}
var me = this,
toolbar = this.toolbar, toolbar = this.toolbar,
fontobj = info.asc_getFont(), fontobj = info.asc_getFont(),
val, need_disable = false; val, need_disable = false;
@ -1574,6 +1571,15 @@ define([
Common.NotificationCenter.trigger('fonts:change', fontobj); Common.NotificationCenter.trigger('fonts:change', fontobj);
} }
/* read font size */
var str_size = fontobj.asc_getSize();
if (this._state.fontsize !== str_size) {
toolbar.cmbFontSize.setValue((str_size!==undefined) ? str_size : '');
this._state.fontsize = str_size;
}
if (editOptionsDisabled) return;
/* read font params */ /* read font params */
if (!toolbar.mode.isEditMailMerge && !toolbar.mode.isEditDiagram) { if (!toolbar.mode.isEditMailMerge && !toolbar.mode.isEditDiagram) {
val = fontobj.asc_getBold(); val = fontobj.asc_getBold();
@ -1593,13 +1599,6 @@ define([
} }
} }
/* read font size */
var str_size = fontobj.asc_getSize();
if (this._state.fontsize !== str_size) {
toolbar.cmbFontSize.setValue((str_size!==undefined) ? str_size : '');
this._state.fontsize = str_size;
}
/* read font color */ /* read font color */
var clr, var clr,
color, color,

18
apps/spreadsheeteditor/main/app/template/ChartSettings.template
View file

@ -18,9 +18,9 @@
</td> </td>
</tr> </tr>
</table> </table>
<table cols="2"> <table cols="1">
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
@ -29,29 +29,31 @@
<label class="header"><%= scope.textType %></label> <label class="header"><%= scope.textType %></label>
<div id="chart-button-type" style=""></div> <div id="chart-button-type" style=""></div>
</td> </td>
</tr>
<tr>
<td class="padding-small"> <td class="padding-small">
<label class="header"><%= scope.textStyle %></label> <label class="header" style=""><%= scope.textStyle %></label>
<div id="chart-button-style" style=""></div> <div class="" id="chart-combo-style" style="width: 100%;"></div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small">
<label class="header"><%= scope.textRanges %></label> <label class="header"><%= scope.textRanges %></label>
<button type="button" class="btn btn-text-default" id="chart-btn-select-data" style="min-width: 100px; width: auto; display: block;"><%= scope.textSelectData %></button> <button type="button" class="btn btn-text-default" id="chart-btn-select-data" style="min-width: 100px; width: auto; display: block;"><%= scope.textSelectData %></button>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="center" colspan=2> <td align="center">
<label class="link" id="chart-advanced-link"><%= scope.textAdvanced %></label> <label class="link" id="chart-advanced-link"><%= scope.textAdvanced %></label>
</td> </td>
</tr> </tr>

6
apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template
View file

@ -1,15 +1,11 @@
<div id="id-chart-settings-dlg-style" class="settings-panel active"> <div id="id-chart-settings-dlg-style" class="settings-panel active">
<div class="inner-content"> <div class="inner-content">
<table cols="2" style=""> <table cols="1" style="">
<tr> <tr>
<td class="padding-large"> <td class="padding-large">
<label class="header"><%= scope.textType %></label> <label class="header"><%= scope.textType %></label>
<div id="chart-dlg-button-type" style="margin-right: 15px;"></div> <div id="chart-dlg-button-type" style="margin-right: 15px;"></div>
</td> </td>
<td class="padding-large">
<label class="header"><%= scope.textStyle %></label>
<div id="chart-dlg-button-style" style=""></div>
</td>
</tr> </tr>
</table> </table>
</div> </div>

129
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file

@ -45,6 +45,7 @@ define([
'backbone', 'backbone',
'common/main/lib/component/Button', 'common/main/lib/component/Button',
'common/main/lib/component/MetricSpinner', 'common/main/lib/component/MetricSpinner',
'common/main/lib/component/ComboDataView',
'spreadsheeteditor/main/app/view/ChartSettingsDlg' 'spreadsheeteditor/main/app/view/ChartSettingsDlg'
], function (menuTemplate, $, _, Backbone) { ], function (menuTemplate, $, _, Backbone) {
'use strict'; 'use strict';
@ -138,22 +139,27 @@ define([
value = props.asc_getSeveralChartStyles(); value = props.asc_getSeveralChartStyles();
if (this._state.SeveralCharts && value) { if (this._state.SeveralCharts && value) {
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); this.cmbChartStyle.fieldPicker.deselectAll();
btnIconEl.css('background-image', 'none'); this.cmbChartStyle.menuPicker.deselectAll();
this.mnuChartStylePicker.selectRecord(null, true);
this._state.ChartStyle = null; this._state.ChartStyle = null;
} else { } else {
value = this.chartProps.getStyle(); value = this.chartProps.getStyle();
if (this._state.ChartStyle!==value) { if (this._state.ChartStyle!==value || this._isChartStylesChanged) {
var record = this.mnuChartStylePicker.store.findWhere({data: value}); this.cmbChartStyle.suspendEvents();
this.mnuChartStylePicker.selectRecord(record, true); var rec = this.cmbChartStyle.menuPicker.store.findWhere({data: value});
if (record) { this.cmbChartStyle.menuPicker.selectRecord(rec);
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); this.cmbChartStyle.resumeEvents();
btnIconEl.css('background-image', 'url(' + record.get('imageUrl') + ')');
if (this._isChartStylesChanged) {
if (rec)
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true);
else
this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true);
} }
this._state.ChartStyle=value; this._state.ChartStyle=value;
} }
} }
this._isChartStylesChanged = false;
this._noApply = false; this._noApply = false;
@ -457,30 +463,12 @@ define([
Common.NotificationCenter.trigger('edit:complete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onSelectStyle: function(btn, picker, itemView, record) { onSelectStyle: function(combo, record) {
if (this._noApply) return; if (this._noApply) return;
var rawData = {},
isPickerSelect = _.isFunction(record.toJSON);
if (isPickerSelect){
if (record.get('selected')) {
rawData = record.toJSON();
} else {
// record deselected
return;
}
} else {
rawData = record;
}
var style = 'url(' + rawData.imageUrl + ')';
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon');
btnIconEl.css('background-image', style);
if (this.api && !this._noApply && this.chartProps) { if (this.api && !this._noApply && this.chartProps) {
var props = new Asc.asc_CImgProperty(); var props = new Asc.asc_CImgProperty();
this.chartProps.putStyle(rawData.data); this.chartProps.putStyle(record.get('data'));
props.asc_putChartProperties(this.chartProps); props.asc_putChartProperties(this.chartProps);
this.api.asc_setGraphicObjectProps(props); this.api.asc_setGraphicObjectProps(props);
} }
@ -494,64 +482,51 @@ define([
updateChartStyles: function(styles) { updateChartStyles: function(styles) {
var me = this; var me = this;
this._isChartStylesChanged = true;
if (!this.btnChartStyle) { if (!this.cmbChartStyle) {
this.btnChartStyle = new Common.UI.Button({ this.cmbChartStyle = new Common.UI.ComboDataView({
cls : 'btn-large-dataview', itemWidth: 50,
iconCls : 'item-wrap', itemHeight: 50,
menu : new Common.UI.Menu({ menuMaxHeight: 270,
menuAlign: 'tr-br', enableKeyEvents: true,
items: [ cls: 'combo-chart-style'
{ template: _.template('<div id="id-chart-menu-style" style="width: 245px; margin: 0 5px;"></div>') }
]
})
}); });
this.btnChartStyle.render($('#chart-button-style')); this.cmbChartStyle.render($('#chart-combo-style'));
this.lockedControls.push(this.btnChartStyle); this.cmbChartStyle.openButton.menu.cmpEl.css({
this.mnuChartStylePicker = new Common.UI.DataView({ 'min-width': 178,
el: $('#id-chart-menu-style'), 'max-width': 178
style: 'max-height: 411px;',
parentMenu: this.btnChartStyle.menu,
store: new Common.UI.DataViewStore(),
itemTemplate: _.template('<div id="<%= id %>" class="item-wrap" style="background-image: url(<%= imageUrl %>); background-position: 0 0;"></div>')
}); });
this.cmbChartStyle.on('click', _.bind(this.onSelectStyle, this));
if (this.btnChartStyle.menu) { this.cmbChartStyle.openButton.menu.on('show:after', function () {
this.btnChartStyle.menu.on('show:after', function () { me.cmbChartStyle.menuPicker.scroller.update({alwaysVisibleY: true});
me.mnuChartStylePicker.scroller.update({alwaysVisibleY: true}); });
}); this.lockedControls.push(this.cmbChartStyle);
}
this.mnuChartStylePicker.on('item:click', _.bind(this.onSelectStyle, this, this.btnChartStyle));
} }
if (styles && styles.length>0){ if (styles && styles.length>0){
var stylesStore = this.mnuChartStylePicker.store; var stylesStore = this.cmbChartStyle.menuPicker.store;
if (stylesStore) { if (stylesStore) {
var stylearray = [], var count = stylesStore.length;
selectedIdx = -1, if (count>0 && count==styles.length) {
selectedUrl; var data = stylesStore.models;
_.each(styles, function(item, index){ _.each(styles, function(style, index){
stylearray.push({ data[index].set('imageUrl', style.asc_getImageUrl());
imageUrl: item.asc_getImageUrl(),
data : item.asc_getStyle(),
tip : me.textStyle + ' ' + item.asc_getStyle()
}); });
if (me._state.ChartStyle == item.asc_getStyle()) { } else {
selectedIdx = index; var stylearray = [],
selectedUrl = item.asc_getImageUrl(); selectedIdx = -1;
} _.each(styles, function(item, index){
stylearray.push({
}); imageUrl: item.asc_getImageUrl(),
data : item.asc_getStyle(),
stylesStore.reset(stylearray, {silent: false}); tip : me.textStyle + ' ' + item.asc_getStyle()
});
});
stylesStore.reset(stylearray, {silent: false});
}
} }
} }
this.mnuChartStylePicker.selectByIndex(selectedIdx, true);
if (selectedIdx>=0 && this.btnChartStyle.cmpEl) {
var style = 'url(' + selectedUrl + ')';
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon');
btnIconEl.css('background-image', style);
}
}, },
setLocked: function (locked) { setLocked: function (locked) {

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

@ -79,7 +79,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
this._state = { this._state = {
ChartStyle: 1,
ChartType: Asc.c_oAscChartTypeSettings.barNormal ChartType: Asc.c_oAscChartTypeSettings.barNormal
}; };
this._noApply = true; this._noApply = true;
@ -174,34 +173,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this.btnChartType.render($('#chart-dlg-button-type')); this.btnChartType.render($('#chart-dlg-button-type'));
this.mnuChartTypePicker.on('item:click', _.bind(this.onSelectType, this, this.btnChartType)); this.mnuChartTypePicker.on('item:click', _.bind(this.onSelectType, this, this.btnChartType));
this.btnChartStyle = new Common.UI.Button({
cls : 'btn-large-dataview',
iconCls : 'item-wrap',
menu : new Common.UI.Menu({
additionalAlign: menuAddAlign,
items: [
{ template: _.template('<div id="id-chart-dlg-menu-style" style="width: 245px; margin: 0 5px;"></div>') }
]
})
});
this.btnChartStyle.on('render:after', function(btn) {
me.mnuChartStylePicker = new Common.UI.DataView({
el: $('#id-chart-dlg-menu-style'),
parentMenu: btn.menu,
style: 'max-height: 411px;',
store: new Common.UI.DataViewStore(),
itemTemplate: _.template('<div id="<%= id %>" class="item-wrap" style="background-image: url(<%= imageUrl %>); background-position: 0 0;"></div>')
});
if (me.btnChartStyle.menu) {
me.btnChartStyle.menu.on('show:after', function () {
me.mnuChartStylePicker.scroller.update({alwaysVisibleY: true});
});
}
});
this.btnChartStyle.render($('#chart-dlg-button-style'));
this.mnuChartStylePicker.on('item:click', _.bind(this.onSelectStyle, this, this.btnChartStyle));
this.cmbDataDirect = new Common.UI.ComboBox({ this.cmbDataDirect = new Common.UI.ComboBox({
el : $('#chart-dlg-combo-range'), el : $('#chart-dlg-combo-range'),
menuStyle : 'min-width: 120px;', menuStyle : 'min-width: 120px;',
@ -804,9 +775,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
afterRender: function() { afterRender: function() {
if (this.api)
this.updateChartStyles(this.api.asc_getChartPreviews(this._state.ChartType));
this._setDefaults(this.chartSettings); this._setDefaults(this.chartSettings);
if (this.storageName) { if (this.storageName) {
var value = Common.localStorage.getItem(this.storageName); var value = Common.localStorage.getItem(this.storageName);
@ -835,7 +803,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
} }
this.btnChartType.setIconCls('item-chartlist ' + rawData.iconCls); this.btnChartType.setIconCls('item-chartlist ' + rawData.iconCls);
this.updateChartStyles(this.api.asc_getChartPreviews(rawData.type));
this.chartSettings.changeType(rawData.type); this.chartSettings.changeType(rawData.type);
this.updateAxisProps(rawData.type, true); this.updateAxisProps(rawData.type, true);
this.vertAxisProps = this.chartSettings.getVertAxisProps(); this.vertAxisProps = this.chartSettings.getVertAxisProps();
@ -1018,62 +985,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
this.currentAxisProps = props; this.currentAxisProps = props;
}, },
onSelectStyle: function(btn, picker, itemView, record) {
if (this._noApply) return;
var rawData = {},
isPickerSelect = _.isFunction(record.toJSON);
if (isPickerSelect){
if (record.get('selected')) {
rawData = record.toJSON();
} else {
// record deselected
return;
}
} else {
rawData = record;
}
var style = 'url(' + rawData.imageUrl + ')';
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon');
btnIconEl.css('background-image', style);
this._state.ChartStyle = rawData.data;
},
updateChartStyles: function(styles) {
var me = this;
if (styles && styles.length>0){
var stylesStore = this.mnuChartStylePicker.store;
if (stylesStore) {
var stylearray = [],
selectedIdx = -1,
selectedUrl;
_.each(styles, function(item, index){
stylearray.push({
imageUrl: item.asc_getImageUrl(),
data : item.asc_getStyle(),
tip : me.textStyle + ' ' + item.asc_getStyle()
});
if (me._state.ChartStyle == item.asc_getStyle()) {
selectedIdx = index;
selectedUrl = item.asc_getImageUrl();
}
});
stylesStore.reset(stylearray, {silent: false});
}
}
this.mnuChartStylePicker.selectByIndex(selectedIdx, true);
if (selectedIdx>=0 && this.btnChartStyle.cmpEl) {
var style = 'url(' + selectedUrl + ')';
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon');
btnIconEl.css('background-image', style);
}
},
_setDefaults: function(props) { _setDefaults: function(props) {
var me = this; var me = this;
if (props ){ if (props ){
@ -1090,18 +1001,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
if (record) { if (record) {
this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls')); this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls'));
} }
this.updateChartStyles(this.api.asc_getChartPreviews(this._state.ChartType));
this._noApply = false; this._noApply = false;
this._state.ChartStyle = props.getStyle();
record = this.mnuChartStylePicker.store.findWhere({data: this._state.ChartStyle});
this.mnuChartStylePicker.selectRecord(record, true);
if (record) {
var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon');
btnIconEl.css('background-image', 'url(' + record.get('imageUrl') + ')');
}
var value = props.getRange(); var value = props.getRange();
this.txtDataRange.setValue((value) ? value : ''); this.txtDataRange.setValue((value) ? value : '');
this.dataRangeValid = value; this.dataRangeValid = value;
@ -1151,7 +1053,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
// Layout // Layout
this.chartSettings.putType(type); this.chartSettings.putType(type);
this.chartSettings.putStyle(this._state.ChartStyle);
this.chartSettings.putInColumns(this.cmbDataDirect.getValue()==1); this.chartSettings.putInColumns(this.cmbDataDirect.getValue()==1);
this.chartSettings.putRange(this.txtDataRange.getValue()); this.chartSettings.putRange(this.txtDataRange.getValue());

6
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file

@ -470,19 +470,19 @@ define([
caption : me.topCellText, caption : me.topCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP value : Asc.c_oAscVAlign.Top
}), }),
me.menuParagraphCenter = new Common.UI.MenuItem({ me.menuParagraphCenter = new Common.UI.MenuItem({
caption : me.centerCellText, caption : me.centerCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR value : Asc.c_oAscVAlign.Center
}), }),
this.menuParagraphBottom = new Common.UI.MenuItem({ this.menuParagraphBottom = new Common.UI.MenuItem({
caption : me.bottomCellText, caption : me.bottomCellText,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM value : Asc.c_oAscVAlign.Bottom
}) })
] ]
}) })

13
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -244,7 +244,17 @@ define([
}); });
var menuHiddenItems = new Common.UI.Menu({ var menuHiddenItems = new Common.UI.Menu({
maxHeight: 260,
menuAlign: 'tl-tr' menuAlign: 'tl-tr'
}).on('render:after', function(mnu) {
this.scroller = new Common.UI.Scroller({
el: $(this.el).find('.dropdown-menu '),
useKeyboard: this.enableKeyEvents && !this.handleSelect,
minScrollbarLength : 40,
alwaysVisibleY: true
});
}).on('show:after', function () {
this.scroller.update({alwaysVisibleY: true});
}); });
menuHiddenItems.on('item:click', function(obj,item,e) { menuHiddenItems.on('item:click', function(obj,item,e) {
me.fireEvent('show:hidden', [me, item.value]); me.fireEvent('show:hidden', [me, item.value]);
@ -501,7 +511,8 @@ define([
onTabMenu: function (o, index, tab) { onTabMenu: function (o, index, tab) {
if (this.mode.isEdit && !this.isEditFormula && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.Chart) && if (this.mode.isEdit && !this.isEditFormula && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.Chart) &&
(this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.FormatTable)) { (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.FormatTable) &&
!this.mode.isDisconnected ) {
if (tab && tab.sheetindex >= 0) { if (tab && tab.sheetindex >= 0) {
var rect = tab.$el.get(0).getBoundingClientRect(), var rect = tab.$el.get(0).getBoundingClientRect(),
childPos = tab.$el.offset(), childPos = tab.$el.offset(),

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

@ -1375,7 +1375,7 @@ define([
this.mnuitemHideFormulaBar.setChecked(!!options.formula); this.mnuitemHideFormulaBar.setChecked(!!options.formula);
this.mnuitemHideHeadings.setChecked(!!options.headings); this.mnuitemHideHeadings.setChecked(!!options.headings);
if (this.mode.isDesktopApp) if (this.mode.isDesktopApp || this.mode.canBrandingExt && this.mode.customization && this.mode.customization.header===false)
this.mnuitemHideTitleBar.hide(); this.mnuitemHideTitleBar.hide();
} }
@ -1708,10 +1708,8 @@ define([
} }
} }
if (mode.isDesktopApp) { if (mode.isDesktopApp)
$('.toolbar-group-native').hide(); $('.toolbar-group-native').hide();
this.mnuitemHideTitleBar && this.mnuitemHideTitleBar.hide();
}
this.lockToolbar(SSE.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]}); this.lockToolbar(SSE.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]});
} }

2
apps/spreadsheeteditor/main/locale/cs.json
View file

@ -46,7 +46,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Poslat", "Common.Views.Chat.textSend": "Poslat",
"Common.Views.Comments.textAdd": "Přidat", "Common.Views.Comments.textAdd": "Přidat",
"Common.Views.Comments.textAddComment": "Přidat komentář", "Common.Views.Comments.textAddComment": "Přidat",
"Common.Views.Comments.textAddCommentToDoc": "Přidat komentář k dokumentu", "Common.Views.Comments.textAddCommentToDoc": "Přidat komentář k dokumentu",
"Common.Views.Comments.textAddReply": "Přidat odpověď", "Common.Views.Comments.textAddReply": "Přidat odpověď",
"Common.Views.Comments.textAnonym": "Návštěvník", "Common.Views.Comments.textAnonym": "Návštěvník",

2
apps/spreadsheeteditor/main/locale/de.json
View file

@ -51,7 +51,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Senden", "Common.Views.Chat.textSend": "Senden",
"Common.Views.Comments.textAdd": "Hinzufügen", "Common.Views.Comments.textAdd": "Hinzufügen",
"Common.Views.Comments.textAddComment": "Kommentar hinzufügen", "Common.Views.Comments.textAddComment": "Hinzufügen",
"Common.Views.Comments.textAddCommentToDoc": "Kommentar zum Dokument hinzufügen", "Common.Views.Comments.textAddCommentToDoc": "Kommentar zum Dokument hinzufügen",
"Common.Views.Comments.textAddReply": "Antwort hinzufügen", "Common.Views.Comments.textAddReply": "Antwort hinzufügen",
"Common.Views.Comments.textAnonym": "Gast", "Common.Views.Comments.textAnonym": "Gast",

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

@ -98,9 +98,21 @@
"Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.okButtonText": "Ok",
"Common.Views.RenameDialog.textName": "File name", "Common.Views.RenameDialog.textName": "File name",
"Common.Views.RenameDialog.txtInvalidName": "The file name cannot contain any of the following characters: ", "Common.Views.RenameDialog.txtInvalidName": "The file name cannot contain any of the following characters: ",
"SSE.Controllers.DocumentHolder.alignmentText": "Alignment",
"SSE.Controllers.DocumentHolder.centerText": "Center",
"SSE.Controllers.DocumentHolder.deleteColumnText": "Delete Column",
"SSE.Controllers.DocumentHolder.deleteRowText": "Delete Row",
"SSE.Controllers.DocumentHolder.deleteText": "Delete",
"SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.", "SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
"SSE.Controllers.DocumentHolder.guestText": "Guest", "SSE.Controllers.DocumentHolder.guestText": "Guest",
"SSE.Controllers.DocumentHolder.insertColumnLeftText": "Column Left",
"SSE.Controllers.DocumentHolder.insertColumnRightText": "Column Right",
"SSE.Controllers.DocumentHolder.insertRowAboveText": "Row Above",
"SSE.Controllers.DocumentHolder.insertRowBelowText": "Row Below",
"SSE.Controllers.DocumentHolder.insertText": "Insert",
"SSE.Controllers.DocumentHolder.leftText": "Left",
"SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning", "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning",
"SSE.Controllers.DocumentHolder.rightText": "Right",
"SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Column Width {0} symbols ({1} pixels)", "SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Column Width {0} symbols ({1} pixels)",
"SSE.Controllers.DocumentHolder.textChangeRowHeight": "Row Height {0} points ({1} pixels)", "SSE.Controllers.DocumentHolder.textChangeRowHeight": "Row Height {0} points ({1} pixels)",
"SSE.Controllers.DocumentHolder.textCtrlClick": "Press CTRL and click link", "SSE.Controllers.DocumentHolder.textCtrlClick": "Press CTRL and click link",
@ -181,18 +193,6 @@
"SSE.Controllers.DocumentHolder.txtTop": "Top", "SSE.Controllers.DocumentHolder.txtTop": "Top",
"SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text", "SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text",
"SSE.Controllers.DocumentHolder.txtWidth": "Width", "SSE.Controllers.DocumentHolder.txtWidth": "Width",
"SSE.Controllers.DocumentHolder.insertText": "Insert",
"SSE.Controllers.DocumentHolder.alignmentText": "Alignment",
"SSE.Controllers.DocumentHolder.leftText": "Left",
"SSE.Controllers.DocumentHolder.rightText": "Right",
"SSE.Controllers.DocumentHolder.centerText": "Center",
"SSE.Controllers.DocumentHolder.insertRowAboveText": "Row Above",
"SSE.Controllers.DocumentHolder.insertRowBelowText": "Row Below",
"SSE.Controllers.DocumentHolder.insertColumnLeftText": "Column Left",
"SSE.Controllers.DocumentHolder.insertColumnRightText": "Column Right",
"SSE.Controllers.DocumentHolder.deleteText": "Delete",
"SSE.Controllers.DocumentHolder.deleteRowText": "Delete Row",
"SSE.Controllers.DocumentHolder.deleteColumnText": "Delete Column",
"SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet", "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet",
"SSE.Controllers.LeftMenu.textByColumns": "By columns", "SSE.Controllers.LeftMenu.textByColumns": "By columns",
"SSE.Controllers.LeftMenu.textByRows": "By rows", "SSE.Controllers.LeftMenu.textByRows": "By rows",
@ -249,6 +249,7 @@
"SSE.Controllers.Main.errorOpenWarning": "The length of one of the formulas in the file exceeded<br>the allowed number of characters and it was removed.", "SSE.Controllers.Main.errorOpenWarning": "The length of one of the formulas in the file exceeded<br>the allowed number of characters and it was removed.",
"SSE.Controllers.Main.errorOperandExpected": "The entered function syntax is not correct. Please check if you are missing one of the parentheses - '(' or ')'.", "SSE.Controllers.Main.errorOperandExpected": "The entered function syntax is not correct. Please check if you are missing one of the parentheses - '(' or ')'.",
"SSE.Controllers.Main.errorPasteMaxRange": "The copy and paste area does not match.<br>Please select an area with the same size or click the first cell in a row to paste the copied cells.", "SSE.Controllers.Main.errorPasteMaxRange": "The copy and paste area does not match.<br>Please select an area with the same size or click the first cell in a row to paste the copied cells.",
"SSE.Controllers.Main.errorPrintMaxPagesCount": "Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.<br>This restriction will be eliminated in upcoming releases.",
"SSE.Controllers.Main.errorProcessSaveResult": "Saving failed", "SSE.Controllers.Main.errorProcessSaveResult": "Saving failed",
"SSE.Controllers.Main.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.Controllers.Main.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.Controllers.Main.errorUnexpectedGuid": "External error.<br>Unexpected GUID. Please contact support in case the error persists.", "SSE.Controllers.Main.errorUnexpectedGuid": "External error.<br>Unexpected GUID. Please contact support in case the error persists.",

2
apps/spreadsheeteditor/main/locale/es.json
View file

@ -51,7 +51,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Enviar", "Common.Views.Chat.textSend": "Enviar",
"Common.Views.Comments.textAdd": "Añadir", "Common.Views.Comments.textAdd": "Añadir",
"Common.Views.Comments.textAddComment": "Añadir comentario", "Common.Views.Comments.textAddComment": "Añadir",
"Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento", "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento",
"Common.Views.Comments.textAddReply": "Añadir respuesta", "Common.Views.Comments.textAddReply": "Añadir respuesta",
"Common.Views.Comments.textAnonym": "Visitante", "Common.Views.Comments.textAnonym": "Visitante",

18
apps/spreadsheeteditor/main/locale/fr.json
View file

@ -8,9 +8,9 @@
"Common.UI.ComboDataView.emptyComboText": "Aucun style", "Common.UI.ComboDataView.emptyComboText": "Aucun style",
"Common.UI.ExtendedColorDialog.addButtonText": "Ajouter", "Common.UI.ExtendedColorDialog.addButtonText": "Ajouter",
"Common.UI.ExtendedColorDialog.cancelButtonText": "Annuler", "Common.UI.ExtendedColorDialog.cancelButtonText": "Annuler",
"Common.UI.ExtendedColorDialog.textCurrent": "Actuel", "Common.UI.ExtendedColorDialog.textCurrent": "Actuelle",
"Common.UI.ExtendedColorDialog.textHexErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 000000 à FFFFFF.", "Common.UI.ExtendedColorDialog.textHexErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 000000 à FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Nouveau", "Common.UI.ExtendedColorDialog.textNew": "Nouvelle",
"Common.UI.ExtendedColorDialog.textRGBErr": "La valeur saisie est incorrecte. <br>Entrez une valeur numérique de 0 à 255.", "Common.UI.ExtendedColorDialog.textRGBErr": "La valeur saisie est incorrecte. <br>Entrez une valeur numérique de 0 à 255.",
"Common.UI.HSBColorPicker.textNoColor": "Pas de couleur", "Common.UI.HSBColorPicker.textNoColor": "Pas de couleur",
"Common.UI.SearchDialog.textHighlight": "Surligner les résultats", "Common.UI.SearchDialog.textHighlight": "Surligner les résultats",
@ -51,8 +51,8 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Envoyer", "Common.Views.Chat.textSend": "Envoyer",
"Common.Views.Comments.textAdd": "Ajouter", "Common.Views.Comments.textAdd": "Ajouter",
"Common.Views.Comments.textAddComment": "Ajouter un commentaire", "Common.Views.Comments.textAddComment": "Ajouter",
"Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au Document", "Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au document",
"Common.Views.Comments.textAddReply": "Ajouter une réponse", "Common.Views.Comments.textAddReply": "Ajouter une réponse",
"Common.Views.Comments.textAnonym": "Invité", "Common.Views.Comments.textAnonym": "Invité",
"Common.Views.Comments.textCancel": "Annuler", "Common.Views.Comments.textCancel": "Annuler",
@ -891,7 +891,7 @@
"SSE.Views.DocumentHolder.textFreezePanes": "Verrouiller les volets", "SSE.Views.DocumentHolder.textFreezePanes": "Verrouiller les volets",
"SSE.Views.DocumentHolder.textUnFreezePanes": "Dégager les volets", "SSE.Views.DocumentHolder.textUnFreezePanes": "Dégager les volets",
"SSE.Views.DocumentHolder.topCellText": "Aligner en haut", "SSE.Views.DocumentHolder.topCellText": "Aligner en haut",
"SSE.Views.DocumentHolder.txtAddComment": "Ajouter un commentaire", "SSE.Views.DocumentHolder.txtAddComment": "Ajouter commentaire",
"SSE.Views.DocumentHolder.txtAddNamedRange": "Définir un nom", "SSE.Views.DocumentHolder.txtAddNamedRange": "Définir un nom",
"SSE.Views.DocumentHolder.txtArrange": "Organiser", "SSE.Views.DocumentHolder.txtArrange": "Organiser",
"SSE.Views.DocumentHolder.txtAscending": "Croissant", "SSE.Views.DocumentHolder.txtAscending": "Croissant",
@ -1124,13 +1124,13 @@
"SSE.Views.NameManagerDlg.textDataRange": "Plage de données", "SSE.Views.NameManagerDlg.textDataRange": "Plage de données",
"SSE.Views.NameManagerDlg.textDelete": "Supprimer", "SSE.Views.NameManagerDlg.textDelete": "Supprimer",
"SSE.Views.NameManagerDlg.textEdit": "Modifier", "SSE.Views.NameManagerDlg.textEdit": "Modifier",
"SSE.Views.NameManagerDlg.textEmpty": "No named ranges have been created yet.<br>Create at least one named range and it will appear in this field.", "SSE.Views.NameManagerDlg.textEmpty": "Aucune plage nommée n’a encore été créée.<br>Créez au moins une plage nommée et elle va apparaître dans ce champ.",
"SSE.Views.NameManagerDlg.textFilter": "Filtre", "SSE.Views.NameManagerDlg.textFilter": "Filtre",
"SSE.Views.NameManagerDlg.textFilterAll": "Tout", "SSE.Views.NameManagerDlg.textFilterAll": "Tout",
"SSE.Views.NameManagerDlg.textFilterDefNames": "Les noms définis", "SSE.Views.NameManagerDlg.textFilterDefNames": "Les noms définis",
"SSE.Views.NameManagerDlg.textFilterSheet": "Les noms sont attachés à la feuille", "SSE.Views.NameManagerDlg.textFilterSheet": "Noms inclus dans l'étendue de la feuille",
"SSE.Views.NameManagerDlg.textFilterTableNames": "Table names", "SSE.Views.NameManagerDlg.textFilterTableNames": "Table names",
"SSE.Views.NameManagerDlg.textFilterWorkbook": "Les noms sont attachés àu classeur", "SSE.Views.NameManagerDlg.textFilterWorkbook": "Noms inclus dans l'étendue du classeur",
"SSE.Views.NameManagerDlg.textNew": "Nouveau", "SSE.Views.NameManagerDlg.textNew": "Nouveau",
"SSE.Views.NameManagerDlg.textnoNames": "Pas de plages nommées correspondant à votre filtre n'a pu être trouvée.", "SSE.Views.NameManagerDlg.textnoNames": "Pas de plages nommées correspondant à votre filtre n'a pu être trouvée.",
"SSE.Views.NameManagerDlg.textRanges": "Plages nommées", "SSE.Views.NameManagerDlg.textRanges": "Plages nommées",
@ -1362,7 +1362,7 @@
"SSE.Views.TextArtSettings.strForeground": "Couleur de premier plan", "SSE.Views.TextArtSettings.strForeground": "Couleur de premier plan",
"SSE.Views.TextArtSettings.strPattern": "Modèle", "SSE.Views.TextArtSettings.strPattern": "Modèle",
"SSE.Views.TextArtSettings.strSize": "Taille", "SSE.Views.TextArtSettings.strSize": "Taille",
"SSE.Views.TextArtSettings.strStroke": "Stroke", "SSE.Views.TextArtSettings.strStroke": "Trait",
"SSE.Views.TextArtSettings.strTransparency": "Opacité", "SSE.Views.TextArtSettings.strTransparency": "Opacité",
"SSE.Views.TextArtSettings.strType": "Type", "SSE.Views.TextArtSettings.strType": "Type",
"SSE.Views.TextArtSettings.textBorderSizeErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 0 à 1584 points.", "SSE.Views.TextArtSettings.textBorderSizeErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 0 à 1584 points.",

2
apps/spreadsheeteditor/main/locale/lv.json
View file

@ -46,7 +46,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Sūtīt", "Common.Views.Chat.textSend": "Sūtīt",
"Common.Views.Comments.textAdd": "Pievienot", "Common.Views.Comments.textAdd": "Pievienot",
"Common.Views.Comments.textAddComment": "Pievienot komentāru", "Common.Views.Comments.textAddComment": "Pievienot",
"Common.Views.Comments.textAddCommentToDoc": "Pievienot komentāru dokumentam", "Common.Views.Comments.textAddCommentToDoc": "Pievienot komentāru dokumentam",
"Common.Views.Comments.textAddReply": "Pievienot atbildi", "Common.Views.Comments.textAddReply": "Pievienot atbildi",
"Common.Views.Comments.textAnonym": "Viesis", "Common.Views.Comments.textAnonym": "Viesis",

2
apps/spreadsheeteditor/main/locale/pt.json
View file

@ -46,7 +46,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Enviar", "Common.Views.Chat.textSend": "Enviar",
"Common.Views.Comments.textAdd": "Adicionar", "Common.Views.Comments.textAdd": "Adicionar",
"Common.Views.Comments.textAddComment": "Adicionar comentário", "Common.Views.Comments.textAddComment": "Adicionar",
"Common.Views.Comments.textAddCommentToDoc": "Adicionar comentário ao documento", "Common.Views.Comments.textAddCommentToDoc": "Adicionar comentário ao documento",
"Common.Views.Comments.textAddReply": "Adicionar resposta", "Common.Views.Comments.textAddReply": "Adicionar resposta",
"Common.Views.Comments.textAnonym": "Visitante", "Common.Views.Comments.textAnonym": "Visitante",

2
apps/spreadsheeteditor/main/locale/sl.json
View file

@ -46,7 +46,7 @@
"Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Pošlji", "Common.Views.Chat.textSend": "Pošlji",
"Common.Views.Comments.textAdd": "Dodaj", "Common.Views.Comments.textAdd": "Dodaj",
"Common.Views.Comments.textAddComment": "Dodaj komentar", "Common.Views.Comments.textAddComment": "Dodaj",
"Common.Views.Comments.textAddCommentToDoc": "K dokumentu dodaj komentar", "Common.Views.Comments.textAddCommentToDoc": "K dokumentu dodaj komentar",
"Common.Views.Comments.textAddReply": "Dodaj odgovor", "Common.Views.Comments.textAddReply": "Dodaj odgovor",
"Common.Views.Comments.textAnonym": "Gost", "Common.Views.Comments.textAnonym": "Gost",