Merge branch 'Develop' into QA

Amrita Vishnoi
2 parents 471fc117 8c8ed024
Showing 2 changed files with 19 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
@@ -4041,7 +4041,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.deSelectLanguageOptions = function () {
-            var languageDifference = ($rootScope.lexiconLanguageArrayLength) - ($rootScope.lexiconLanguageArray.length);
+        var languageDifference = ($rootScope.lexiconLanguageArrayLength) - ($rootScope.lexiconLanguageArray.length);
+         languageDifference = parseInt(languageDifference);
             if (languageDifference > 0) {
                 for (var i = 0; i <= $rootScope.lexiconRemovedLanguage.length - 1; i++) {
                     $("#lexiconLangDropdown option").each(function () {
@@ -4086,19 +4087,23 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                     $('#lexiconLangDropdown').append('<option val="' + $rootScope.lexiconLanguageArray[lexiconArrayLength - 1].id + '">' + $rootScope.lexiconLanguageArray[lexiconArrayLength - 1].language + '</option>');
                     $rootScope.lexiconLanguageArray.pop();
                 }
-
-                $rootScope.lexiconLanguageArray[0].id = $rootScope.primaryLangID;
-                $rootScope.lexiconLanguageArray[0].language = $rootScope.lexiconPrimaryLanguage;
-                $("#lexiconLangDropdown option").each(function () {
-                    if ($rootScope.lexiconPrimaryLanguage == $(this).val()) {
-                        $(this).remove();
-                    }
-                })
-                $('#lexiconLangDropdown').append('<option val="' + $('#primarylaxican').attr("name") + '">' + $("#primarylaxican").val() + '</option>');
-                $("#primarylaxican").val($rootScope.lexiconPrimaryLanguage);
-                $('#primarylaxican').attr("name", $rootScope.primaryLangID);
+                if ($rootScope.lexiconPrimaryLanguage == $("#primarylaxican").val()) {
+                }
+                else
+                {
+                    $rootScope.lexiconLanguageArray[0].id = $rootScope.primaryLangID;
+                    $rootScope.lexiconLanguageArray[0].language = $rootScope.lexiconPrimaryLanguage;
+                    $("#lexiconLangDropdown option").each(function () {
+                        if ($rootScope.lexiconPrimaryLanguage == $(this).val()) {
+                            $(this).remove();
+                        }
+                    })
+                    $('#lexiconLangDropdown').append('<option val="' + $('#primarylaxican').attr("name") + '">' + $("#primarylaxican").val() + '</option>');
+                    $("#primarylaxican").val($rootScope.lexiconPrimaryLanguage);
+                    $('#primarylaxican').attr("name", $rootScope.primaryLangID);
+                }
             }
-          
+
             else if (languageDifference == 0) {
                 if ($rootScope.lexiconPrimaryLanguage == $("#primarylaxican").val()) {
                     // alert("same name");
-<div class="bodyWrap row ">
+<div class="bodyWrap row ">
     <div ng-include="'app/widget/MainMenu.html'" />
     <div class="main" ng-init="loadForModuleById(1)">
         <!--<div class="main">-->