diff --git a/module/branch/js/manage.ui.js b/module/branch/js/manage.ui.js index 80bfc397ba..6765b10de4 100644 --- a/module/branch/js/manage.ui.js +++ b/module/branch/js/manage.ui.js @@ -63,17 +63,16 @@ $(document).on('click', '.batch-btn', function() /** * Set create branch form. * - * @param element obj * @access public * @return void */ -function createBranch(obj) +function createBranch() { $('#createForm input, #createForm textarea').attr('disabled', true); $('input[name=targetBranch]').removeAttr('disabled'); $('#createForm').addClass('hidden'); - const createNew = $(obj).is(':checked'); + const createNew = $(this).is(':checked'); if(createNew) { $('#createForm input, #createForm textarea').removeAttr('disabled'); diff --git a/module/branch/ui/manage.html.php b/module/branch/ui/manage.html.php index 8a05882a5a..73d149cd11 100644 --- a/module/branch/ui/manage.html.php +++ b/module/branch/ui/manage.html.php @@ -60,11 +60,11 @@ modal inputGroup ( setClass('input-control has-suffix'), - select + picker ( set::name('targetBranch'), set::items($branchPairs), - set::type('picker'), + set::required(true), ), div ( @@ -75,7 +75,7 @@ modal set::name('createBranch'), set::text($lang->branch->create), set::value(1), - on::change('createBranch(this)'), + on::change('createBranch'), ) ) ), @@ -124,9 +124,9 @@ if($canBatchEdit) if($canMerge && $browseType != 'closed') { $footToolbar['items'][] = array( - 'id' => 'mergeBranch', + 'attrs' => array('id' => 'mergeBranch'), 'text' => $lang->branch->merge, - 'class' => 'btn secondary size-sm', + 'className' => 'btn secondary size-sm', 'data-target' => '#mergeModal', 'data-toggle' => 'modal' );