after changing code for modesty. Navigator image was not reflected on skintone/ modesty change.

Remove angular binding from navImg and added src attribute when we get nav image src. Also added new event for changing Nav image on modesty change only.

after changing code for modesty. Navigator image was not reflected on skintone/ modesty change.
Remove angular binding from navImg and added src attribute when we get nav image src. Also added new event for changing Nav image on modesty change only.
Nikita Kulshreshtha
1 parent d634241c
Showing 3 changed files with 18 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -684,7 +684,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     navImageModesty = $scope.navigatorImage[0]._ImageName;
                 }
-                $scope.navimgsrc = "~/../content/images/DA/ethnicity/body-views/" + $scope.voId + '/' + $scope.skinTone + '/navigator_images/' + navImageModesty;
+               // $scope.navimgsrc = "~/../content/images/DA/ethnicity/body-views/" + $scope.voId + '/' + $scope.skinTone + '/navigator_images/' + navImageModesty;
+                document.getElementById('navimg').src = "~/../content/images/DA/ethnicity/body-views/" + $scope.voId + '/' + $scope.skinTone + '/navigator_images/' + navImageModesty;
                 $('#navigatorDiv').css('visibility', 'visible');
@@ -6317,6 +6318,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     })
+    $scope.$on('changeNavigatorModestyEvent', function (event, data) {
+        console.log('changeNavigatorModestyEvent');
+
+        $scope.loadSelectedBodyViewNavigator(data.bodyViewId);
+
+    })
     //Reload DA controller Body View after setting Change
     $scope.$on('reloadDABodyViewEvent', function (event, data) {
         //console.log('reloadDABodyViewEvent');
@@ -6380,7 +6387,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     }
-                    $scope.navimgsrc = "~/../content/images/DA/ethnicity/body-views/" + $scope.voId + '/' + $rootScope.globalSetting.ethnicity + '/navigator_images/' + navImageModesty;
+                   // $scope.navimgsrc = 'http://localhost/AIAHTML5/content/images/DA/ethnicity/body-views/' + $scope.voId + '/' + $rootScope.globalSetting.ethnicity + '/navigator_images/' + navImageModesty;//"~/../content/images/DA/ethnicity/body-views/" + $scope.voId + '/' + $rootScope.globalSetting.ethnicity + '/navigator_images/' + navImageModesty;
+                    document.getElementById('navimg').src = '~/../content/images/DA/ethnicity/body-views/' + $scope.voId + '/' + $rootScope.globalSetting.ethnicity + '/navigator_images/' + navImageModesty;//"~/../content/images/DA/ethnicity/body-views/" + $scope.voId + '/' + $rootScope.globalSetting.ethnicity + '/navigator_images/' + navImageModesty;
                 }
             }
@@ -2092,6 +2092,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                         $('.modestyImg').css('visibility', 'hidden');
                     }
                 }
+                $rootScope.changeNavigatorModesty();
             }
             //4.
@@ -2121,7 +2122,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                 //Check that what current bodyview is open
                 if ($rootScope.openViews.length > 0) {
                     var openViewLen = $rootScope.openViews.length;
-                    var currentOpenViewId = $rootScope.openViews[openViewLen - 1].BodyViewId;
+                    var currentOpenViewId = localStorage.getItem("currentBodyViewId");//$rootScope.openViews[openViewLen - 1].BodyViewId;
                     $rootScope.isSettingEventAlredayDispachted = true;
                     $rootScope.$broadcast('reloadDABodyViewEvent', { reloadDABodyViewId: currentOpenViewId }, true);
                 }
@@ -2132,6 +2133,11 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             }
         };
+        $rootScope.changeNavigatorModesty = function () {
+            var currentOpenViewId = localStorage.getItem("currentBodyViewId");//$rootScope.openViews[openViewLen - 1].BodyViewId;
+            $rootScope.$broadcast('changeNavigatorModestyEvent', { bodyViewId: currentOpenViewId }, true);
+
+        };
     }]
 );
 \ No newline at end of file
@@ -313,7 +313,7 @@
                         <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; ">
                             <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; ">
-                                <img id="navimg" ng-src="{{navimgsrc}}" alt=""></img>
+                                <img id="navimg" alt=""></img>
                                 <div id="draggable" class="draggable ui-widget-content" ng-mouseup="ScrollCanvasDiv()" ng-style="dragdivposition">
                                 </div>
                             </div>