[TIC-Web] fix for duplicat module loading

- fix the define name

Change-Id: I484095bdc41d5d3bcc34db430a169d123492c88c
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

diff --git a/public/src/css/style.css b/public/src/css/style.css
index ef413e4..6197c17 100644 (file)
--- a/public/src/css/style.css
+++ b/public/src/css/style.css
@@ -225,6 +225,7 @@ body {
 td.extended_job_table_container > div {
     width: 100%;
     height: 100%;
+    text-align: left;
     overflow: auto;
 }
 td.extended_job_table_container {

diff --git a/public/src/js/main.js b/public/src/js/main.js
index f2b175c..e93705d 100644 (file)
--- a/public/src/js/main.js
+++ b/public/src/js/main.js
@@ -6,6 +6,7 @@ define([
     'js/page/login',
     'js/page/package',
     'js/page/settings',
+    'js/page/job',
     'js/page/image',
     'js/logger'
 ], function (
@@ -16,6 +17,7 @@ define([
     Login,
     Package,
     Settings,
+    Job,
     Image,
     Logger
 ) {

diff --git a/public/src/js/model/JobModel.js b/public/src/js/model/JobModel.js
index d92df85..ecc2473 100644 (file)
--- a/public/src/js/model/JobModel.js
+++ b/public/src/js/model/JobModel.js
@@ -3,7 +3,7 @@ define([
     'lodash',
     'js/util',
     'js/logger',
-    './JobStatusModel'
+    'js/model/JobStatusModel'
 ], function (
     $,
     _,

diff --git a/public/src/js/page/image.js b/public/src/js/page/image.js
index 1b5bf38..d27f20d 100644 (file)
--- a/public/src/js/page/image.js
+++ b/public/src/js/page/image.js
@@ -3,11 +3,11 @@ define([
     'lodash',
     'js/util',
     'js/logger',
-    '../model/ImageModel',
-    '../model/JobPagingModel',
-    '../widget/JobPaging',
-    '../widget/ImageEmptyItem',
-    '../widget/ImageItem',
+    'js/model/ImageModel',
+    'js/model/JobPagingModel',
+    'js/widget/JobPaging',
+    'js/widget/ImageEmptyItem',
+    'js/widget/ImageItem',
 ], function (
     $,
     _,

diff --git a/public/src/js/page/job.js b/public/src/js/page/job.js
index 7651d4a..1d1be0d 100644 (file)
--- a/public/src/js/page/job.js
+++ b/public/src/js/page/job.js
@@ -3,27 +3,25 @@ define([
     'lodash',
     'js/util',
     'js/logger',
-    '../model/JobModel',
-    '../model/JobPagingModel',
-    '../widget/JobPaging',
-    '../widget/JobTableItem',
-    '../widget/JobTableEmptyItem',
-    '../widget/JobLog',
-    './image',
-    './login'
+    'js/page/image',
+    'js/model/JobModel',
+    'js/model/JobPagingModel',
+    'js/widget/JobPaging',
+    'js/widget/JobTableItem',
+    'js/widget/JobTableEmptyItem',
+    'js/widget/JobLog'
 ], function (
     $,
     _,
     Util,
     Logger,
+    Image,
     JobModel,
     JobPagingModel,
     JobPaging,
     JobTableItem,
     JobTableEmptyItem,
-    JobLog,
-    Image,
-    Login
+    JobLog
 ) {
     'use strict';
 
@@ -381,7 +379,7 @@ define([
             imageArch: paramObj.imageArch
         };
         client.emit(AppConfig.EVENT.SOCKET.FS_IMAGE_ADD_FROM, msgData);
-        Login.updatePermission();
+        updateList();
     }
 
     /**

diff --git a/public/src/js/page/login.js b/public/src/js/page/login.js
index f38b114..7aca463 100644 (file)
--- a/public/src/js/page/login.js
+++ b/public/src/js/page/login.js
@@ -3,8 +3,8 @@ define([
     'bootstrap-validator',
     'js/util',
     'js/logger',
-    './job',
-    './image'
+    'js/page/job',
+    'js/page/image'
 ], function (
     $,
     BootstrapValidator,

diff --git a/public/src/js/page/package.js b/public/src/js/page/package.js
index ba7a516..8d63835 100644 (file)
--- a/public/src/js/page/package.js
+++ b/public/src/js/page/package.js
@@ -5,8 +5,8 @@ define([
     'js/util',
     'js/page/settings',
     'js/logger',
-    './job.js',
-    '../model/JobModel'
+    'js/page/job',
+    'js/model/JobModel'
 ], function (
     $,
     _,