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

[SSE] Fix Bug 33304, fix Bug 33300.

Browse source
This commit is contained in:
Julia Radzhabova 2016-11-01 15:42:46 +03:00
parent a4a2ec003a
commit c87c80bfcb
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,7 +99,8 @@ define([
tablestylename: undefined, tablestylename: undefined,
tablename: undefined, tablename: undefined,
namedrange_locked: false, namedrange_locked: false,
fontsize: undefined fontsize: undefined,
multiselect: false
}; };
var checkInsertAutoshape = function(e, action) { var checkInsertAutoshape = function(e, action) {
@ -1172,7 +1173,7 @@ define([
Common.util.Shortcuts.delegateShortcuts({ Common.util.Shortcuts.delegateShortcuts({
shortcuts: { shortcuts: {
'command+l,ctrl+l': function(e) { 'command+l,ctrl+l': function(e) {
if (me.editMode) { if (me.editMode && !me._state.multiselect) {
if (!me.api.asc_getCellInfo().asc_getFormatTableInfo()) if (!me.api.asc_getCellInfo().asc_getFormatTableInfo())
me._setTableFormat(me.toolbar.mnuTableTemplatePicker.store.at(23).get('name')); me._setTableFormat(me.toolbar.mnuTableTemplatePicker.store.at(23).get('name'));
} }
@ -1197,7 +1198,7 @@ define([
e.stopPropagation(); e.stopPropagation();
}, },
'command+k,ctrl+k': function (e) { 'command+k,ctrl+k': function (e) {
if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited) if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited && !me._state.multiselect)
me.onHyperlink(); me.onHyperlink();
e.preventDefault(); e.preventDefault();
} }
@ -1808,6 +1809,9 @@ define([
need_disable = this._state.controlsdisabled.filters || !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true); need_disable = this._state.controlsdisabled.filters || !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true);
toolbar.lockToolbar(SSE.enumLock.ruleDelFilter, need_disable, {array:[toolbar.btnClearAutofilter,toolbar.mnuitemClearFilter]}); toolbar.lockToolbar(SSE.enumLock.ruleDelFilter, need_disable, {array:[toolbar.btnClearAutofilter,toolbar.mnuitemClearFilter]});
this._state.multiselect = info.asc_getFlags().asc_getMultiselect();
toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink]});
} }
fontparam = toolbar.numFormatTypes[info.asc_getNumFormatType()]; fontparam = toolbar.numFormatTypes[info.asc_getNumFormatType()];

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

@ -75,7 +75,8 @@ define([
ruleFilter: 'rule-filter', ruleFilter: 'rule-filter',
ruleDelFilter: 'rule-clear-filter', ruleDelFilter: 'rule-clear-filter',
menuFileOpen: 'menu-file-open', menuFileOpen: 'menu-file-open',
cantPrint: 'cant-print' cantPrint: 'cant-print',
multiselect: 'is-multiselect'
}; };
SSE.Views.Toolbar = Backbone.View.extend(_.extend({ SSE.Views.Toolbar = Backbone.View.extend(_.extend({
@ -495,7 +496,7 @@ define([
id : 'id-toolbar-btn-inserthyperlink', id : 'id-toolbar-btn-inserthyperlink',
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'btn-inserthyperlink', iconCls : 'btn-inserthyperlink',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.lostConnect, _set.coAuth] lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.multiselect, _set.lostConnect, _set.coAuth]
}); });
me.btnInsertChart = new Common.UI.Button({ me.btnInsertChart = new Common.UI.Button({
@ -596,7 +597,7 @@ define([
id : 'id-toolbar-btn-ttempl', id : 'id-toolbar-btn-ttempl',
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'btn-ttempl', iconCls : 'btn-ttempl',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter], lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect],
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
items: [ items: [
{ template: _.template('<div id="id-toolbar-menu-table-templates" style="width: 288px; height: 300px; margin: 0px 4px;"></div>') } { template: _.template('<div id="id-toolbar-menu-table-templates" style="width: 288px; height: 300px; margin: 0px 4px;"></div>') }