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

[SSE mobile] Fix apply empty filter for tablet

Browse source
This commit is contained in:
Julia Svinareva 2019-06-25 12:54:06 +03:00
parent 25e31625b3
commit d405993747
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
apps/spreadsheeteditor/mobile/app/controller/FilterOptions.js
View file

@ -104,21 +104,7 @@ define([
} }
}).on('close', function (e) { }).on('close', function (e) {
mainView.showNavbar(); mainView.showNavbar();
var isValid = true; me.isValidChecked();
if (indChecked.length === indChecked.filter(function (item) {return item === false;}).length) {
isValid = false;
}
if(!isValid) {
uiApp.modal({
title : me.textErrorTitle,
text : me.textErrorMsg,
buttons: [
{
text: 'OK',
}
]
});
}
}).on('closed', function () { }).on('closed', function () {
if (_.isFunction(me.api.asc_OnHideContextMenu)) { if (_.isFunction(me.api.asc_OnHideContextMenu)) {
me.api.asc_OnHideContextMenu() me.api.asc_OnHideContextMenu()
@ -140,6 +126,9 @@ define([
var $target = $('#context-menu-target') var $target = $('#context-menu-target')
.css({left: posX, top: Math.max(0, posY)}); .css({left: posX, top: Math.max(0, posY)});
modalView = uiApp.popover(popoverHTML, $target); modalView = uiApp.popover(popoverHTML, $target);
$$(modalView).on('close', function (e) {
me.isValidChecked();
});
if (Common.SharedSettings.get('android')) { if (Common.SharedSettings.get('android')) {
Common.Utils.androidMenuTop($(modalView), $target); Common.Utils.androidMenuTop($(modalView), $target);
} }
@ -161,6 +150,25 @@ define([
SSE.getController('Toolbar').getView('Toolbar').hideSearch(); SSE.getController('Toolbar').getView('Toolbar').hideSearch();
}, },
isValidChecked: function () {
var me = this,
isValid = true;
if (indChecked.length === indChecked.filter(function (item) {return item === false;}).length) {
isValid = false;
}
if(!isValid) {
uiApp.modal({
title : me.textErrorTitle,
text : me.textErrorMsg,
buttons: [
{
text: 'OK',
}
]
});
}
},
rootView : function() { rootView : function() {
return rootView; return rootView;
}, },