From c20b7e7a5c604cf8673574a234fb7c899c9ea2c6 Mon Sep 17 00:00:00 2001 From: z Date: Fri, 9 Oct 2020 13:20:00 +0800 Subject: [PATCH] * finish task #8072. --- module/job/js/create.js | 4 +--- module/job/js/edit.js | 4 +--- module/job/view/create.html.php | 2 +- module/job/view/edit.html.php | 2 +- www/theme/default/style.css | 2 ++ 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/module/job/js/create.js b/module/job/js/create.js index f299816283..20d93c09ed 100644 --- a/module/job/js/create.js +++ b/module/job/js/create.js @@ -100,13 +100,11 @@ $('#jkHost').change(function() $('#jkJobBox .loading').remove(); $('#jkJobBox .input-group').append(html); - var dropDirection = $('#jkJobBox #jkJob option').length > 2 ? 'up' : 'auto'; - $('#jkJobBox #jkJob').chosen({drop_direction: dropDirection}); + $('#jkJobBox #jkJob').chosen({drop_direction: 'auto'}); }) }) $(function() { - $('#jkHost').chosen({drop_direction: $('#jkHost option').length > 3 ? 'up' : 'auto'}); $('#triggerType').change(); }); diff --git a/module/job/js/edit.js b/module/job/js/edit.js index aacfdb51f8..4b30331753 100644 --- a/module/job/js/edit.js +++ b/module/job/js/edit.js @@ -104,14 +104,12 @@ $('#jkHost').change(function() $('#jkJobBox .loading').remove(); $('#jkJobBox .input-group').append(html); - var dropDirection = $('#jkJobBox #jkJob option').length > 2 ? 'up' : 'auto'; - $('#jkJobBox #jkJob').val(jkJob).chosen({drop_direction: dropDirection}); + $('#jkJobBox #jkJob').val(jkJob).chosen({drop_direction: 'auto'}); }) }) $(function() { - $('#jkHost').chosen({drop_direction: $('#jkHost option').length > 3 ? 'up' : 'auto'}); $('#jkHost').change(); $('#triggerType').change(); }); diff --git a/module/job/view/create.html.php b/module/job/view/create.html.php index f3bccad3a1..f25dd6dd54 100644 --- a/module/job/view/create.html.php +++ b/module/job/view/create.html.php @@ -76,7 +76,7 @@ job->jkHost; ?>
-
+
job->jkJob; ?> diff --git a/module/job/view/edit.html.php b/module/job/view/edit.html.php index 524a85b615..fbc5a36da6 100644 --- a/module/job/view/edit.html.php +++ b/module/job/view/edit.html.php @@ -99,7 +99,7 @@ job->jkHost; ?>
-
jkHost, "class='form-control'");?>
+
jkHost, "class='form-control chosen'");?>
job->jkJob; ?> diff --git a/www/theme/default/style.css b/www/theme/default/style.css index aa85484a05..26c7654940 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -58,3 +58,5 @@ a.showMoreImage:hover{opacity: 1;} .color-darkblue:hover{background:rgb(0,0,139)} .color-darkblue:focus{background:rgb(0,0,139)} .margin-l-50px{margin-left:50px;} + +.chosen-container .chosen-drop{z-index: 1100;}