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

Merge branch 'develop' into feature/new-toolbar-pivot-table

Browse source
This commit is contained in:
Julia Radzhabova 2017-08-30 15:12:25 +03:00
parent 0a1d11cd18 fe462bd08b
commit 876eb58f8b
55 changed files with 392 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,7 +225,7 @@ define([
var win_width = (this.initConfig.width=='auto') ? parseInt(this.$window.find('.body').css('width')) : this.initConfig.width;
var top = Math.floor(((parseInt(main_height) - parseInt(win_height)) / 2) * 0.9);
var top = Math.floor((parseInt(main_height) - parseInt(win_height)) / 2);
var left = Math.floor((parseInt(main_width) - parseInt(win_width)) / 2);
this.$window.css('left',left);

49
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -75,6 +75,7 @@ define([
'reviewchange:reject': _.bind(this.onRejectClick, this),
'reviewchange:delete': _.bind(this.onDeleteClick, this),
'reviewchange:preview': _.bind(this.onBtnPreviewClick, this),
'reviewchanges:view': _.bind(this.onReviewViewClick, this),
'lang:document': _.bind(this.onDocLanguage, this)
},
'Common.Views.ReviewChangesDialog': {
@ -88,7 +89,7 @@ define([
this.collection = this.getApplication().getCollection('Common.Collections.ReviewChanges');
this.userCollection = this.getApplication().getCollection('Common.Collections.Users');
this._state = {posx: -1000, posy: -1000, popoverVisible: false};
this._state = {posx: -1000, posy: -1000, popoverVisible: false, previewMode: false};
Common.NotificationCenter.on('reviewchanges:turn', this.onTurnPreview.bind(this));
Common.NotificationCenter.on('spelling:turn', this.onTurnSpelling.bind(this));
@ -127,10 +128,10 @@ define([
return this;
},
SetDisabled: function() {
SetDisabled: function(state) {
if (this.dlgChanges)
this.dlgChanges.close();
this.view && this.view.SetDisabled(true);
this.view && this.view.SetDisabled(state);
},
onApiShowChange: function (sdkchange) {
@ -500,6 +501,46 @@ define([
this.api.asc_setSpellCheck(state);
},
onReviewViewClick: function(menu, item, e) {
if (this.api) {
if (item.value === 'final')
this.api.asc_BeginViewModeInReview(true);
else if (item.value === 'original')
this.api.asc_BeginViewModeInReview(false);
else
this.api.asc_EndViewModeInReview();
}
this.disableEditing(item.value !== 'markup');
this._state.previewMode = (item.value !== 'markup');
Common.NotificationCenter.trigger('edit:complete', this.view);
},
isPreviewChangesMode: function() {
return this._state.previewMode;
},
disableEditing: function(disable) {
var app = this.getApplication();
app.getController('RightMenu').getView('RightMenu').clearSelection();
app.getController('Toolbar').DisableToolbar(disable, false, true);
app.getController('RightMenu').SetDisabled(disable, false);
app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
app.getController('DocumentHolder').getView().SetDisabled(disable);
var leftMenu = app.getController('LeftMenu').leftMenu;
leftMenu.btnComments.setDisabled(disable);
if (disable) leftMenu.close();
if (this.view) {
var group = this.view.$el.find('.move-changes');
group.css('position', disable ? 'relative' : 'initial');
disable && group.find('.toolbar-group-mask').css({
left: 0, right: 0, top: 0, bottom: 0
});
this.view.$el.find('.no-group-mask').css('opacity', 1);
}
},
createToolbarPanel: function() {
return this.view.getPanel();
},
@ -553,7 +594,7 @@ define([
},
synchronizeChanges: function() {
if ( this.appConfig.canReview ) {
if ( this.appConfig && this.appConfig.canReview ) {
this.view.markChanges( this.api.asc_HaveRevisionsChanges() );
}
},

2
apps/common/main/lib/view/ExternalDiagramEditor.js
View file

@ -134,7 +134,7 @@ define([
this.$window.find('> .body').css('height', height-header_height);
this.$window.find('> .body > .box').css('height', height-85);
var top = ((Common.Utils.innerHeight() - parseInt(height)) / 2) * 0.9;
var top = (Common.Utils.innerHeight() - parseInt(height)) / 2;
var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
this.$window.css('left',left);

2
apps/common/main/lib/view/ExternalMergeEditor.js
View file

@ -134,7 +134,7 @@ define([
this.$window.find('> .body').css('height', height-header_height);
this.$window.find('> .body > .box').css('height', height-85);
var top = ((Common.Utils.innerHeight() - parseInt(height)) / 2) * 0.9;
var top = (Common.Utils.innerHeight() - parseInt(height)) / 2;
var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
this.$window.css('left',left);

2
apps/common/main/lib/view/Header.js
View file

@ -222,6 +222,8 @@ define([
// newDocumentPage && newDocumentPage.focus();
});
onResetUsers(storeUsers);
$panelUsers.on('shown.bs.dropdown', function () {
$userList.scroller && $userList.scroller.update({minScrollbarLength: 40, alwaysVisibleY: true});
});

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

@ -422,7 +422,7 @@ define([
Common.UI.Window.prototype.setWidth.call(this, width + borders_width);
this.$window.css('left',(maxWidth - width - borders_width) / 2);
this.$window.css('top',((maxHeight - height - this._headerFooterHeight) / 2));
this.$window.css('top',(maxHeight - height - this._headerFooterHeight) / 2);
},
onWindowResize: function() {

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

@ -423,6 +423,12 @@ define([
'<div class="separator long review"/>' +
'<div class="group">' +
'<span id="btn-review-on" class="btn-slot text x-huge"></span>' +
'</div>' +
'<div class="group no-group-mask" style="padding-left: 0;">' +
'<span id="btn-review-view" class="btn-slot text x-huge"></span>' +
'</div>' +
'<div class="separator long review"/>' +
'<div class="group move-changes">' +
'<span id="btn-change-prev" class="btn-slot text x-huge"></span>' +
'<span id="btn-change-next" class="btn-slot text x-huge"></span>' +
'<span id="btn-change-accept" class="btn-slot text x-huge"></span>' +
@ -468,6 +474,10 @@ define([
button.on('click', _click_turnpreview.bind(me));
Common.NotificationCenter.trigger('edit:complete', me);
});
this.btnReviewView.menu.on('item:click', function (menu, item, e) {
me.fireEvent('reviewchanges:view', [menu, item]);
});
}
this.btnsSpelling.forEach(function(button) {
@ -528,6 +538,13 @@ define([
enableToggle: true
});
this.btnsTurnReview = [this.btnTurnOn];
this.btnReviewView = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-ic-reviewview',
caption: this.txtView,
menu: true
});
}
this.btnSetSpelling = new Common.UI.Button({
@ -597,6 +614,35 @@ define([
);
me.btnReject.updateHint([me.txtRejectCurrent, me.txtRejectChanges]);
me.btnReviewView.setMenu(
new Common.UI.Menu({
cls: 'ppm-toolbar',
items: [
{
caption: me.txtMarkup,
checkable: true,
toggleGroup: 'menuReviewView',
checked: true,
value: 'markup'
},
{
caption: me.txtFinal,
checkable: true,
toggleGroup: 'menuReviewView',
checked: false,
value: 'final'
},
{
caption: me.txtOriginal,
checkable: true,
toggleGroup: 'menuReviewView',
checked: false,
value: 'original'
}
]
}));
me.btnReviewView.updateHint(me.tipReviewView);
me.btnAccept.setDisabled(config.isReviewOnly);
me.btnReject.setDisabled(config.isReviewOnly);
} else {
@ -627,6 +673,7 @@ define([
this.btnAccept.render(this.$el.find('#btn-change-accept'));
this.btnReject.render(this.$el.find('#btn-change-reject'));
this.btnTurnOn.render(this.$el.find('#btn-review-on'));
this.btnReviewView.render(this.$el.find('#btn-review-view'));
}
this.btnSetSpelling.render(this.$el.find('#slot-btn-spelling'));
@ -739,7 +786,12 @@ define([
tipSetSpelling: 'Spell checking',
tipReview: 'Review',
txtAcceptChanges: 'Accept Changes',
txtRejectChanges: 'Reject Changes'
txtRejectChanges: 'Reject Changes',
txtView: 'Display Mode',
txtMarkup: 'All changes (Editing)',
txtFinal: 'All changes accepted (Preview)',
txtOriginal: 'All changes rejected (Preview)',
tipReviewView: 'Select the way you want the changes to be displayed'
}
}()), Common.Views.ReviewChanges || {}));

BIN
apps/common/main/resources/img/controls/toolbarbig.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
apps/common/main/resources/img/controls/toolbarbig@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

1
apps/common/main/resources/less/comments.less
View file

@ -86,6 +86,7 @@
border: 1px solid @gray-dark;
word-break: break-all;
line-height: 15px;
color: @gray-deep;
}
.btn-fix {

1
apps/common/main/resources/less/toolbar.less
View file

@ -277,6 +277,7 @@
.button-normal-icon(btn-addslide, 11, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-docspell', 12, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-review', 13, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-ic-reviewview', 30, @toolbar-big-icon-size);
.button-normal-icon(review-save, 14, @toolbar-big-icon-size);
.button-normal-icon(review-deny, 15, @toolbar-big-icon-size);
.button-normal-icon(review-next, 16, @toolbar-big-icon-size);

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

@ -607,7 +607,8 @@ define([
action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
action ? this.setLongActionView(action) : this.loadMask && this.loadMask.hide();
if ((id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && (!this._state.fastCoauth || this._state.usersCount<2))
if ((id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && (!this._state.fastCoauth || this._state.usersCount<2 ||
this.getApplication().getController('Common.Controllers.ReviewChanges').isPreviewChangesMode()))
this.synchronizeChanges();
if ( type == Asc.c_oAscAsyncActionType.BlockInteraction &&
@ -1057,6 +1058,8 @@ define([
this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
},
applyModeEditorElements: function() {
@ -1118,8 +1121,6 @@ define([
/** coauthoring begin **/
me.api.asc_registerCallback('asc_onCollaborativeChanges', _.bind(me.onCollaborativeChanges, me));
me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me));
me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
/** coauthoring end **/
if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) {
@ -1306,6 +1307,20 @@ define([
this.api.asc_DownloadAs();
else
(this.appOptions.canDownload) ? this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas') : this.api.asc_DownloadOrigin();
} else if (id == Asc.c_oAscError.ID.SplitCellMaxRows || id == Asc.c_oAscError.ID.SplitCellMaxCols || id == Asc.c_oAscError.ID.SplitCellRowsDivider) {
var me = this;
setTimeout(function(){
(new Common.Views.InsertTableDialog({
split: true,
handler: function(result, value) {
if (result == 'ok') {
if (me.api)
me.api.SplitCell(value.columns, value.rows);
}
me.onEditComplete();
}
})).show();
},10);
}
this._state.lostEditingRights = false;
this.onEditComplete();
@ -1760,7 +1775,7 @@ define([
Common.localStorage.setItem("de-settings-showchanges-strict", 'last');
this.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.LastChanges);
}
this.fireEvent('editcomplete', this);
this.onEditComplete();
}, this)
});
},

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

@ -114,14 +114,17 @@ define([
'menu:show': this.onFileMenu.bind(this, 'show')
},
'Common.Views.Header': {
'print': this.onPrint.bind(this),
'print': function (opts) {
var _main = this.getApplication().getController('Main');
_main.onPrint();
},
'downloadas': function (opts) {
var _main = this.getApplication().getController('Main');
var _file_type = _main.document.fileType,
_format;
if ( !!_file_type ) {
if ( /^pdf|xps|djvu/i.test(_file_type) ) {
this.api.asc_DownloadOrigin();
_main.api.asc_DownloadOrigin();
return;
} else {
_format = Asc.c_oAscFileType[ _file_type.toUpperCase() ];
@ -1363,9 +1366,9 @@ define([
me.api.put_Table(value.columns, value.rows);
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Table');
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
})).show();
}
@ -2749,23 +2752,30 @@ define([
this.editMode = false;
},
DisableToolbar: function(disable, viewMode) {
DisableToolbar: function(disable, viewMode, reviewmode) {
if (viewMode!==undefined) this.editMode = !viewMode;
disable = disable || !this.editMode;
var mask = $('.toolbar-mask');
var toolbar_mask = $('.toolbar-mask'),
group_mask = $('.toolbar-group-mask'),
mask = reviewmode ? group_mask : toolbar_mask;
if (disable && mask.length>0 || !disable && mask.length==0) return;
var toolbar = this.toolbar;
toolbar.$el.find('.toolbar').toggleClass('masked', disable);
toolbar.btnHide.setDisabled(disable);
if(disable) {
mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar'));
Common.util.Shortcuts.suspendEvents('alt+h');
if (reviewmode) {
mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask)'));
} else
mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar'));
} else {
mask.remove();
Common.util.Shortcuts.resumeEvents('alt+h');
}
$('.no-group-mask').css('opacity', (reviewmode || !disable) ? 1 : 0.4);
disable = disable || (reviewmode ? toolbar_mask.length>0 : group_mask.length>0);
toolbar.$el.find('.toolbar').toggleClass('masked', disable);
toolbar.btnHide.setDisabled(disable);
disable ? Common.util.Shortcuts.suspendEvents('alt+h') : Common.util.Shortcuts.resumeEvents('alt+h');
if ( toolbar.synchTooltip )
toolbar.synchTooltip.hide();

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

@ -79,6 +79,7 @@ define([
me.fastcoauthtips = [];
me._currentMathObj = undefined;
me._currentParaObjDisabled = false;
me._isDisabled = false;
var showPopupMenu = function(menu, value, event, docElement, eOpts){
if (!_.isUndefined(menu) && menu !== null){
@ -188,6 +189,9 @@ define([
var fillViewMenuProps = function(selectedElements) {
if (!selectedElements || !_.isArray(selectedElements)) return;
if (!me.viewModeMenu)
me.createDelayedElementsViewer();
var menu_props = {},
menu_to_show = me.viewModeMenu,
noobject = true;
@ -212,7 +216,7 @@ define([
var showObjectMenu = function(event, docElement, eOpts){
if (me.api){
var obj = (me.mode.isEdit) ? fillMenuProps(me.api.getSelectedElements()) : fillViewMenuProps(me.api.getSelectedElements());
var obj = (me.mode.isEdit && !me._isDisabled) ? fillMenuProps(me.api.getSelectedElements()) : fillViewMenuProps(me.api.getSelectedElements());
if (obj) showPopupMenu(obj.menu_to_show, obj.menu_props, event, docElement, eOpts);
}
};
@ -229,7 +233,7 @@ define([
var onFocusObject = function(selectedElements) {
if (me.currentMenu && me.currentMenu.isVisible() && me.currentMenu !== me.hdrMenu){
var obj = (me.mode.isEdit) ? fillMenuProps(selectedElements) : fillViewMenuProps(selectedElements);
var obj = (me.mode.isEdit && !me._isDisabled) ? fillMenuProps(selectedElements) : fillViewMenuProps(selectedElements);
if (obj) {
if (obj.menu_to_show===me.currentMenu) {
me.currentMenu.options.initMenu(obj.menu_props);
@ -659,7 +663,7 @@ define([
var onDialogAddHyperlink = function() {
var win, props, text;
if (me.api && me.mode.isEdit){
if (me.api && me.mode.isEdit && !me._isDisabled){
var handlerDlg = function(dlg, result) {
if (result == 'ok') {
props = dlg.getSettings();
@ -706,7 +710,7 @@ define([
};
var onDoubleClickOnChart = function(chart) {
if (me.mode.isEdit) {
if (me.mode.isEdit && !me._isDisabled) {
var diagramEditor = DE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor');
if (diagramEditor && chart) {
diagramEditor.setEditMode(true);
@ -1814,10 +1818,10 @@ define([
initMenu: function (value) {
var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties()));
menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments);
menuViewUndo.setDisabled(!me.api.asc_getCanUndo());
menuViewCopySeparator.setVisible(!isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments);
menuViewAddComment.setVisible(!isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments);
menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
menuViewUndo.setDisabled(!me.api.asc_getCanUndo() && !me._isDisabled);
menuViewCopySeparator.setVisible(!isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
menuViewAddComment.setVisible(!isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
menuViewAddComment.setDisabled(value.paraProps && value.paraProps.locked === true);
var cancopy = me.api && me.api.can_CopyCut();
@ -2314,10 +2318,9 @@ define([
if (me.api) {
me.api.SplitCell(value.columns, value.rows);
}
me.fireEvent('editcomplete', me);
Common.component.Analytics.trackEvent('DocumentHolder', 'Table');
}
me.fireEvent('editcomplete', me);
}
})).show();
}
@ -3299,6 +3302,10 @@ define([
_.defer(function(){ me.cmpEl.focus(); }, 50);
},
SetDisabled: function(state) {
this._isDisabled = state;
},
alignmentText : 'Alignment',
leftText : 'Left',
rightText : 'Right',

3
apps/documenteditor/main/app/view/ImageSettings.js
View file

@ -173,8 +173,11 @@ define([
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this._isFromFile) return;
this._isFromFile = true;
if (this.api) this.api.ChangeImageFromFile();
this.fireEvent('editcomplete', this);
this._isFromFile = false;
}, this));
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
this.btnEditObject.on('click', _.bind(function(btn){

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

@ -1201,7 +1201,7 @@ define([
this.fillControls.push(this.btnInsertFromUrl);
this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this.api) this.api.ChangeShapeImageFromFile();
if (this.api) this.api.ChangeShapeImageFromFile(this.BlipFillType);
this.fireEvent('editcomplete', this);
}, this));
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));

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

@ -243,8 +243,8 @@ define([
if (me.api) {
me.api.SplitCell(value.columns, value.rows);
}
me.fireEvent('editcomplete', me);
}
me.fireEvent('editcomplete', me);
}
})).show();
},

19
apps/documenteditor/main/locale/en.json
View file

@ -195,6 +195,7 @@
"Common.Views.ReviewChanges.hintNext": "To Next Change",
"Common.Views.ReviewChanges.hintPrev": "To Previous Change",
"Common.Views.ReviewChanges.tipReview": "Track Changes",
"Common.Views.ReviewChanges.tipReviewView": "Select the mode you want the changes to be displayed",
"Common.Views.ReviewChanges.tipSetDocLang": "Set Document Language",
"Common.Views.ReviewChanges.tipSetSpelling": "Spell checking",
"Common.Views.ReviewChanges.txtAccept": "Accept",
@ -203,7 +204,10 @@
"Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change",
"Common.Views.ReviewChanges.txtClose": "Close",
"Common.Views.ReviewChanges.txtDocLang": "Language",
"Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)",
"Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)",
"Common.Views.ReviewChanges.txtNext": "Next",
"Common.Views.ReviewChanges.txtOriginal": "All changes rejected (Preview)",
"Common.Views.ReviewChanges.txtPrev": "Previous",
"Common.Views.ReviewChanges.txtReject": "Reject",
"Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes",
@ -211,6 +215,7 @@
"Common.Views.ReviewChanges.txtRejectCurrent": "Reject Current Change",
"Common.Views.ReviewChanges.txtSpelling": "Spell checking",
"Common.Views.ReviewChanges.txtTurnon": "Track Changes",
"Common.Views.ReviewChanges.txtView": "Display Mode",
"Common.Views.ReviewChangesDialog.textTitle": "Review Changes",
"Common.Views.ReviewChangesDialog.txtAccept": "Accept",
"Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept All Changes",
@ -793,8 +798,8 @@
"DE.Views.DocumentHolder.textAlign": "Align",
"DE.Views.DocumentHolder.textArrange": "Arrange",
"DE.Views.DocumentHolder.textArrangeBack": "Send to Background",
"DE.Views.DocumentHolder.textArrangeBackward": "Move Backward",
"DE.Views.DocumentHolder.textArrangeForward": "Move Forward",
"DE.Views.DocumentHolder.textArrangeBackward": "Send Backward",
"DE.Views.DocumentHolder.textArrangeForward": "Bring Forward",
"DE.Views.DocumentHolder.textArrangeFront": "Bring to Foreground",
"DE.Views.DocumentHolder.textCopy": "Copy",
"DE.Views.DocumentHolder.textCut": "Cut",
@ -1352,7 +1357,7 @@
"DE.Views.Statusbar.tipFitPage": "Fit to Page",
"DE.Views.Statusbar.tipFitWidth": "Fit to Width",
"DE.Views.Statusbar.tipSetLang": "Set Text Language",
"DE.Views.Statusbar.tipZoomFactor": "Magnification",
"DE.Views.Statusbar.tipZoomFactor": "Zoom",
"DE.Views.Statusbar.tipZoomIn": "Zoom In",
"DE.Views.Statusbar.tipZoomOut": "Zoom Out",
"DE.Views.Statusbar.txtPageNumInvalid": "Page number invalid",
@ -1504,6 +1509,7 @@
"DE.Views.TextArtSettings.textTransform": "Transform",
"DE.Views.TextArtSettings.txtNoBorders": "No Line",
"DE.Views.Toolbar.capBtnColumns": "Columns",
"DE.Views.Toolbar.capBtnComment": "Comment",
"DE.Views.Toolbar.capBtnInsChart": "Chart",
"DE.Views.Toolbar.capBtnInsDropcap": "Drop Cap",
"DE.Views.Toolbar.capBtnInsEquation": "Equation",
@ -1520,11 +1526,10 @@
"DE.Views.Toolbar.capBtnPageOrient": "Orientation",
"DE.Views.Toolbar.capBtnPageSize": "Size",
"DE.Views.Toolbar.capImgAlign": "Align",
"DE.Views.Toolbar.capImgBackward": "Move backward",
"DE.Views.Toolbar.capImgForward": "Move forward",
"DE.Views.Toolbar.capImgBackward": "Send backward",
"DE.Views.Toolbar.capImgForward": "Bring forward",
"DE.Views.Toolbar.capImgGroup": "Group",
"DE.Views.Toolbar.capImgWrapping": "Wrapping",
"DE.Views.Toolbar.capBtnComment": "Comment",
"DE.Views.Toolbar.mniCustomTable": "Insert Custom Table",
"DE.Views.Toolbar.mniDelFootnote": "Delete All Footnotes",
"DE.Views.Toolbar.mniEditDropCap": "Drop Cap Settings",
@ -1660,7 +1665,7 @@
"DE.Views.Toolbar.tipSave": "Save",
"DE.Views.Toolbar.tipSaveCoauth": "Save your changes for the other users to see them.",
"DE.Views.Toolbar.tipSendBackward": "Send backward",
"DE.Views.Toolbar.tipSendForward": "Send forward",
"DE.Views.Toolbar.tipSendForward": "Bring forward",
"DE.Views.Toolbar.tipShowHiddenChars": "Nonprinting Characters",
"DE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.",
"DE.Views.Toolbar.tipUndo": "Undo",

19
apps/documenteditor/main/locale/ru.json
View file

@ -195,6 +195,7 @@
"Common.Views.ReviewChanges.hintNext": "К следующему изменению",
"Common.Views.ReviewChanges.hintPrev": "К предыдущему изменению",
"Common.Views.ReviewChanges.tipReview": "Отслеживать изменения",
"Common.Views.ReviewChanges.tipReviewView": "Выберите режим, в котором вы хотите отображать изменения",
"Common.Views.ReviewChanges.tipSetDocLang": "Задать язык документа",
"Common.Views.ReviewChanges.tipSetSpelling": "Проверка орфографии",
"Common.Views.ReviewChanges.txtAccept": "Принять",
@ -203,14 +204,18 @@
"Common.Views.ReviewChanges.txtAcceptCurrent": "Принять текущее изменение",
"Common.Views.ReviewChanges.txtClose": "Закрыть",
"Common.Views.ReviewChanges.txtDocLang": "Язык",
"Common.Views.ReviewChanges.txtNext": "Далее",
"Common.Views.ReviewChanges.txtPrev": "Назад",
"Common.Views.ReviewChanges.txtFinal": "Все изменения приняты (просмотр)",
"Common.Views.ReviewChanges.txtMarkup": "Все изменения (редактирование)",
"Common.Views.ReviewChanges.txtNext": "К следующему",
"Common.Views.ReviewChanges.txtOriginal": "Все изменения отклонены (просмотр)",
"Common.Views.ReviewChanges.txtPrev": "К предыдущему",
"Common.Views.ReviewChanges.txtReject": "Отклонить",
"Common.Views.ReviewChanges.txtRejectAll": "Отклонить все изменения",
"Common.Views.ReviewChanges.txtRejectChanges": "Отклонить изменения",
"Common.Views.ReviewChanges.txtRejectCurrent": "Отклонить текущее изменение",
"Common.Views.ReviewChanges.txtSpelling": "Проверка орфографии",
"Common.Views.ReviewChanges.txtTurnon": "Исправления",
"Common.Views.ReviewChanges.txtTurnon": "Отслеживание изменений",
"Common.Views.ReviewChanges.txtView": "Отображение",
"Common.Views.ReviewChangesDialog.textTitle": "Просмотр изменений",
"Common.Views.ReviewChangesDialog.txtAccept": "Принять",
"Common.Views.ReviewChangesDialog.txtAcceptAll": "Принять все изменения",
@ -792,10 +797,10 @@
"DE.Views.DocumentHolder.tableText": "Таблицу",
"DE.Views.DocumentHolder.textAlign": "Выравнивание",
"DE.Views.DocumentHolder.textArrange": "Порядок",
"DE.Views.DocumentHolder.textArrangeBack": "Переместить на задний план",
"DE.Views.DocumentHolder.textArrangeBack": "Перенести на задний план",
"DE.Views.DocumentHolder.textArrangeBackward": "Перенести назад",
"DE.Views.DocumentHolder.textArrangeForward": "Перенести вперед",
"DE.Views.DocumentHolder.textArrangeFront": "Вынести на передний план",
"DE.Views.DocumentHolder.textArrangeFront": "Перенести на передний план",
"DE.Views.DocumentHolder.textCopy": "Копировать",
"DE.Views.DocumentHolder.textCut": "Вырезать",
"DE.Views.DocumentHolder.textEditWrapBoundary": "Изменить границу обтекания",
@ -1659,8 +1664,8 @@
"DE.Views.Toolbar.tipRedo": "Повторить",
"DE.Views.Toolbar.tipSave": "Сохранить",
"DE.Views.Toolbar.tipSaveCoauth": "Сохраните свои изменения, чтобы другие пользователи их увидели.",
"DE.Views.Toolbar.tipSendBackward": "Переместить назад",
"DE.Views.Toolbar.tipSendForward": "Переместить вперед",
"DE.Views.Toolbar.tipSendBackward": "Перенести назад",
"DE.Views.Toolbar.tipSendForward": "Перенести вперед",
"DE.Views.Toolbar.tipShowHiddenChars": "Непечатаемые символы",
"DE.Views.Toolbar.tipSynchronize": "Документ изменен другим пользователем. Нажмите, чтобы сохранить свои изменения и загрузить обновления.",
"DE.Views.Toolbar.tipUndo": "Отменить",

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

@ -41,6 +41,17 @@
z-index: @zindex-tooltip + 1;
}
.toolbar-group-mask {
position: absolute;
top: 32px;
left: 48px;
right: 45px;
bottom: 0;
opacity: 0;
background-color: @gray-light;
z-index: @zindex-tooltip + 1;
}
.item-markerlist {
.background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px);
width: 38px;

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

@ -1061,6 +1061,20 @@ define([
if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) {
Common.UI.Menu.Manager.hideAll();
(this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.api.asc_DownloadAs() : this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas');
} else if (id == Asc.c_oAscError.ID.SplitCellMaxRows || id == Asc.c_oAscError.ID.SplitCellMaxCols || id == Asc.c_oAscError.ID.SplitCellRowsDivider) {
var me = this;
setTimeout(function(){
(new Common.Views.InsertTableDialog({
split: true,
handler: function(result, value) {
if (result == 'ok') {
if (me.api)
me.api.SplitCell(value.columns, value.rows);
}
me.onEditComplete();
}
})).show();
},10);
}
this._state.lostEditingRights = false;
this.onEditComplete();

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

@ -128,7 +128,10 @@ define([
'menu:show': this.onFileMenu.bind(this, 'show')
},
'Common.Views.Header': {
'print': this.onPrint.bind(this),
'print': function (opts) {
var _main = this.getApplication().getController('Main');
_main.onPrint();
},
'downloadas': function (opts) {
var _main = this.getApplication().getController('Main');
var _file_type = _main.document.fileType,
@ -610,7 +613,7 @@ define([
this.toolbar.btnShapeArrange, this.toolbar.btnSlideSize, this.toolbar.listTheme
]});
this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides,
{ array: this.toolbar.btnsInsertImage.concat(this.toolbar.btnsInsertText, this.toolbar.btnsInsertShape) });
{ array: this.toolbar.btnsInsertImage.concat(this.toolbar.btnsInsertText, this.toolbar.btnsInsertShape, this.toolbar.btnInsertEquation, this.toolbar.btnInsertTextArt) });
if (this.btnsComment)
this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array: this.btnsComment });
}
@ -1328,9 +1331,9 @@ define([
me.api.put_Table(value.columns, value.rows);
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Table');
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
})).show();
}

11
apps/presentationeditor/main/app/controller/Viewport.js
View file

@ -178,17 +178,12 @@ define([
me.api.StartDemonstration('presentation-preview', _.isNumber(slidenum) ? slidenum : 0, reporterObject);
Common.component.Analytics.trackEvent('Viewport', 'Preview');
};
if (!me.viewport.mode.isDesktopApp && !Common.Utils.isIE11) {
if (!me.viewport.mode.isDesktopApp && !Common.Utils.isIE11 && !presenter) {
Common.NotificationCenter.on('window:resize', _onWindowResize);
me.fullScreen(document.documentElement);
if (!reporterObject) {
setTimeout(function(){
_onWindowResize();
}, 100);
} else {
setTimeout(function(){
_onWindowResize();
}
}, 100);
} else
_onWindowResize();
}

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

@ -67,7 +67,7 @@
<span class="btn-slot" id="slot-btn-italic"></span>
<span class="btn-slot" id="slot-btn-underline"></span>
<span class="btn-slot" id="slot-btn-strikeout"></span>
<span class="btn-slot" id="slot-btn-fontcolor"></span>
<span class="btn-slot split" id="slot-btn-fontcolor"></span>
<span class="btn-slot" id="slot-btn-superscript"></span>
<span class="btn-slot" id="slot-btn-subscript"></span>
</div>

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

@ -1981,9 +1981,9 @@ define([
if (me.api) {
me.api.SplitCell(value.columns, value.rows);
}
me.fireEvent('editcomplete', me);
Common.component.Analytics.trackEvent('DocumentHolder', 'Table Split');
}
me.fireEvent('editcomplete', me);
}
})).show();
}

7
apps/presentationeditor/main/app/view/DocumentPreview.js
View file

@ -315,6 +315,7 @@ define([
this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onCountSlides, this));
this.api.asc_registerCallback('asc_onEndDemonstration', _.bind(this.onEndDemonstration, this));
this.api.asc_registerCallback('asc_onDemonstrationSlideChanged', _.bind(this.onDemonstrationSlideChanged, this));
this.api.asc_registerCallback('asc_onDemonstrationStatus', _.bind(this.onDemonstrationStatus, this));
this.api.DemonstrationEndShowMessage(this.txtFinalMessage);
}
return this;
@ -352,6 +353,12 @@ define([
this.fullScreenCancel();
},
onDemonstrationStatus: function(status) {
var iconEl = $('.icon', this.btnPlay.cmpEl);
iconEl.toggleClass('btn-pause', status=="play");
this.btnPlay.updateHint((status=="play") ? this.txtPause : this.txtPlay);
},
toggleFullScreen: function() {
if (!document.fullscreenElement && !document.msFullscreenElement &&
!document.mozFullScreenElement && !document.webkitFullscreenElement) {

3
apps/presentationeditor/main/app/view/ImageSettings.js
View file

@ -127,8 +127,11 @@ define([
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this._isFromFile) return;
this._isFromFile = true;
if (this.api) this.api.ChangeImageFromFile();
this.fireEvent('editcomplete', this);
this._isFromFile = false;
}, this));
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
this.btnEditObject.on('click', _.bind(function(btn){

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

@ -1114,7 +1114,7 @@ define([
this.fillControls.push(this.btnInsertFromUrl);
this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this.api) this.api.ChangeShapeImageFromFile();
if (this.api) this.api.ChangeShapeImageFromFile(this.BlipFillType);
this.fireEvent('editcomplete', this);
}, this));
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));

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

@ -655,7 +655,7 @@ define([
el: $('#slide-button-from-file')
});
this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this.api) this.api.ChangeSlideImageFromFile();
if (this.api) this.api.ChangeSlideImageFromFile(this.BlipFillType);
this.fireEvent('editcomplete', this);
}, this));
this.FillItems.push(this.btnInsertFromFile);

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

@ -209,8 +209,8 @@ define([
if (me.api) {
me.api.SplitCell(value.columns, value.rows);
}
me.fireEvent('editcomplete', me);
}
me.fireEvent('editcomplete', me);
}
})).show();
},

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

@ -1104,7 +1104,7 @@ define([
this.lockedControls.push(this.btnInsertFromUrl);
this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this.api) this.api.ChangeArtImageFromFile();
if (this.api) this.api.ChangeArtImageFromFile(this.BlipFillType);
this.fireEvent('editcomplete', this);
}, this));
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));

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

@ -592,6 +592,7 @@ define([
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-textart',
caption: me.capInsertTextArt,
lock : [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
menu: new Common.UI.Menu({
cls: 'menu-shapes',
items: [
@ -599,7 +600,7 @@ define([
]
})
});
me.paragraphControls.push(me.btnInsertTextArt);
me.slideOnlyControls.push(me.btnInsertTextArt);
me.btnColorSchemas = new Common.UI.Button({
id : 'id-toolbar-btn-colorschemas',

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

@ -682,8 +682,8 @@
"PE.Views.DocumentHolder.splitCellTitleText": "Split Cell",
"PE.Views.DocumentHolder.tableText": "Table",
"PE.Views.DocumentHolder.textArrangeBack": "Send to Background",
"PE.Views.DocumentHolder.textArrangeBackward": "Move Backward",
"PE.Views.DocumentHolder.textArrangeForward": "Move Forward",
"PE.Views.DocumentHolder.textArrangeBackward": "Send Backward",
"PE.Views.DocumentHolder.textArrangeForward": "Bring Forward",
"PE.Views.DocumentHolder.textArrangeFront": "Bring To Foreground",
"PE.Views.DocumentHolder.textCopy": "Copy",
"PE.Views.DocumentHolder.textCut": "Cut",
@ -1144,7 +1144,7 @@
"PE.Views.Statusbar.tipSetDocLang": "Set Document Language",
"PE.Views.Statusbar.tipSetLang": "Set Text Language",
"PE.Views.Statusbar.tipSetSpelling": "Spell checking",
"PE.Views.Statusbar.tipZoomFactor": "Magnification",
"PE.Views.Statusbar.tipZoomFactor": "Zoom",
"PE.Views.Statusbar.tipZoomIn": "Zoom In",
"PE.Views.Statusbar.tipZoomOut": "Zoom Out",
"PE.Views.Statusbar.txtPageNumInvalid": "Invalid slide number",
@ -1273,8 +1273,8 @@
"PE.Views.Toolbar.textAlignTop": "Align text to the top",
"PE.Views.Toolbar.textArea": "Area",
"PE.Views.Toolbar.textArrangeBack": "Send to Background",
"PE.Views.Toolbar.textArrangeBackward": "Move Backward",
"PE.Views.Toolbar.textArrangeForward": "Move Forward",
"PE.Views.Toolbar.textArrangeBackward": "Send Backward",
"PE.Views.Toolbar.textArrangeForward": "Bring Forward",
"PE.Views.Toolbar.textArrangeFront": "Bring To Foreground",
"PE.Views.Toolbar.textBar": "Bar",
"PE.Views.Toolbar.textBold": "Bold",

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

@ -681,10 +681,10 @@
"PE.Views.DocumentHolder.splitCellsText": "Разделить ячейку...",
"PE.Views.DocumentHolder.splitCellTitleText": "Разделить ячейку",
"PE.Views.DocumentHolder.tableText": "Таблицу",
"PE.Views.DocumentHolder.textArrangeBack": "Переместить на задний план",
"PE.Views.DocumentHolder.textArrangeBack": "Перенести на задний план",
"PE.Views.DocumentHolder.textArrangeBackward": "Перенести назад",
"PE.Views.DocumentHolder.textArrangeForward": "Перенести вперед",
"PE.Views.DocumentHolder.textArrangeFront": "Вынести на передний план",
"PE.Views.DocumentHolder.textArrangeFront": "Перенести на передний план",
"PE.Views.DocumentHolder.textCopy": "Копировать",
"PE.Views.DocumentHolder.textCut": "Вырезать",
"PE.Views.DocumentHolder.textNextPage": "Следующий слайд",
@ -1272,10 +1272,10 @@
"PE.Views.Toolbar.textAlignRight": "Выравнивание текста по правому краю",
"PE.Views.Toolbar.textAlignTop": "Выравнивание текста по верхнему краю",
"PE.Views.Toolbar.textArea": "С областями",
"PE.Views.Toolbar.textArrangeBack": "Переместить на задний план",
"PE.Views.Toolbar.textArrangeBack": "Перенести на задний план",
"PE.Views.Toolbar.textArrangeBackward": "Перенести назад",
"PE.Views.Toolbar.textArrangeForward": "Перенести вперед",
"PE.Views.Toolbar.textArrangeFront": "Вынести на передний план",
"PE.Views.Toolbar.textArrangeFront": "Перенести на передний план",
"PE.Views.Toolbar.textBar": "Линейчатая",
"PE.Views.Toolbar.textBold": "Жирный",
"PE.Views.Toolbar.textCancel": "Отмена",

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

@ -15,7 +15,7 @@
}
.font-attr {
> .btn-slot:not(:last-child) {
> .btn-slot:not(:last-child):not(.split) {
margin-right: 8px;
}
}

5
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -618,6 +618,11 @@ define([
},
menuFilesShowHide: function(state) {
if (this.api) {
this.api.asc_closeCellEditor();
this.api.asc_enableKeyEvents(!(state == 'show'));
}
if ( this.dlgSearch ) {
if ( state == 'show' )
this.dlgSearch.suspendKeyEvents();

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

@ -80,7 +80,10 @@ define([
'settings:apply': _.bind(this.applyFormulaSettings, this)
},
'Common.Views.Header': {
'print': this.onPrint.bind(this),
'print': function (opts) {
var _main = this.getApplication().getController('Main');
_main.onPrint();
},
'downloadas': function (opts) {
var _main = this.getApplication().getController('Main');
var _file_type = _main.appOptions.spreadsheet.fileType,
@ -255,17 +258,17 @@ define([
toolbar.mnuBorderWidth.on('item:toggle', _.bind(this.onBordersWidth, this));
toolbar.mnuBorderColorPicker.on('select', _.bind(this.onBordersColor, this));
}
toolbar.btnAlignLeft.on('click', _.bind(this.onHorizontalAlign, this, 'left'));
toolbar.btnAlignCenter.on('click', _.bind(this.onHorizontalAlign, this, 'center'));
toolbar.btnAlignRight.on('click', _.bind(this.onHorizontalAlign, this, 'right'));
toolbar.btnAlignJust.on('click', _.bind(this.onHorizontalAlign, this, 'justify'));
toolbar.btnAlignLeft.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Left));
toolbar.btnAlignCenter.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Center));
toolbar.btnAlignRight.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Right));
toolbar.btnAlignJust.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Justify));
toolbar.btnHorizontalAlign.menu.on('item:click', _.bind(this.onHorizontalAlignMenu, this));
toolbar.btnVerticalAlign.menu.on('item:click', _.bind(this.onVerticalAlignMenu, this));
toolbar.btnMerge.on('click', _.bind(this.onMergeCellsMenu, this, toolbar.btnMerge.menu, toolbar.btnMerge.menu.items[0]));
toolbar.btnMerge.menu.on('item:click', _.bind(this.onMergeCellsMenu, this));
toolbar.btnAlignTop.on('click', _.bind(this.onVerticalAlign, this, 'top'));
toolbar.btnAlignMiddle.on('click', _.bind(this.onVerticalAlign, this, 'center'));
toolbar.btnAlignBottom.on('click', _.bind(this.onVerticalAlign, this, 'bottom'));
toolbar.btnAlignTop.on('click', _.bind(this.onVerticalAlign, this, Asc.c_oAscVAlign.Top));
toolbar.btnAlignMiddle.on('click', _.bind(this.onVerticalAlign, this, Asc.c_oAscVAlign.Center));
toolbar.btnAlignBottom.on('click', _.bind(this.onVerticalAlign, this, Asc.c_oAscVAlign.Bottom));
toolbar.btnWrap.on('click', _.bind(this.onWrap, this));
toolbar.btnTextOrient.menu.on('item:click', _.bind(this.onTextOrientationMenu, this));
toolbar.btnInsertImage.menu.on('item:click', _.bind(this.onInsertImageMenu, this));
@ -603,8 +606,8 @@ define([
onHorizontalAlign: function(type, btn, e) {
this._state.pralign = undefined;
if (this.api) {
this.api.asc_setCellAlign(!btn.pressed ? 'none' : type);
this.toolbar.btnWrap.allowDepress = !(type == 'justify');
this.api.asc_setCellAlign(!btn.pressed ? null : type);
this.toolbar.btnWrap.allowDepress = !(type == AscCommon.align_Justify);
}
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@ -623,9 +626,9 @@ define([
this._state.pralign = undefined;
if (this.api)
this.api.asc_setCellAlign(!item.checked ? 'none' : item.value);
this.api.asc_setCellAlign(!item.checked ? null : item.value);
this.toolbar.btnWrap.allowDepress = !(item.value == 'justify');
this.toolbar.btnWrap.allowDepress = !(item.value == AscCommon.align_Justify);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Horizontal Align');
@ -643,7 +646,7 @@ define([
this._state.valign = undefined;
if (this.api)
this.api.asc_setCellVertAlign(!item.checked ? 'bottom' : item.value);
this.api.asc_setCellVertAlign(!item.checked ? Asc.c_oAscVAlign.Bottom : item.value);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Vertical Align');
@ -652,7 +655,7 @@ define([
onVerticalAlign: function(type, btn, e) {
this._state.valign = undefined;
if (this.api) {
this.api.asc_setCellVertAlign(!btn.pressed ? 'bottom' : type);
this.api.asc_setCellVertAlign(!btn.pressed ? Asc.c_oAscVAlign.Bottom : type);
}
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@ -1889,8 +1892,12 @@ define([
this._state.clrshd_asccolor = color;
}
if (selectionType == Asc.c_oAscSelectionType.RangeChart || selectionType == Asc.c_oAscSelectionType.RangeChartText)
return;
var in_chart = (selectionType == Asc.c_oAscSelectionType.RangeChart || selectionType == Asc.c_oAscSelectionType.RangeChartText);
if (in_chart !== this._state.in_chart) {
toolbar.btnInsertChart.updateHint(in_chart ? toolbar.tipChangeChart : toolbar.tipInsertChart);
this._state.in_chart = in_chart;
}
if (in_chart) return;
if (!toolbar.mode.isEditDiagram)
{
@ -1907,10 +1914,10 @@ define([
var index = -1, align;
switch (fontparam) {
case 'left': index = 0; align = 'btn-align-left'; break;
case 'center': index = 1; align = 'btn-align-center'; break;
case 'right': index = 2; align = 'btn-align-right'; break;
case 'justify': index = 3; align = 'btn-align-just'; break;
case AscCommon.align_Left: index = 0; align = 'btn-align-left'; break;
case AscCommon.align_Center: index = 1; align = 'btn-align-center'; break;
case AscCommon.align_Right: index = 2; align = 'btn-align-right'; break;
case AscCommon.align_Justify: index = 3; align = 'btn-align-just'; break;
default: index = -255; align = 'btn-align-left'; break;
}
if (!(index < 0)) {
@ -1940,7 +1947,7 @@ define([
}
}
need_disable = (fontparam == 'justify' || selectionType == Asc.c_oAscSelectionType.RangeShapeText);
need_disable = (fontparam == AscCommon.align_Justify || selectionType == Asc.c_oAscSelectionType.RangeShapeText);
toolbar.btnTextOrient.menu.items[1].setDisabled(need_disable);
toolbar.btnTextOrient.menu.items[2].setDisabled(need_disable);
@ -1952,9 +1959,9 @@ define([
index = -1; align = '';
switch (fontparam) {
case 'top': index = 0; align = 'btn-valign-top'; break;
case 'center': index = 1; align = 'btn-valign-middle'; break;
case 'bottom': index = 2; align = 'btn-valign-bottom'; break;
case Asc.c_oAscVAlign.Top: index = 0; align = 'btn-valign-top'; break;
case Asc.c_oAscVAlign.Center: index = 1; align = 'btn-valign-middle'; break;
case Asc.c_oAscVAlign.Bottom: index = 2; align = 'btn-valign-bottom'; break;
}
if (index > -1) {

12
apps/spreadsheeteditor/main/app/template/Toolbar.template
View file

@ -122,18 +122,12 @@
<div class="separator long"></div>
<div class="group">
<div class="elset">
<span class="btn-slot" id="slot-btn-clear"></span>
</div>
<div class="elset">
<span class="btn-slot" id="slot-btn-copystyle"></span>
</div>
</div>
<div class="group">
<div class="elset">
<span class="btn-slot split" id="slot-btn-clear"></span>
<span class="btn-slot split" id="slot-btn-colorschemas"></span>
</div>
<div class="elset">
<span class="btn-slot" id="slot-btn-table-tpl"></span>
<span class="btn-slot split" id="slot-btn-copystyle"></span>
<span class="btn-slot split" id="slot-btn-table-tpl"></span>
</div>
</div>
<div class="group" id="slot-field-styles" style="width: 100%; min-width: 160px;">

2
apps/spreadsheeteditor/main/app/view/CellEditor.js
View file

@ -74,7 +74,7 @@ define([
});
this.btnNamedRanges.render($('#ce-cell-name-menu'));
this.btnNamedRanges.setVisible(false);
this.btnNamedRanges.menu.setOffset(-55);
this.btnNamedRanges.menu.setOffset(-52);
this.$cellname = $('#ce-cell-name', this.el);
this.$btnexpand = $('#ce-btn-expand', this.el);

2
apps/spreadsheeteditor/main/app/view/FormulaDialog.js
View file

@ -134,7 +134,7 @@ define([
main_height = Common.Utils.innerHeight();
}
top = ((parseInt(main_height, 10) - parseInt(win_height, 10)) / 2) * 0.9;
top = (parseInt(main_height, 10) - parseInt(win_height, 10)) / 2;
left = (parseInt(main_width, 10) - parseInt(this.initConfig.width, 10)) / 2;
this.$window.css('left', Math.floor(left));

3
apps/spreadsheeteditor/main/app/view/ImageSettings.js
View file

@ -181,8 +181,11 @@ define([
this.spnHeight.on('change', _.bind(this.onHeightChange, this));
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this._isFromFile) return;
this._isFromFile = true;
if (this.api) this.api.asc_changeImageFromFile();
Common.NotificationCenter.trigger('edit:complete', this);
this._isFromFile = false;
}, this));
this.btnEditObject.on('click', _.bind(function(btn){
if (this.api) this.api.asc_startEditCurrentOleObject();

2
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -1138,7 +1138,7 @@ define([
this.fillControls.push(this.btnInsertFromUrl);
this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this.api) this.api.asc_changeShapeImageFromFile();
if (this.api) this.api.asc_changeShapeImageFromFile(this.BlipFillType);
Common.NotificationCenter.trigger('edit:complete', this);
}, this));
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));

2
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -1108,7 +1108,7 @@ define([
this.lockedControls.push(this.btnInsertFromUrl);
this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this.api) this.api.asc_changeArtImageFromFile();
if (this.api) this.api.asc_changeArtImageFromFile(this.BlipFillType);
Common.NotificationCenter.trigger('edit:complete', this);
}, this));
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));

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

@ -1072,7 +1072,7 @@ define([
allowDepress: true,
toggleGroup : 'halignGroup',
checked : true,
value : 'left'
value : AscCommon.align_Left
},
{
caption : me.tipAlignCenter,
@ -1081,7 +1081,7 @@ define([
checkable : true,
allowDepress: true,
toggleGroup : 'halignGroup',
value : 'center'
value : AscCommon.align_Center
},
{
caption : me.tipAlignRight,
@ -1090,7 +1090,7 @@ define([
checkable : true,
allowDepress: true,
toggleGroup : 'halignGroup',
value : 'right'
value : AscCommon.align_Right
},
{
caption : me.tipAlignJust,
@ -1099,7 +1099,7 @@ define([
checkable : true,
allowDepress: true,
toggleGroup : 'halignGroup',
value : 'justify'
value : AscCommon.align_Justify
}
]
})
@ -1120,7 +1120,7 @@ define([
checkable : true,
allowDepress: true,
toggleGroup : 'valignGroup',
value : 'top'
value : Asc.c_oAscVAlign.Top
},
{
caption : me.tipAlignMiddle,
@ -1129,7 +1129,7 @@ define([
checkable : true,
allowDepress: true,
toggleGroup : 'valignGroup',
value : 'center'
value : Asc.c_oAscVAlign.Center
},
{
caption : me.tipAlignBottom,
@ -1139,7 +1139,7 @@ define([
allowDepress: true,
checked : true,
toggleGroup : 'valignGroup',
value : 'bottom'
value : Asc.c_oAscVAlign.Bottom
}
]
})
@ -2046,7 +2046,7 @@ define([
tipInsertEquation: 'Insert Equation',
textCharts: 'Charts',
textSparks: 'Sparklines',
tipInsertChartSpark: 'Insert Chart or Sparkline',
tipInsertChartSpark: 'Insert Chart',
textMoreFormats: 'More formats',
capInsertText: 'Text',
capInsertTextart: 'Text Art',
@ -2059,6 +2059,7 @@ define([
textTabFile: 'File',
textTabHome: 'Home',
textTabInsert: 'Insert',
textSurface: 'Surface'
textSurface: 'Surface',
tipChangeChart: 'Change Chart Type'
}, SSE.Views.Toolbar || {}));
});

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

@ -1001,8 +1001,8 @@
"SSE.Views.DocumentHolder.selectRowText": "Row",
"SSE.Views.DocumentHolder.selectTableText": "Table",
"SSE.Views.DocumentHolder.textArrangeBack": "Send to Background",
"SSE.Views.DocumentHolder.textArrangeBackward": "Move Backward",
"SSE.Views.DocumentHolder.textArrangeForward": "Move Forward",
"SSE.Views.DocumentHolder.textArrangeBackward": "Send Backward",
"SSE.Views.DocumentHolder.textArrangeForward": "Bring Forward",
"SSE.Views.DocumentHolder.textArrangeFront": "Bring to Foreground",
"SSE.Views.DocumentHolder.textEntriesList": "Select from drop-down list",
"SSE.Views.DocumentHolder.textFreezePanes": "Freeze Panes",
@ -1483,7 +1483,7 @@
"SSE.Views.Statusbar.tipLast": "Scroll to Last Sheet",
"SSE.Views.Statusbar.tipNext": "Scroll Sheet List Right",
"SSE.Views.Statusbar.tipPrev": "Scroll Sheet List Left",
"SSE.Views.Statusbar.tipZoomFactor": "Magnification",
"SSE.Views.Statusbar.tipZoomFactor": "Zoom",
"SSE.Views.Statusbar.tipZoomIn": "Zoom In",
"SSE.Views.Statusbar.tipZoomOut": "Zoom Out",
"SSE.Views.Statusbar.zoomText": "Zoom {0}%",
@ -1664,6 +1664,7 @@
"SSE.Views.Toolbar.tipBack": "Back",
"SSE.Views.Toolbar.tipBorders": "Borders",
"SSE.Views.Toolbar.tipCellStyle": "Cell Style",
"SSE.Views.Toolbar.tipChangeChart": "Change Chart Type",
"SSE.Views.Toolbar.tipClearStyle": "Clear",
"SSE.Views.Toolbar.tipColorSchemas": "Change Color Scheme",
"SSE.Views.Toolbar.tipCopy": "Copy",
@ -1682,7 +1683,7 @@
"SSE.Views.Toolbar.tipIncDecimal": "Increase Decimal",
"SSE.Views.Toolbar.tipIncFont": "Increment font size",
"SSE.Views.Toolbar.tipInsertChart": "Insert Chart",
"SSE.Views.Toolbar.tipInsertChartSpark": "Insert Chart or Sparkline",
"SSE.Views.Toolbar.tipInsertChartSpark": "Insert Chart",
"SSE.Views.Toolbar.tipInsertEquation": "Insert Equation",
"SSE.Views.Toolbar.tipInsertHyperlink": "Add Hyperlink",
"SSE.Views.Toolbar.tipInsertImage": "Insert Picture",

6
apps/spreadsheeteditor/main/locale/ru.json
View file

@ -1000,10 +1000,10 @@
"SSE.Views.DocumentHolder.selectDataText": "Данные столбцов",
"SSE.Views.DocumentHolder.selectRowText": "Строку",
"SSE.Views.DocumentHolder.selectTableText": "Таблицу",
"SSE.Views.DocumentHolder.textArrangeBack": "Переместить на задний план",
"SSE.Views.DocumentHolder.textArrangeBack": "Перенести на задний план",
"SSE.Views.DocumentHolder.textArrangeBackward": "Перенести назад",
"SSE.Views.DocumentHolder.textArrangeForward": "Перенести вперед",
"SSE.Views.DocumentHolder.textArrangeFront": "Вынести на передний план",
"SSE.Views.DocumentHolder.textArrangeFront": "Перенести на передний план",
"SSE.Views.DocumentHolder.textEntriesList": "Выбрать из списка",
"SSE.Views.DocumentHolder.textFreezePanes": "Закрепить области",
"SSE.Views.DocumentHolder.textNone": "Нет",
@ -1682,7 +1682,7 @@
"SSE.Views.Toolbar.tipIncDecimal": "Увеличить разрядность",
"SSE.Views.Toolbar.tipIncFont": "Увеличить размер шрифта",
"SSE.Views.Toolbar.tipInsertChart": "Вставить диаграмму",
"SSE.Views.Toolbar.tipInsertChartSpark": "Вставить диаграмму или спарклайн",
"SSE.Views.Toolbar.tipInsertChartSpark": "Вставить диаграмму",
"SSE.Views.Toolbar.tipInsertEquation": "Вставить формулу",
"SSE.Views.Toolbar.tipInsertHyperlink": "Добавить гиперссылку",
"SSE.Views.Toolbar.tipInsertImage": "Вставить изображение",

2
apps/spreadsheeteditor/main/resources/formula-lang/de.json
View file

File diff suppressed because one or more lines are too long

2
apps/spreadsheeteditor/main/resources/formula-lang/en.json
View file

File diff suppressed because one or more lines are too long

2
apps/spreadsheeteditor/main/resources/formula-lang/en_desc.json
View file

File diff suppressed because one or more lines are too long

2
apps/spreadsheeteditor/main/resources/formula-lang/pl.json
View file

File diff suppressed because one or more lines are too long

2
apps/spreadsheeteditor/main/resources/formula-lang/ru.json
View file

File diff suppressed because one or more lines are too long

2
apps/spreadsheeteditor/main/resources/formula-lang/ru_desc.json
View file

File diff suppressed because one or more lines are too long

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

@ -30,7 +30,7 @@
#ce-cell-name-menu {
display: inline-block;
position: absolute;
left: 54px;
left: 50px;
background-color: @gray-light;
button {

42
apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js
View file

@ -232,19 +232,32 @@ define([
initTextFormat: function () {
var me = this,
$pageTextFormat = $('.page[data-page=edit-text-format]'),
hAlign = _cellInfo.asc_getHorAlign() || 'left',
vAlign = _cellInfo.asc_getVertAlign() || 'bottom',
hAlign = _cellInfo.asc_getHorAlign(),
vAlign = _cellInfo.asc_getVertAlign(),
hAlignStr = 'left',
vAlignStr = 'bottom',
isWrapText = _cellInfo.asc_getFlags().asc_getWrapText();
$('#text-format .item-media i').removeClass().addClass(Common.Utils.String.format('icon icon-text-align-{0}', hAlign == 'none' ? 'left' : hAlign));
if (vAlign == Asc.c_oAscVAlign.Top)
vAlignStr = 'top';
else if (vAlign == Asc.c_oAscVAlign.Center)
vAlignStr = 'center';
switch (hAlign) {
case AscCommon.align_Center: hAlignStr = 'center'; break;
case AscCommon.align_Right: hAlignStr = 'right'; break;
case AscCommon.align_Justify: hAlignStr = 'justify'; break;
}
$('#text-format .item-media i').removeClass().addClass(Common.Utils.String.format('icon icon-text-align-{0}', hAlignStr));
if ($pageTextFormat.length > 0) {
var $radioHAlign = $pageTextFormat.find('input:radio[name=text-halign]'),
$radioVAlign = $pageTextFormat.find('input:radio[name=text-valign]'),
$switchWrapText = $pageTextFormat.find('#edit-cell-wrap-text input');
$radioHAlign.val([hAlign]);
$radioVAlign.val([vAlign]);
$radioHAlign.val([hAlignStr]);
$radioVAlign.val([vAlignStr]);
$switchWrapText.prop('checked', isWrapText);
$radioHAlign.single('change', _.bind(me.onHAlignChange, me));
@ -419,14 +432,29 @@ define([
onHAlignChange: function (e) {
var $target = $(e.currentTarget),
type = $target.prop('value');
value = $target.prop('value'),
type = AscCommon.align_Left;
if (value == 'center')
type = AscCommon.align_Center;
else if (value == 'right')
type = AscCommon.align_Right;
else if (value == 'justify')
type = AscCommon.align_Justify;
this.api.asc_setCellAlign(type);
},
onVAlignChange: function (e) {
var $target = $(e.currentTarget),
type = $target.prop('value');
value = $target.prop('value'),
type = Asc.c_oAscVAlign.Bottom;
if (value == 'top') {
type = Asc.c_oAscVAlign.Top;
} else if (value == 'center') {
type = Asc.c_oAscVAlign.Center;
}
this.api.asc_setCellVertAlign(type);
},

51
apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js
View file

@ -156,28 +156,28 @@ define([
// Align
$('#edit-text-align-block').css('display', (_textIn == TextType.inShape) ? 'block' : 'none');
var hAlign = _cellInfo.asc_getHorAlign() || 'left',
vAlign = _cellInfo.asc_getVertAlign() || 'bottom';
var hAlign = _cellInfo.asc_getHorAlign(),
vAlign = _cellInfo.asc_getVertAlign();
$('#font-left').toggleClass('active', hAlign==='left');
$('#font-center').toggleClass('active', hAlign==='center');
$('#font-right').toggleClass('active', hAlign==='right');
$('#font-just').toggleClass('active', hAlign==='justify');
$('#font-top').toggleClass('active', vAlign==='top');
$('#font-middle').toggleClass('active', vAlign==='center');
$('#font-bottom').toggleClass('active', vAlign==='bottom');
$('#font-left').toggleClass('active', hAlign===AscCommon.align_Left);
$('#font-center').toggleClass('active', hAlign===AscCommon.align_Center);
$('#font-right').toggleClass('active', hAlign===AscCommon.align_Right);
$('#font-just').toggleClass('active', hAlign===AscCommon.align_Justify);
$('#font-top').toggleClass('active', vAlign===Asc.c_oAscVAlign.Top);
$('#font-middle').toggleClass('active', vAlign===Asc.c_oAscVAlign.Center);
$('#font-bottom').toggleClass('active', vAlign===Asc.c_oAscVAlign.Bottom);
// Handlers
$('#font-bold').single('click', _.bind(me.onBold, me));
$('#font-italic').single('click', _.bind(me.onItalic, me));
$('#font-underline').single('click', _.bind(me.onUnderline, me));
$('#font-left').single('click', _.bind(me.onHAlign, me, 'left'));
$('#font-center').single('click', _.bind(me.onHAlign, me, 'center'));
$('#font-right').single('click', _.bind(me.onHAlign, me, 'right'));
$('#font-just').single('click', _.bind(me.onHAlign, me, 'justify'));
$('#font-top').single('click', _.bind(me.onVAlign, me, 'top'));
$('#font-middle').single('click', _.bind(me.onVAlign, me, 'center'));
$('#font-bottom').single('click', _.bind(me.onVAlign, me, 'bottom'));
$('#font-left').single('click', _.bind(me.onHAlign, me, AscCommon.align_Left));
$('#font-center').single('click', _.bind(me.onHAlign, me, AscCommon.align_Center));
$('#font-right').single('click', _.bind(me.onHAlign, me, AscCommon.align_Right));
$('#font-just').single('click', _.bind(me.onHAlign, me, AscCommon.align_Justify));
$('#font-top').single('click', _.bind(me.onVAlign, me, Asc.c_oAscVAlign.Top));
$('#font-middle').single('click', _.bind(me.onVAlign, me, Asc.c_oAscVAlign.Center));
$('#font-bottom').single('click', _.bind(me.onVAlign, me, Asc.c_oAscVAlign.Bottom));
},
initFontsPage: function () {
@ -283,14 +283,29 @@ define([
onHAlignChange: function (e) {
var $target = $(e.currentTarget),
type = $target.prop('value');
value = $target.prop('value'),
type = AscCommon.align_Left;
if (value == 'center')
type = AscCommon.align_Center;
else if (value == 'right')
type = AscCommon.align_Right;
else if (value == 'justify')
type = AscCommon.align_Justify;
this.api.asc_setCellAlign(type);
},
onVAlignChange: function (e) {
var $target = $(e.currentTarget),
type = $target.prop('value');
value = $target.prop('value'),
type = Asc.c_oAscVAlign.Bottom;
if (value == 'top') {
type = Asc.c_oAscVAlign.Top;
} else if (value == 'center') {
type = Asc.c_oAscVAlign.Center;
}
this.api.asc_setCellVertAlign(type);
},