Merge branch 'CbNewUpdate' into CADirectLink

Birendra
2 parents e2476de0 840f79a9
Showing 1 changed file with 13 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -6456,11 +6456,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         $("#modelsettingsbackground").css("display", "none");
     }
     $rootScope.CloseSetting = function () {
-      //  $rootScope.errorMessage = LoginMessageConstants.INVALID_USER;
+      if($rootScope.isApplyBtnClicked)
+      {
         $("#saveSettingsMessageModal").modal('show');
         $("#saveSettingsMessageModal").css('zIndex', 80000000000);
-        //$('#modal-settings').css("display", "none");
-        //$("#modelsettingsbackground").css("display", "none");
+      }
+      else
+      {
+        $rootScope.CancelSetting ();
+      }
     }
  
     $rootScope.saveSettings = function () {
@@ -6592,6 +6596,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                 $('#primarylaxican').attr("name", $rootScope.primaryLangID);
             }
         }
+        
+        $('#lexiconLangDropdown').html($('#lexiconLangDropdown').find('option').sort(function (x, y) {
+
+            return $(x).text() > $(y).text() ? 1 : -1
+
+        }));
     }