Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
9bb6fc40
Commit
9bb6fc40
authored
Sep 14, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "[SSE] Fix Bug 35842."
This reverts commit
2be95b05
.
parent
2be95b05
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
apps/spreadsheeteditor/main/app/controller/Toolbar.js
apps/spreadsheeteditor/main/app/controller/Toolbar.js
+1
-2
apps/spreadsheeteditor/main/app/view/Toolbar.js
apps/spreadsheeteditor/main/app/view/Toolbar.js
+1
-1
No files found.
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file @
9bb6fc40
...
...
@@ -2009,8 +2009,7 @@ define([
toolbar
.
lockToolbar
(
SSE
.
enumLock
.
multiselect
,
this
.
_state
.
multiselect
,
{
array
:
[
toolbar
.
btnTableTemplate
,
toolbar
.
btnInsertHyperlink
]});
need_disable
=
!!
info
.
asc_getPivotTableInfo
();
toolbar
.
lockToolbar
(
SSE
.
enumLock
.
editPivot
,
need_disable
,
{
array
:
[
toolbar
.
btnMerge
,
toolbar
.
btnInsertHyperlink
,
toolbar
.
btnSetAutofilter
,
toolbar
.
btnClearAutofilter
,
toolbar
.
btnSortDown
,
toolbar
.
btnSortUp
,
toolbar
.
btnAutofilter
,
toolbar
.
btnTableTemplate
]});
toolbar
.
lockToolbar
(
SSE
.
enumLock
.
editPivot
,
need_disable
,
{
array
:
[
toolbar
.
btnMerge
,
toolbar
.
btnInsertHyperlink
,
toolbar
.
btnSetAutofilter
,
toolbar
.
btnClearAutofilter
,
toolbar
.
btnSortDown
,
toolbar
.
btnSortUp
,
toolbar
.
btnAutofilter
]});
}
val
=
info
.
asc_getNumFormatInfo
();
...
...
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file @
9bb6fc40
...
...
@@ -605,7 +605,7 @@ define([
id
:
'
id-toolbar-btn-ttempl
'
,
cls
:
'
btn-toolbar
'
,
iconCls
:
'
btn-ttempl
'
,
lock
:
[
_set
.
editCell
,
_set
.
selChart
,
_set
.
selChartText
,
_set
.
selShape
,
_set
.
selShapeText
,
_set
.
selImage
,
_set
.
lostConnect
,
_set
.
coAuth
,
_set
.
ruleFilter
,
_set
.
multiselect
,
_set
.
editPivot
],
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
({
items
:
[
{
template
:
_
.
template
(
'
<div id="id-toolbar-menu-table-templates" style="width: 288px; height: 300px; margin: 0px 4px;"></div>
'
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment