Commit b382d9892dcfa3e14c885e085441ca6b41d67954
1 parent
42145e34
Resolve Conflict For AA
Showing
1 changed file
with
1 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
| @@ -1151,7 +1151,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -1151,7 +1151,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
| 1151 | else { | 1151 | else { |
| 1152 | 1152 | ||
| 1153 | angular.forEach(clickedPins, function (value, key) { | 1153 | angular.forEach(clickedPins, function (value, key) { |
| 1154 | - | 1154 | + |
| 1155 | if (aaPinData != null && aaPinData.length > 0) { | 1155 | if (aaPinData != null && aaPinData.length > 0) { |
| 1156 | 1156 | ||
| 1157 | var pinData = new jinqJs() | 1157 | var pinData = new jinqJs() |