From a7f151c7f970b1dfc3dd6e39354c4ba0404a720b Mon Sep 17 00:00:00 2001 From: "Heekyoung, Oh" Date: Tue, 21 Mar 2017 20:14:36 +0900 Subject: [PATCH] [TIC-Web] Update The Cancel function For The Job - Modify the function that job cancellation. Change-Id: Ida3082ad2fa684583f33f5a9e2e240a1b8564a22 Signed-off-by: Heekyoung, Oh --- public/src/css/style.css | 1 + public/src/js/page/job.js | 9 ++++++++- public/src/js/page/package.js | 6 ------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/public/src/css/style.css b/public/src/css/style.css index f74765e..4f86ef9 100644 --- a/public/src/css/style.css +++ b/public/src/css/style.css @@ -207,6 +207,7 @@ body { } #tic-job-list .btncancel { background-color: darkslategray; + cursor: pointer; } .empty_job_table_row > td { height: 40px; diff --git a/public/src/js/page/job.js b/public/src/js/page/job.js index 5709706..5dea968 100644 --- a/public/src/js/page/job.js +++ b/public/src/js/page/job.js @@ -66,10 +66,17 @@ define([ }); // bind events - $('#tic-job-list a.btnbiglog').on('click', function (e) { + $('#tic-job-table a.btnbiglog').on('click', function (e) { e.preventDefault(); Util.showBigLogView(this); }); + + // bind events - cancel button + $('#tic-job-table a.btncancel').on('click', function (e) { + e.preventDefault(); + $(this).addClass('btnnotactive'); + client.emit(AppConfig.EVENT.SOCKET.FS_IMAGE_ADD_KILL); + }); } }); } diff --git a/public/src/js/page/package.js b/public/src/js/page/package.js index 6584065..d3219b0 100644 --- a/public/src/js/page/package.js +++ b/public/src/js/page/package.js @@ -71,12 +71,6 @@ define([ pathKsFile = newJobModel.getJobKsPath(); imageName = pathKsFile.substring(pathKsFile.lastIndexOf('/')+1, pathKsFile.lastIndexOf('.')); - /** - * FIXME - * - * imageArch - */ - // options for the creation var msgData = { jobId: newJobModel.getJobId(), -- 2.7.4