Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clarify smartblock OR vs AND

Browse source
This commit is contained in:
r 2019-02-03 16:16:47 -06:00
parent eb2d463672
commit b532fe564e
5 changed files with 44 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
View file

@ -25,9 +25,13 @@ function setSmartBlockEvents() {
} else {
div.find('.db-logic-label').text('and').show();
div.removeClass('search-row-or').addClass('search-row-and');
div = div.next().show();
div.children().removeAttr('disabled');
div.find(".modifier_add_link").show();
div = div.next();
if (div.length === 0) {
$(this).hide();
@ -36,7 +40,7 @@ function setSmartBlockEvents() {
appendAddButton();
appendModAddButton();
removeButtonCheck();
disableAndHideDateTimeDropdown(newRowVal);
// disableAndHideDateTimeDropdown(newRowVal);
}
});
@ -76,8 +80,12 @@ function setSmartBlockEvents() {
//remove the 'criteria add' button from new modifier row
newRow.find('#criteria_add').remove();
$(this).parent().after(newRow);
newRow.prev().removeClass('search-row-and').addClass('search-row-or');
newRow.prev().find(".db-logic-label").removeClass('db-logic-label-and').addClass('db-logic-label-or');
reindexElements();
appendAddButton();
appendModAddButton();