ADAM / AIAHTML5

Commit d634241cc084cb824dd2e13ad1ca2a8474ae16a4

Authored by Nikita Kulshreshtha
1 parent 072fb342

issue is fixed but navigator image is not changed on settings change. Need to see

Inline Side-by-side
Showing 2 changed files with 10 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @d634241
... ... @@ -89,7 +89,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
89 89  
90 90 //navigator man functionality
91 91 $scope.navigatorImage;
92   - $scope.NavigatorData;
  92 + $rootScope.NavigatorData;
93 93 $scope.navimgsrc;
94 94  
95 95 $scope.dragdivleft = 0;
... ... @@ -644,12 +644,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
644 644  
645 645 $http({ method: 'GET', url: NavigatorManJsonPath })
646 646 .success(function (data) {
647   - $scope.NavigatorData = data;
  647 + $rootScope.NavigatorData = data;
648 648  
649 649 $scope.skinTone = $rootScope.globalSetting.ethnicity;
650 650  
651 651 var navigatorManData = new jinqJs()
652   - .from($scope.NavigatorData.Navigtor.ViewOrientation)
  652 + .from($rootScope.NavigatorData.Navigtor.ViewOrientation)
653 653 .where("_ViewOrientationId == " + $rootScope.currentBodyViewId)
654 654 .select();
655 655  
... ... @@ -6348,9 +6348,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6348 6348  
6349 6349 //$scope.skinTone = $rootScope.globalSetting.ethnicity;
6350 6350  
6351   - if ($scope.NavigatorData != null || $scope.NavigatorData != undefined) {
  6351 + if ($rootScope.NavigatorData != null || $rootScope.NavigatorData != undefined) {
6352 6352 var navdtlOrient = new jinqJs()
6353   - .from($scope.NavigatorData.Navigtor.ViewOrientation)
  6353 + .from($rootScope.NavigatorData.Navigtor.ViewOrientation)
6354 6354 .where("_ViewOrientationId == " + currentBodyViewId)
6355 6355 .select();
6356 6356  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @d634241
... ... @@ -1927,7 +1927,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1927 1927 }
1928 1928 }
1929 1929  
1930   -
  1930 + $rootScope.prevId = "";
1931 1931 }
1932 1932  
1933 1933 function fillListManagerTerms() {
... ... @@ -2068,7 +2068,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
2068 2068  
2069 2069 }
2070 2070  
2071   - else if (setting.ethnicity != $rootScope.globalSetting.ethnicity) {
  2071 + else if (setting.ethnicity!=null && setting.ethnicity != $rootScope.globalSetting.ethnicity) {
2072 2072  
2073 2073 $rootScope.globalSetting.ethnicity = setting.ethnicity;
2074 2074 localStorage.setItem("globalEthnicity", $rootScope.globalSetting.ethnicity);
... ... @@ -2077,10 +2077,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
2077 2077  
2078 2078 isReloadingViewRequired = true;
2079 2079 }
2080   - else if (setting.modesty != $rootScope.globalSetting.modesty) {
  2080 + else if (setting.modesty!= null && setting.modesty != $rootScope.globalSetting.modesty) {
2081 2081 $rootScope.globalSetting.modesty = setting.modesty;
2082 2082 localStorage.setItem("globalModesty", $rootScope.globalSetting.modesty);
2083 2083  
  2084 + $rootScope.globalSetting.ethnicity = localStorage.getItem("globalEthnicity");
  2085 +
2084 2086 if ($('.modestyImg') != null) {
2085 2087 if (($rootScope.globalSetting.modesty == 'Y')) {
2086 2088 $('.modestyImg').css('visibility', 'visible');
... ...