[TIC-Web] add error message and Util function

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

diff --git a/public/src/js/page/job.js b/public/src/js/page/job.js
index 2593411..a1146f2 100644 (file)
--- a/public/src/js/page/job.js
+++ b/public/src/js/page/job.js
@@ -277,50 +277,31 @@ define([
              */
             function addAnImage(arrFileInfo) {
                 return new Promise(function (resolve, reject) {
-                    var imageInfo;
-
                     /**
                      * imageInfo
                      * @type {Object}
                      */
-                    imageInfo = _.find(arrFileInfo, {name: AppConfig.TIC_WEB.IMAGE_FILE_NAME});
+                    var imageInfo = _.find(arrFileInfo, {name: AppConfig.TIC_WEB.IMAGE_FILE_NAME});
                     logger.info('IMAGE_ADD_FINISH.addAnImage: ' + JSON.stringify(imageInfo));
 
-                    if (imageInfo.type === 'file') {
-                        var msgObj = {
-                            image_name: imageInfo.name,
-                            image_type: 'external',
-                            image_size: imageInfo.size
-                        };
-
-                        Util.POST(AppConfig.EVENT.IMAGE.IMAGE_ADD_ONE, msgObj)
-                        .then(function (data) {
-                            resolve(data);
-                        }).catch(function (err) {
-                            reject(err);
-                        });
-                    } else {
-                        reject();
+                    if (imageInfo.type !== 'file') {
+                        reject('This is not a valid image file');
                     }
+                    var msgObj = {
+                        image_name: imageInfo.name,
+                        image_type: 'external',
+                        image_size: imageInfo.size
+                    };
+
+                    Util.POST(AppConfig.EVENT.IMAGE.IMAGE_ADD_ONE, msgObj)
+                    .then(resolve, reject);
                 });
             }
 
             function getAnImageInfo() {
-                return new Promise(function (resolve, reject) {
-                    var url = AppConfig.TIC_WEB.PATH_ABSTRACT + jobId;
-                    logger.info('IMAGE_ADD_FINISH.getAnImageInfo: ' + url);
-
-                    $.ajax(url, {
-                        type: 'GET',
-                        dataType: 'json',
-                        success: function(data) { 
-                            resolve(data);
-                        },
-                        error  : function(err) { 
-                            reject(err);
-                        }
-                    });
-                });
+                var url = AppConfig.TIC_WEB.PATH_ABSTRACT + jobId;
+                logger.info('IMAGE_ADD_FINISH.getAnImageInfo: ' + url);
+                return Util.GET(url);
             }
 
             return getAnImageInfo()