ADAM / AIAHTML5

Commit 8f196ca9b0650cbce62cf7f2d76ddf0a766e0054

Authored by Amrita Vishnoi
2 parents 374ba191 005bac88

Merge branch 'searchsettingBugFix' of http://52.6.196.163/ADAM/AIAHTML5 into HighLightIssues

Inline Side-by-side
Showing 3 changed files with 23 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @8f196ca
... ... @@ -440,6 +440,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
440 440  
441 441 $scope.loadSearchDataForBodyView();
442 442  
  443 + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
  444 +
443 445 //2.
444 446  
445 447 console.log('currentBodyViewId just before sending: ' + currentBodyViewId);
... ... @@ -456,7 +458,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
456 458  
457 459 angular.element(document).ready(function () {
458 460  
459   -
460 461 })
461 462  
462 463  
... ... @@ -5261,6 +5262,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5261 5262 canDiv.innerHTML = '';
5262 5263 }
5263 5264 $scope.CalculateImageCordinates($rootScope.viewOrientationId);
  5265 + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
5264 5266 },
5265 5267 function (error) {
5266 5268 // handle errors here
... ... @@ -5304,6 +5306,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5304 5306 //2. load corresponding navigator man
5305 5307 $scope.loadSelectedBodyViewNavigator($rootScope.voId);
5306 5308  
  5309 + //3.Change the popup title next to search
  5310 + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
  5311 +
5307 5312 };
5308 5313  
5309 5314  
... ... @@ -5422,10 +5427,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5422 5427 // $scope.layerNumber = 0;
5423 5428 // debugger;
5424 5429  
5425   - $scope.loadSelectedBodyView($scope.ReloadBodyViewId);
  5430 + console.log('reloadDABodyViewEvent ' + $scope.ReloadBodyViewId);
  5431 +
  5432 + if ($rootScope.isSettingEventAlredayDispachted == true) {
5426 5433  
5427   - $scope.loadSelectedBodyViewNavigator($scope.ReloadBodyViewId);
  5434 + $scope.loadSelectedBodyView($scope.ReloadBodyViewId);
5428 5435  
  5436 + $scope.loadSelectedBodyViewNavigator($scope.ReloadBodyViewId);
  5437 +
  5438 + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
  5439 +
  5440 + $rootScope.isSettingEventAlredayDispachted = false;
  5441 + }
5429 5442  
5430 5443 })
5431 5444  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @8f196ca
... ... @@ -456,12 +456,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
456 456  
457 457 //1.
458 458 if (typeof (setting.ethnicity) !== "undefined" && setting.ethnicity !== null) {
  459 + $rootScope.ChangeEthnicity(setting, setting.ethnicity);
459 460 $rootScope.globalSetting.ethnicity = setting.ethnicity;
460   - $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
  461 + //$rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
461 462 }
462 463 if (typeof (setting.modesty) !== "undefined" && setting.modesty !== null) {
  464 + $rootScope.ChangeEthnicity(setting, setting.ethnicity);
463 465 $rootScope.globalSetting.modesty = setting.modesty;
464   - $rootScope.setModestySettings($rootScope.globalSetting.modesty);
  466 + //$rootScope.setModestySettings($rootScope.globalSetting.modesty);
465 467 }
466 468  
467 469 //2.
... ... @@ -488,6 +490,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
488 490 if ($rootScope.openViews.length > 0) {
489 491 var openViewLen = $rootScope.openViews.length;
490 492 var currentOpenViewId = $rootScope.openViews[openViewLen - 1].BodyViewId;
  493 + $rootScope.isSettingEventAlredayDispachted = true;
491 494 $rootScope.$broadcast('reloadDABodyViewEvent', { reloadDABodyViewId: currentOpenViewId });
492 495 }
493 496 else {
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @8f196ca
... ... @@ -201,7 +201,8 @@
201 201  
202 202 <div id="backdrop" ng-show="IsSearchVisible">
203 203 <div class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
204   - <ul id="termlistfilter" class="form-control dropdown-menu" style="height:100px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
  204 + <!--#Bug 6591-->
  205 + <ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
205 206 <li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">
206 207 <a id="{{item._ActualTermNumber}}" href="" ng-click="jumpToTerm($event)">{{item._TermText}}</a>
207 208 </li>
... ...