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

[SSE] Move

Browse source 
Move asc_getMultiselect to cell info
This commit is contained in:
Alexander Trofimov 2020-05-14 11:45:23 +03:00
parent a33df0aabe
commit 4a282e307a
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/spreadsheeteditor/main/app/controller/DataTab.js
View file

@ -117,7 +117,7 @@ define([
// special disable conditions // special disable conditions
Common.Utils.lockControls(SSE.enumLock.multiselectCols, info.asc_getSelectedColsCount()>1, {array: [this.view.btnTextToColumns]}); Common.Utils.lockControls(SSE.enumLock.multiselectCols, info.asc_getSelectedColsCount()>1, {array: [this.view.btnTextToColumns]});
Common.Utils.lockControls(SSE.enumLock.multiselect, info.asc_getFlags().asc_getMultiselect(), {array: [this.view.btnTextToColumns]}); Common.Utils.lockControls(SSE.enumLock.multiselect, info.asc_getMultiselect(), {array: [this.view.btnTextToColumns]});
}, },
onUngroup: function(type) { onUngroup: function(type) {

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

@ -1740,7 +1740,7 @@ define([
formatTableInfo = cellinfo.asc_getFormatTableInfo(), formatTableInfo = cellinfo.asc_getFormatTableInfo(),
isinsparkline = (cellinfo.asc_getSparklineInfo()!==null), isinsparkline = (cellinfo.asc_getSparklineInfo()!==null),
isintable = (formatTableInfo !== null), isintable = (formatTableInfo !== null),
ismultiselect = cellinfo.asc_getFlags().asc_getMultiselect(); ismultiselect = cellinfo.asc_getMultiselect();
documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null; documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null;
documentHolder.ssMenu.cellColor = cellinfo.asc_getFillColor(); documentHolder.ssMenu.cellColor = cellinfo.asc_getFillColor();
documentHolder.ssMenu.fontColor = cellinfo.asc_getFont().asc_getColor(); documentHolder.ssMenu.fontColor = cellinfo.asc_getFont().asc_getColor();

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

@ -2361,7 +2361,7 @@ define([
if (this._state.tablename !== old_name || this._state.filterapplied !== old_applied) if (this._state.tablename !== old_name || this._state.filterapplied !== old_applied)
this.getApplication().getController('Statusbar').onApiFilterInfo(!need_disable); this.getApplication().getController('Statusbar').onApiFilterInfo(!need_disable);
this._state.multiselect = info.asc_getFlags().asc_getMultiselect(); this._state.multiselect = info.asc_getMultiselect();
toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink, toolbar.btnInsertTable]}); toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink, toolbar.btnInsertTable]});
this._state.inpivot = !!info.asc_getPivotTableInfo(); this._state.inpivot = !!info.asc_getPivotTableInfo();

4
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file

@ -430,12 +430,12 @@ define([
event: 'wrap' event: 'wrap'
}); });
if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect()) { if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect()) {
arrItems.push({ arrItems.push({
caption: me.menuOpenLink, caption: me.menuOpenLink,
event: 'openlink' event: 'openlink'
}); });
} else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect() && } else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect() &&
!cellinfo.asc_getFlags().asc_getLockText() && !!cellinfo.asc_getText()) { !cellinfo.asc_getFlags().asc_getLockText() && !!cellinfo.asc_getText()) {
arrItems.push({ arrItems.push({
caption: me.menuAddLink, caption: me.menuAddLink,

2
apps/spreadsheeteditor/mobile/app/controller/edit/EditContainer.js
View file

@ -495,7 +495,7 @@ define([
// formatTableInfo = cellInfo.asc_getFormatTableInfo(), // formatTableInfo = cellInfo.asc_getFormatTableInfo(),
// isinsparkline = (cellInfo.asc_getSparklineInfo()!==null), // isinsparkline = (cellInfo.asc_getSparklineInfo()!==null),
// isintable = (formatTableInfo !== null), // isintable = (formatTableInfo !== null),
// ismultiselect = cellInfo.asc_getFlags().asc_getMultiselect(); // ismultiselect = cellInfo.asc_getMultiselect();
// documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null; // documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null;
// documentHolder.ssMenu.cellColor = cellInfo.asc_getFill().asc_getColor(); // documentHolder.ssMenu.cellColor = cellInfo.asc_getFill().asc_getColor();
// documentHolder.ssMenu.fontColor = cellInfo.asc_getFont().asc_getColor(); // documentHolder.ssMenu.fontColor = cellInfo.asc_getFont().asc_getColor();