this is solution for the bug 23952

Mukul Rajput
1 parent 2c208565
Showing 2 changed files with 14 additions and 15 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -42,7 +42,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     // on refersh this variable will also get null that is why we are only checking this variable on initialize that if it is null that means page gets refershed.
     $rootScope.refreshcheck = null;
-
+    $rootScope.isCloseSettingClicked = false;
     $rootScope.isModestyOn;
@@ -4003,8 +4003,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
     $rootScope.ChangeEthnicity = function (formsetting, skintone) {
-        formsetting.ethnicity = skintone;
+       
+        if ($rootScope.isCloseSettingClicked == true) {
+            formsetting.ethnicity = localStorage.getItem("globalEthnicity");
+            $rootScope.isCloseSettingClicked = false;
+        }
+        else {
+            formsetting.ethnicity = skintone;
+        }
         $rootScope.setEthncitySettings(formsetting.ethnicity);
+       
+    
     }
@@ -4015,7 +4024,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
     $rootScope.isApplyBtnClicked = false;
     $rootScope.CloseSetting = function () {
-      
+        $rootScope.isCloseSettingClicked = true;
         $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
         $rootScope.setModestySettings($rootScope.globalSetting.modesty);
         if ($rootScope.isApplyBtnClicked == false) {
@@ -4051,17 +4060,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     };
-    $rootScope.CloseSettingPopup = function () {
-        if ($rootScope.isApplyBtnClicked == false) {
-            $rootScope.deSelectLanguageOptions();
-        }
-        else {
-            $rootScope.isApplyBtnClicked = false;
-        }
-        $('#modal-settings').css("display", "none");
-        $("#modelsettingsbackground").css("display", "none");
-    }
-
+   
     $rootScope.deSelectLanguageOptions = function () {
         var languageDifference = ($rootScope.lexiconLanguageArrayLength) - ($rootScope.lexiconLanguageArray.length);
@@ -472,7 +472,7 @@
                     <form>
                         <div ng-init="loadsettings()" class="modal-content" id="setting-modal-dark">
                             <div class="modal-header annotation-modal-header">
-                                <button type="button" class="close" data-dismiss="modal" ng-click="CloseSettingPopup()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                                <button type="button" class="close" data-dismiss="modal" ng-click="CloseSetting()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                                 <h4 class="modal-title" id="myModalLabel2">Settings</h4>
                             </div>
                             <div class="modal-body">