* generalID, generalName 동작 안하는 문제 해결

* Event 관련 클래스 표기 실수 해결
2018-04-02 01:50:21 +09:00
parent 0cac139f65
commit c0e2ed7013
7 changed files with 26 additions and 22 deletions
@@ -33,21 +33,21 @@ function reloadWorldMap(option){
    var cityPosition = getCityPosition();

    //OBJ : startYear, year, month, cityList, nationList, spyList, shownByGeneralList, myCity
-    
-
-    var deferred;

    function checkReturnObject(obj){
        if(!obj.result){
-            deferred.reject();
-            return;
+            var obj = $.Deferred();
+            obj.reject('fail');
+            return obj.promise();
        }

        if(!$.isNumeric(obj.startYear)
            ||!$.isNumeric(obj.year)
-            ||!$.isNumeric(obj.month)){
-            deferred.reject();
-            return;
+            ||!$.isNumeric(obj.month)
+        ){
+            var obj = $.Deferred();
+            obj.reject('fail');
+            return obj.promise();
        }

        return obj;
@@ -504,7 +504,7 @@ function reloadWorldMap(option){
    }

    //deferred mode of jQuery. != promise-then.
-    deferred = $.ajax({
+    var deferred = $.ajax({
        url: option.targetJson,
        type: 'post',
        dataType:'json',