diff --git a/module/todo/css/create.css b/module/todo/css/create.css new file mode 100644 index 0000000000..71c2d8c97b --- /dev/null +++ b/module/todo/css/create.css @@ -0,0 +1 @@ +#begin_chosen{width:50% !important;} diff --git a/module/todo/css/edit.css b/module/todo/css/edit.css new file mode 100644 index 0000000000..71c2d8c97b --- /dev/null +++ b/module/todo/css/edit.css @@ -0,0 +1 @@ +#begin_chosen{width:50% !important;} diff --git a/module/todo/js/batchcreate.js b/module/todo/js/batchcreate.js index a0e22a5f00..31feb94146 100644 --- a/module/todo/js/batchcreate.js +++ b/module/todo/js/batchcreate.js @@ -17,12 +17,12 @@ function switchDateList(number) { if($('#switchDate' + number).attr('checked') == 'checked') { - $('#begins' + number).attr('disabled', 'disabled'); - $('#ends' + number).attr('disabled', 'disabled'); + $('#begins' + number).attr('disabled', 'disabled').trigger('chosen:updated'); + $('#ends' + number).attr('disabled', 'disabled').trigger('chosen:updated'); } else { - $('#begins' + number).removeAttr('disabled'); - $('#ends' + number).removeAttr('disabled'); + $('#begins' + number).removeAttr('disabled').trigger('chosen:updated'); + $('#ends' + number).removeAttr('disabled').trigger('chosen:updated'); } } diff --git a/module/todo/js/common.js b/module/todo/js/common.js index 956e2254ff..a9c90ecc98 100644 --- a/module/todo/js/common.js +++ b/module/todo/js/common.js @@ -62,6 +62,7 @@ function loadList(type, id) function selectNext() { $("#end ")[0].selectedIndex = $("#begin ")[0].selectedIndex + 3; + $('#end').trigger('chosen:updated'); } function setBeginsAndEnds(i, beginOrEnd) @@ -72,6 +73,7 @@ function setBeginsAndEnds(i, beginOrEnd) { if(j != 0) $("#begins" + j)[0].selectedIndex = $("#ends" + (j - 1))[0].selectedIndex; $("#ends" + j)[0].selectedIndex = $("#begins" + j)[0].selectedIndex + 3; + $("#ends" + j).trigger('chosen:updated'); } } else @@ -79,11 +81,14 @@ function setBeginsAndEnds(i, beginOrEnd) if(beginOrEnd == 'begin') { $("#ends" + i)[0].selectedIndex = $("#begins" + i)[0].selectedIndex + 3; + $("#ends" + j).trigger('chosen:updated'); } for(j = i+1; j < batchCreateNum; j++) { $("#begins" + j)[0].selectedIndex = $("#ends" + (j - 1))[0].selectedIndex; $("#ends" + j)[0].selectedIndex = $("#begins" + j)[0].selectedIndex + 3; + $("#begins" + j).trigger('chosen:updated'); + $("#ends" + j).trigger('chosen:updated'); } } } @@ -92,12 +97,12 @@ function switchDateFeature(switcher) { if(switcher.checked) { - $('#begin').attr('disabled','disabled'); - $('#end').attr('disabled','disabled'); + $('#begin').attr('disabled','disabled').trigger('chosen:updated'); + $('#end').attr('disabled','disabled').trigger('chosen:updated'); } else { - $('#begin').removeAttr('disabled'); - $('#end').removeAttr('disabled'); + $('#begin').removeAttr('disabled').trigger('chosen:updated'); + $('#end').removeAttr('disabled').trigger('chosen:updated'); } } diff --git a/module/todo/js/create.js b/module/todo/js/create.js index 5022d01b81..91a2c08398 100644 --- a/module/todo/js/create.js +++ b/module/todo/js/create.js @@ -5,6 +5,7 @@ $(function() { var selectTime = $(this).val() != today ? start : nowTime; $('#begin').val(selectTime); + $('#begin').trigger("chosen:updated"); selectNext(); }) diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php index f7eaa180e4..12f4634d41 100755 --- a/module/todo/view/batchcreate.html.php +++ b/module/todo/view/batchcreate.html.php @@ -40,7 +40,7 @@