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
b01e8e59
Commit
b01e8e59
authored
Mar 16, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Fix Bug 34315.
parent
01c3b250
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
5 deletions
+16
-5
apps/spreadsheeteditor/main/app/controller/Toolbar.js
apps/spreadsheeteditor/main/app/controller/Toolbar.js
+11
-4
apps/spreadsheeteditor/main/app/view/Statusbar.js
apps/spreadsheeteditor/main/app/view/Statusbar.js
+5
-1
No files found.
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file @
b01e8e59
...
...
@@ -87,7 +87,6 @@ define([
underline
:
undefined
,
wrap
:
undefined
,
merge
:
undefined
,
filter
:
undefined
,
angle
:
undefined
,
controlsdisabled
:
{
rows
:
undefined
,
...
...
@@ -97,6 +96,8 @@ define([
filters
:
undefined
},
selection_type
:
undefined
,
filter
:
undefined
,
filterapplied
:
false
,
tablestylename
:
undefined
,
tablename
:
undefined
,
namedrange_locked
:
false
,
...
...
@@ -1971,10 +1972,16 @@ define([
}
}
this
.
_state
.
tablename
=
(
formatTableInfo
)
?
formatTableInfo
.
asc_getTableName
()
:
undefined
;
need_disable
=
this
.
_state
.
controlsdisabled
.
filters
||
!
filterInfo
||
(
filterInfo
.
asc_getIsApplyAutoFilter
()
!==
true
);
toolbar
.
lockToolbar
(
SSE
.
enumLock
.
ruleDelFilter
,
need_disable
,
{
array
:[
toolbar
.
btnClearAutofilter
,
toolbar
.
mnuitemClearFilter
]});
var
old_name
=
this
.
_state
.
tablename
;
this
.
_state
.
tablename
=
(
formatTableInfo
)
?
formatTableInfo
.
asc_getTableName
()
:
undefined
;
var
old_applied
=
this
.
_state
.
filterapplied
;
this
.
_state
.
filterapplied
=
this
.
_state
.
filter
&&
filterInfo
.
asc_getIsApplyAutoFilter
();
if
(
this
.
_state
.
tablename
!==
old_name
||
this
.
_state
.
filterapplied
!==
old_applied
)
this
.
getApplication
().
getController
(
'
Statusbar
'
).
onApiFilterInfo
(
!
need_disable
);
this
.
_state
.
multiselect
=
info
.
asc_getFlags
().
asc_getMultiselect
();
...
...
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file @
b01e8e59
...
...
@@ -437,8 +437,12 @@ define([
}
else
if
(
countFilter
)
{
// filter mode
if
(
!
this
.
boxFiltered
.
is
(
'
:visible
'
))
this
.
boxFiltered
.
show
();
this
.
labelFiltered
.
text
(
this
.
filteredText
);
}
else
{
}
else
if
(
countFilter
!==
undefined
&&
countFilter
!==
null
)
{
if
(
this
.
boxFiltered
.
is
(
'
:visible
'
))
this
.
boxFiltered
.
hide
();
}
else
{
var
filterInfo
=
this
.
api
.
asc_getCellInfo
().
asc_getAutoFilterInfo
(),
need_disable
=
!
filterInfo
||
(
filterInfo
.
asc_getIsApplyAutoFilter
()
!==
true
);
this
.
setFilteredInfo
(
!
need_disable
);
}
var
me
=
this
;
...
...
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