diff --git a/module/testcase/js/create.ui.js b/module/testcase/js/create.ui.js index 93505cfe5a..bdbce9cf70 100644 --- a/module/testcase/js/create.ui.js +++ b/module/testcase/js/create.ui.js @@ -50,20 +50,17 @@ function checkScript() if(!$('#auto').prop('checked')) $('[name=script]').val(''); } -function showUploadScriptBtn() +window.showUploadScriptBtn = function() { - $('#scriptFile').next().show(); + $('[name=scriptFile]').siblings().first().show(); $('[name=script]').val(''); } -function hideUploadScriptBtn() +window.readScriptContent = function(object) { - $('#scriptFile').next().hide(); -} + $('[name=scriptFile]').siblings().first().hide(); -function readScriptContent() -{ var reader = new FileReader(); - reader.readAsText($('#scriptFile')[0].files[0], 'UTF-8'); + reader.readAsText(object.file, 'UTF-8'); reader.onload = function(evt){$('[name=script]').val(evt.target.result);} } diff --git a/module/testcase/ui/create.field.php b/module/testcase/ui/create.field.php index 1911288bb2..e5f811af98 100644 --- a/module/testcase/ui/create.field.php +++ b/module/testcase/ui/create.field.php @@ -49,7 +49,7 @@ $fields->field('scriptFile') ->label($lang->testcase->autoScript) ->className('autoScript') ->hidden(data('case.auto') != 'auto') - ->control('upload', array('accept' => $config->testcase->scriptAcceptFileTypes, 'limitCount' => 1)); + ->control('fileSelector', array('accept' => $config->testcase->scriptAcceptFileTypes, 'multiple' => false, 'onAdd' => jsRaw('window.readScriptContent'), 'onRemove' => jsRaw('window.showUploadScriptBtn'))); $fields->field('script') ->control('hidden') @@ -81,4 +81,4 @@ $fields->field('keywords') $fields->field('files') ->width('full') - ->control('upload'); + ->control('fileSelector'); diff --git a/module/testcase/ui/create.html.php b/module/testcase/ui/create.html.php index 790fbf64e7..77478cb382 100644 --- a/module/testcase/ui/create.html.php +++ b/module/testcase/ui/create.html.php @@ -29,9 +29,6 @@ formGridPanel set::fields($fields), set::loadUrl(helper::createLink('testcase', 'create', "productID={product}&branch={branch}&moduleID={module}")), !empty($gobackLink) ? set::backUrl($gobackLink) : null, - on::change('#scriptFile', 'readScriptContent'), - on::change('#scriptFile', 'hideUploadScriptBtn'), on::change('#story', 'changeStory'), on::click('#auto', 'checkScript'), - on::click('.autoScript .file-delete', 'showUploadScriptBtn') );