ADAM / AIAHTML5

Commit aca3be9d3ee1c98a5471c34a05bb2262571f835f

Authored by Birendra Kumar
1 parent f6103993

bug fixed in AdamImages

Inline Side-by-side
Showing 3 changed files with 12 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @aca3be9
... ... @@ -591,15 +591,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
591 591 {
592 592 $scope.currentPage = 1;
593 593 windowviewid = $rootScope.MULTI_VIEW_ID;
594   - }
595   -
  594 + }
596 595 $scope.DisableUI();
597   - $scope.SetAIwindowStoreData(windowviewid, 'searchAIListViewData', []);
598   - //Modified code by sandeep for fixed issue of ADAM Images
599   - $('ul li span').removeAttr("style");
600   -
601   - $scope.idSelected = '';
602   - $scope.hiderow = false;
  596 +
603 597 var currentSearchtext = $rootScope.getLocalStorageValue("SearchText");
604 598 //localStorage.setItem("SearchText", '');
605 599 localStorage.setItem("SearchByAlphabet", '');
... ... @@ -621,6 +615,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
621 615 return false;
622 616 }
623 617 }
  618 +
  619 + //Modified code by sandeep for fixed issue of ADAM Images
  620 + $('ul li span').removeAttr("style");
  621 +
  622 + $scope.idSelected = '';
  623 + $scope.hiderow = false;
  624 + $scope.SetAIwindowStoreData(windowviewid, 'searchAIListViewData', []);
  625 +
624 626  
625 627 $scope.filterstring = true;
626 628 if (typeof ($scope.query.SearchText) !== "undefined" && ($scope.query.SearchText !== null && $scope.query.SearchText !== "")) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @aca3be9
... ... @@ -5521,7 +5521,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
5521 5521  
5522 5522 // alert("doclick");
5523 5523 // annotation history
5524   - if (event != undefined) {
  5524 + if (event != undefined && (event.target.id).match("canvasDA")) {
5525 5525  
5526 5526 if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
5527 5527  
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @aca3be9
... ... @@ -1444,7 +1444,7 @@ footer .browserIcons
1444 1444 display:none;
1445 1445 }
1446 1446 /* ........Add paging bootstrap CSS... Birendra 14/2/2020 */
1447   -.pagination{margin:20px 0;}
  1447 +.pagination{margin:0px 0;}
1448 1448 .pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
1449 1449 .pagination ul>li{display:inline;}
1450 1450 .pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#ffffff;border:1px solid #dddddd;border-left-width:0;}
... ...