From 840f79a9dd6952deae1447f38cb5af08c2b7851d Mon Sep 17 00:00:00 2001 From: Birendra Date: Wed, 22 Jul 2020 08:47:25 +0530 Subject: [PATCH] fixed modesty setting and language sorting --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index f36c56c..ab58462 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -6424,11 +6424,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 () { @@ -6560,6 +6564,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 + + })); } -- libgit2 0.21.4