Merge pull request #3 from ONLYOFFICE/release/v5.0.0

Release/v5.0.0
This commit is contained in:
Julia Radzhabova 2017-08-30 15:07:13 +03:00 committed by GitHub
commit fe462bd08b
40 changed files with 237 additions and 92 deletions

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 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); var left = Math.floor((parseInt(main_width) - parseInt(win_width)) / 2);
this.$window.css('left',left); this.$window.css('left',left);

View file

@ -75,6 +75,7 @@ define([
'reviewchange:reject': _.bind(this.onRejectClick, this), 'reviewchange:reject': _.bind(this.onRejectClick, this),
'reviewchange:delete': _.bind(this.onDeleteClick, this), 'reviewchange:delete': _.bind(this.onDeleteClick, this),
'reviewchange:preview': _.bind(this.onBtnPreviewClick, this), 'reviewchange:preview': _.bind(this.onBtnPreviewClick, this),
'reviewchanges:view': _.bind(this.onReviewViewClick, this),
'lang:document': _.bind(this.onDocLanguage, this) 'lang:document': _.bind(this.onDocLanguage, this)
}, },
'Common.Views.ReviewChangesDialog': { 'Common.Views.ReviewChangesDialog': {
@ -88,7 +89,7 @@ define([
this.collection = this.getApplication().getCollection('Common.Collections.ReviewChanges'); this.collection = this.getApplication().getCollection('Common.Collections.ReviewChanges');
this.userCollection = this.getApplication().getCollection('Common.Collections.Users'); 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('reviewchanges:turn', this.onTurnPreview.bind(this));
Common.NotificationCenter.on('spelling:turn', this.onTurnSpelling.bind(this)); Common.NotificationCenter.on('spelling:turn', this.onTurnSpelling.bind(this));
@ -127,10 +128,10 @@ define([
return this; return this;
}, },
SetDisabled: function() { SetDisabled: function(state) {
if (this.dlgChanges) if (this.dlgChanges)
this.dlgChanges.close(); this.dlgChanges.close();
this.view && this.view.SetDisabled(true); this.view && this.view.SetDisabled(state);
}, },
onApiShowChange: function (sdkchange) { onApiShowChange: function (sdkchange) {
@ -500,6 +501,46 @@ define([
this.api.asc_setSpellCheck(state); 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() { createToolbarPanel: function() {
return this.view.getPanel(); return this.view.getPanel();
}, },
@ -553,7 +594,7 @@ define([
}, },
synchronizeChanges: function() { synchronizeChanges: function() {
if ( this.appConfig.canReview ) { if ( this.appConfig && this.appConfig.canReview ) {
this.view.markChanges( this.api.asc_HaveRevisionsChanges() ); this.view.markChanges( this.api.asc_HaveRevisionsChanges() );
} }
}, },

View file

@ -134,7 +134,7 @@ define([
this.$window.find('> .body').css('height', height-header_height); this.$window.find('> .body').css('height', height-header_height);
this.$window.find('> .body > .box').css('height', height-85); 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; var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
this.$window.css('left',left); this.$window.css('left',left);

View file

@ -134,7 +134,7 @@ define([
this.$window.find('> .body').css('height', height-header_height); this.$window.find('> .body').css('height', height-header_height);
this.$window.find('> .body > .box').css('height', height-85); 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; var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2;
this.$window.css('left',left); this.$window.css('left',left);

View file

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

View file

@ -422,7 +422,7 @@ define([
Common.UI.Window.prototype.setWidth.call(this, width + borders_width); Common.UI.Window.prototype.setWidth.call(this, width + borders_width);
this.$window.css('left',(maxWidth - width - borders_width) / 2); 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() { onWindowResize: function() {

View file

@ -423,6 +423,12 @@ define([
'<div class="separator long review"/>' + '<div class="separator long review"/>' +
'<div class="group">' + '<div class="group">' +
'<span id="btn-review-on" class="btn-slot text x-huge"></span>' + '<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-prev" class="btn-slot text x-huge"></span>' +
'<span id="btn-change-next" 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>' + '<span id="btn-change-accept" class="btn-slot text x-huge"></span>' +
@ -468,6 +474,10 @@ define([
button.on('click', _click_turnpreview.bind(me)); button.on('click', _click_turnpreview.bind(me));
Common.NotificationCenter.trigger('edit:complete', 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) { this.btnsSpelling.forEach(function(button) {
@ -528,6 +538,13 @@ define([
enableToggle: true enableToggle: true
}); });
this.btnsTurnReview = [this.btnTurnOn]; 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({ this.btnSetSpelling = new Common.UI.Button({
@ -597,6 +614,35 @@ define([
); );
me.btnReject.updateHint([me.txtRejectCurrent, me.txtRejectChanges]); 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.btnAccept.setDisabled(config.isReviewOnly);
me.btnReject.setDisabled(config.isReviewOnly); me.btnReject.setDisabled(config.isReviewOnly);
} else { } else {
@ -627,6 +673,7 @@ define([
this.btnAccept.render(this.$el.find('#btn-change-accept')); this.btnAccept.render(this.$el.find('#btn-change-accept'));
this.btnReject.render(this.$el.find('#btn-change-reject')); this.btnReject.render(this.$el.find('#btn-change-reject'));
this.btnTurnOn.render(this.$el.find('#btn-review-on')); 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')); this.btnSetSpelling.render(this.$el.find('#slot-btn-spelling'));
@ -739,7 +786,12 @@ define([
tipSetSpelling: 'Spell checking', tipSetSpelling: 'Spell checking',
tipReview: 'Review', tipReview: 'Review',
txtAcceptChanges: 'Accept Changes', 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 || {})); }()), Common.Views.ReviewChanges || {}));

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View file

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

View file

@ -273,6 +273,7 @@
.button-normal-icon(btn-addslide, 11, @toolbar-big-icon-size); .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-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-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-save, 14, @toolbar-big-icon-size);
.button-normal-icon(review-deny, 15, @toolbar-big-icon-size); .button-normal-icon(review-deny, 15, @toolbar-big-icon-size);
.button-normal-icon(review-next, 16, @toolbar-big-icon-size); .button-normal-icon(review-next, 16, @toolbar-big-icon-size);

View file

@ -607,7 +607,8 @@ define([
action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
action ? this.setLongActionView(action) : this.loadMask && this.loadMask.hide(); 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(); this.synchronizeChanges();
if ( type == Asc.c_oAscAsyncActionType.BlockInteraction && 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_onSendThemeColors', _.bind(this.onSendThemeColors, this));
this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, 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() { applyModeEditorElements: function() {
@ -1118,8 +1121,6 @@ define([
/** coauthoring begin **/ /** coauthoring begin **/
me.api.asc_registerCallback('asc_onCollaborativeChanges', _.bind(me.onCollaborativeChanges, me)); 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_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 **/ /** coauthoring end **/
if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) { if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) {

View file

@ -114,14 +114,17 @@ define([
'menu:show': this.onFileMenu.bind(this, 'show') 'menu:show': this.onFileMenu.bind(this, 'show')
}, },
'Common.Views.Header': { 'Common.Views.Header': {
'print': this.onPrint.bind(this), 'print': function (opts) {
var _main = this.getApplication().getController('Main');
_main.onPrint();
},
'downloadas': function (opts) { 'downloadas': function (opts) {
var _main = this.getApplication().getController('Main'); var _main = this.getApplication().getController('Main');
var _file_type = _main.document.fileType, var _file_type = _main.document.fileType,
_format; _format;
if ( !!_file_type ) { if ( !!_file_type ) {
if ( /^pdf|xps|djvu/i.test(_file_type) ) { if ( /^pdf|xps|djvu/i.test(_file_type) ) {
this.api.asc_DownloadOrigin(); _main.api.asc_DownloadOrigin();
return; return;
} else { } else {
_format = Asc.c_oAscFileType[ _file_type.toUpperCase() ]; _format = Asc.c_oAscFileType[ _file_type.toUpperCase() ];
@ -2749,23 +2752,30 @@ define([
this.editMode = false; this.editMode = false;
}, },
DisableToolbar: function(disable, viewMode) { DisableToolbar: function(disable, viewMode, reviewmode) {
if (viewMode!==undefined) this.editMode = !viewMode; if (viewMode!==undefined) this.editMode = !viewMode;
disable = disable || !this.editMode; 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; if (disable && mask.length>0 || !disable && mask.length==0) return;
var toolbar = this.toolbar; var toolbar = this.toolbar;
toolbar.$el.find('.toolbar').toggleClass('masked', disable);
toolbar.btnHide.setDisabled(disable);
if(disable) { if(disable) {
mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar')); if (reviewmode) {
Common.util.Shortcuts.suspendEvents('alt+h'); 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 { } else {
mask.remove(); 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 ) if ( toolbar.synchTooltip )
toolbar.synchTooltip.hide(); toolbar.synchTooltip.hide();

View file

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

View file

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

View file

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

View file

@ -41,6 +41,17 @@
z-index: @zindex-tooltip + 1; 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 { .item-markerlist {
.background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px); .background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px);
width: 38px; width: 38px;

View file

@ -128,7 +128,10 @@ define([
'menu:show': this.onFileMenu.bind(this, 'show') 'menu:show': this.onFileMenu.bind(this, 'show')
}, },
'Common.Views.Header': { 'Common.Views.Header': {
'print': this.onPrint.bind(this), 'print': function (opts) {
var _main = this.getApplication().getController('Main');
_main.onPrint();
},
'downloadas': function (opts) { 'downloadas': function (opts) {
var _main = this.getApplication().getController('Main'); var _main = this.getApplication().getController('Main');
var _file_type = _main.document.fileType, var _file_type = _main.document.fileType,
@ -610,7 +613,7 @@ define([
this.toolbar.btnShapeArrange, this.toolbar.btnSlideSize, this.toolbar.listTheme this.toolbar.btnShapeArrange, this.toolbar.btnSlideSize, this.toolbar.listTheme
]}); ]});
this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, 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) if (this.btnsComment)
this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array: this.btnsComment }); this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array: this.btnsComment });
} }

View file

@ -178,17 +178,12 @@ define([
me.api.StartDemonstration('presentation-preview', _.isNumber(slidenum) ? slidenum : 0, reporterObject); me.api.StartDemonstration('presentation-preview', _.isNumber(slidenum) ? slidenum : 0, reporterObject);
Common.component.Analytics.trackEvent('Viewport', 'Preview'); 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); Common.NotificationCenter.on('window:resize', _onWindowResize);
me.fullScreen(document.documentElement); me.fullScreen(document.documentElement);
setTimeout(function(){
if (!reporterObject) {
setTimeout(function(){
_onWindowResize();
}, 100);
} else {
_onWindowResize(); _onWindowResize();
} }, 100);
} else } else
_onWindowResize(); _onWindowResize();
} }

View file

@ -67,7 +67,7 @@
<span class="btn-slot" id="slot-btn-italic"></span> <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-underline"></span>
<span class="btn-slot" id="slot-btn-strikeout"></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-superscript"></span>
<span class="btn-slot" id="slot-btn-subscript"></span> <span class="btn-slot" id="slot-btn-subscript"></span>
</div> </div>

View file

@ -315,6 +315,7 @@ define([
this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onCountSlides, this)); 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_onEndDemonstration', _.bind(this.onEndDemonstration, this));
this.api.asc_registerCallback('asc_onDemonstrationSlideChanged', _.bind(this.onDemonstrationSlideChanged, 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); this.api.DemonstrationEndShowMessage(this.txtFinalMessage);
} }
return this; return this;
@ -352,6 +353,12 @@ define([
this.fullScreenCancel(); 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() { toggleFullScreen: function() {
if (!document.fullscreenElement && !document.msFullscreenElement && if (!document.fullscreenElement && !document.msFullscreenElement &&
!document.mozFullScreenElement && !document.webkitFullscreenElement) { !document.mozFullScreenElement && !document.webkitFullscreenElement) {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -79,7 +79,10 @@ define([
'settings:apply': _.bind(this.applyFormulaSettings, this) 'settings:apply': _.bind(this.applyFormulaSettings, this)
}, },
'Common.Views.Header': { 'Common.Views.Header': {
'print': this.onPrint.bind(this), 'print': function (opts) {
var _main = this.getApplication().getController('Main');
_main.onPrint();
},
'downloadas': function (opts) { 'downloadas': function (opts) {
var _main = this.getApplication().getController('Main'); var _main = this.getApplication().getController('Main');
var _file_type = _main.appOptions.spreadsheet.fileType, var _file_type = _main.appOptions.spreadsheet.fileType,

View file

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

View file

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

View file

@ -134,7 +134,7 @@ define([
main_height = Common.Utils.innerHeight(); 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; left = (parseInt(main_width, 10) - parseInt(this.initConfig.width, 10)) / 2;
this.$window.css('left', Math.floor(left)); this.$window.css('left', Math.floor(left));

View file

@ -2046,7 +2046,7 @@ define([
tipInsertEquation: 'Insert Equation', tipInsertEquation: 'Insert Equation',
textCharts: 'Charts', textCharts: 'Charts',
textSparks: 'Sparklines', textSparks: 'Sparklines',
tipInsertChartSpark: 'Insert Chart or Sparkline', tipInsertChartSpark: 'Insert Chart',
textMoreFormats: 'More formats', textMoreFormats: 'More formats',
capInsertText: 'Text', capInsertText: 'Text',
capInsertTextart: 'Text Art', capInsertTextart: 'Text Art',

View file

@ -1001,8 +1001,8 @@
"SSE.Views.DocumentHolder.selectRowText": "Row", "SSE.Views.DocumentHolder.selectRowText": "Row",
"SSE.Views.DocumentHolder.selectTableText": "Table", "SSE.Views.DocumentHolder.selectTableText": "Table",
"SSE.Views.DocumentHolder.textArrangeBack": "Send to Background", "SSE.Views.DocumentHolder.textArrangeBack": "Send to Background",
"SSE.Views.DocumentHolder.textArrangeBackward": "Move Backward", "SSE.Views.DocumentHolder.textArrangeBackward": "Send Backward",
"SSE.Views.DocumentHolder.textArrangeForward": "Move Forward", "SSE.Views.DocumentHolder.textArrangeForward": "Bring Forward",
"SSE.Views.DocumentHolder.textArrangeFront": "Bring to Foreground", "SSE.Views.DocumentHolder.textArrangeFront": "Bring to Foreground",
"SSE.Views.DocumentHolder.textEntriesList": "Select from drop-down list", "SSE.Views.DocumentHolder.textEntriesList": "Select from drop-down list",
"SSE.Views.DocumentHolder.textFreezePanes": "Freeze Panes", "SSE.Views.DocumentHolder.textFreezePanes": "Freeze Panes",
@ -1483,7 +1483,7 @@
"SSE.Views.Statusbar.tipLast": "Scroll to Last Sheet", "SSE.Views.Statusbar.tipLast": "Scroll to Last Sheet",
"SSE.Views.Statusbar.tipNext": "Scroll Sheet List Right", "SSE.Views.Statusbar.tipNext": "Scroll Sheet List Right",
"SSE.Views.Statusbar.tipPrev": "Scroll Sheet List Left", "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.tipZoomIn": "Zoom In",
"SSE.Views.Statusbar.tipZoomOut": "Zoom Out", "SSE.Views.Statusbar.tipZoomOut": "Zoom Out",
"SSE.Views.Statusbar.zoomText": "Zoom {0}%", "SSE.Views.Statusbar.zoomText": "Zoom {0}%",
@ -1683,7 +1683,7 @@
"SSE.Views.Toolbar.tipIncDecimal": "Increase Decimal", "SSE.Views.Toolbar.tipIncDecimal": "Increase Decimal",
"SSE.Views.Toolbar.tipIncFont": "Increment font size", "SSE.Views.Toolbar.tipIncFont": "Increment font size",
"SSE.Views.Toolbar.tipInsertChart": "Insert Chart", "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.tipInsertEquation": "Insert Equation",
"SSE.Views.Toolbar.tipInsertHyperlink": "Add Hyperlink", "SSE.Views.Toolbar.tipInsertHyperlink": "Add Hyperlink",
"SSE.Views.Toolbar.tipInsertImage": "Insert Picture", "SSE.Views.Toolbar.tipInsertImage": "Insert Picture",

View file

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

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