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
37300034
Commit
37300034
authored
May 30, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] fix Bug 31542.
parent
2f31268a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+9
-3
No files found.
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file @
37300034
...
...
@@ -774,6 +774,7 @@ define([
this
.
_setDefaults
();
var
checkDocumentClick
=
function
(
e
)
{
if
(
me
.
_skipCheckDocumentClick
)
return
;
if
(
$
(
e
.
target
).
closest
(
'
.filter-dlg
'
).
length
<=
0
)
me
.
close
();
};
...
...
@@ -1160,7 +1161,7 @@ define([
this
.
miClear
.
setDisabled
(
this
.
initialFilterType
===
Asc
.
c_oAscAutoFilterTypes
.
None
);
this
.
miReapply
.
setDisabled
(
this
.
initialFilterType
===
Asc
.
c_oAscAutoFilterTypes
.
None
);
this
.
btnOk
.
setDisabled
(
isCustomFilter
);
this
.
btnOk
.
setDisabled
(
this
.
initialFilterType
!==
Asc
.
c_oAscAutoFilterTypes
.
Filters
&&
this
.
initialFilterType
!==
Asc
.
c_oAscAutoFilterTypes
.
None
);
},
setupDataCells
:
function
()
{
...
...
@@ -1248,7 +1249,7 @@ define([
this
.
cells
.
at
(
0
).
set
(
'
check
'
,
!
haveUnselectedCell
);
this
.
checkCellTrigerBlock
=
undefined
;
}
this
.
btnOk
.
setDisabled
(
this
.
cells
.
length
<
1
);
this
.
cellsList
.
scroller
.
update
({
minScrollbarLength
:
40
,
alwaysVisibleY
:
true
,
suppressScrollX
:
true
});
},
...
...
@@ -1268,9 +1269,11 @@ define([
}
if
(
!
isValid
)
{
me
.
_skipCheckDocumentClick
=
true
;
Common
.
UI
.
warning
({
title
:
this
.
textWarning
,
msg
:
this
.
warnNoSelected
,
callback
:
function
()
{
me
.
_skipCheckDocumentClick
=
false
;
_
.
delay
(
function
()
{
me
.
input
.
$el
.
find
(
'
input
'
).
focus
();
},
100
,
this
);
...
...
@@ -1308,7 +1311,10 @@ define([
});
isValid
=
true
;
}
if
(
isValid
)
this
.
api
.
asc_applyAutoFilter
(
this
.
configTo
);
if
(
isValid
)
{
this
.
configTo
.
asc_getFilterObj
().
asc_setType
(
Asc
.
c_oAscAutoFilterTypes
.
Filters
);
this
.
api
.
asc_applyAutoFilter
(
this
.
configTo
);
}
}
},
...
...
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