character fix

SweetheartSquad · Mar 13, 2016 · aedb5f9 · aedb5f9
1 parent eefbc26
commit aedb5f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/static/js/scenarioEditor/charView/charView.js b/static/js/scenarioEditor/charView/charView.js
@@ -124,9 +124,11 @@ angular.module('scenarioEditor.charView', ['ngRoute', 'scenarioServices'])
                             textureService.getTextureById(joint.textures[i].id).then(
                                 function (texture) {
                                     try {
-                                        $scope.charToImgMap[char.id][component].push(texture);
+                                        if($scope.charToImgMap.hasOwnProperty(char.id) && $scope.charToImgMap[char.id].hasOwnProperty(component)){
+                                            $scope.charToImgMap[char.id][component].push(texture);
+                                        }
                                     }catch (err){
-                                        console.log(err);
+                                        //console.log(err);
                                     }
                                 },
                                 function (response) {

diff --git a/static/js/scenarioEditor/services.js b/static/js/scenarioEditor/services.js
@@ -1179,7 +1179,6 @@ scenarioServices.service('jointService', ['textureService', '$q', '$http', funct
                 }
                 var path = jointSrc.split("/master");
                 path = path.length > 1 ? path[1] : path[0];
-                console.log(path);
                 $http.get('/scenario/service/gitlab_asset/', {
                     params: {
                         asset: path