Commit 840f79a9dd6952deae1447f38cb5af08c2b7851d
1 parent
1d68aa13
fixed modesty setting and language sorting
Showing
1 changed file
with
13 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -6424,11 +6424,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data |
6424 | 6424 | $("#modelsettingsbackground").css("display", "none"); |
6425 | 6425 | } |
6426 | 6426 | $rootScope.CloseSetting = function () { |
6427 | - // $rootScope.errorMessage = LoginMessageConstants.INVALID_USER; | |
6427 | + if($rootScope.isApplyBtnClicked) | |
6428 | + { | |
6428 | 6429 | $("#saveSettingsMessageModal").modal('show'); |
6429 | 6430 | $("#saveSettingsMessageModal").css('zIndex', 80000000000); |
6430 | - //$('#modal-settings').css("display", "none"); | |
6431 | - //$("#modelsettingsbackground").css("display", "none"); | |
6431 | + } | |
6432 | + else | |
6433 | + { | |
6434 | + $rootScope.CancelSetting (); | |
6435 | + } | |
6432 | 6436 | } |
6433 | 6437 | |
6434 | 6438 | $rootScope.saveSettings = function () { |
... | ... | @@ -6560,6 +6564,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data |
6560 | 6564 | $('#primarylaxican').attr("name", $rootScope.primaryLangID); |
6561 | 6565 | } |
6562 | 6566 | } |
6567 | + | |
6568 | + $('#lexiconLangDropdown').html($('#lexiconLangDropdown').find('option').sort(function (x, y) { | |
6569 | + | |
6570 | + return $(x).text() > $(y).text() ? 1 : -1 | |
6571 | + | |
6572 | + })); | |
6563 | 6573 | } |
6564 | 6574 | |
6565 | 6575 | ... | ... |