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

[SSE] Fix Bug 32886, fix Bug 32818

Browse source
This commit is contained in:
Julia Radzhabova 2016-07-29 15:25:32 +03:00
parent 758aa8dede
commit 8501cf59b0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file

@ -747,7 +747,7 @@ define([
'<input type="button" class="checked img-commonctrl"/>', '<input type="button" class="checked img-commonctrl"/>',
'<% } %>', '<% } %>',
'</label>', '</label>',
'<div id="<%= id %>" class="list-item" style="pointer-events:none;margin-left:20px;display:inline-block;width: 185px;"><%= value %></div>', '<div id="<%= id %>" class="list-item" style="pointer-events:none;margin-left:20px;display:inline-block;width: 185px;"><%= Common.Utils.String.htmlEncode(value) %></div>',
'</div>' '</div>'
].join('')) ].join(''))
}); });
@ -1133,7 +1133,7 @@ define([
}); });
else if (!isTextFilter && (cond1 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo || else if (!isTextFilter && (cond1 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo ||
cond1 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo)){ cond1 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo)){
items[7].setChecked(true, true); // between filter items[6].setChecked(true, true); // between filter
isCustomConditions = false; isCustomConditions = false;
} }
if (isCustomConditions) if (isCustomConditions)