bug fixed in AdamImages

Birendra Kumar
1 parent f6103993
Showing 3 changed files with 12 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -591,15 +591,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         {
             $scope.currentPage = 1;
             windowviewid = $rootScope.MULTI_VIEW_ID;
-        }
-           
+        }           
         $scope.DisableUI();
-        $scope.SetAIwindowStoreData(windowviewid, 'searchAIListViewData', []);
-        //Modified code by sandeep for fixed issue of ADAM Images
-        $('ul li span').removeAttr("style");
-        
-        $scope.idSelected = '';
-        $scope.hiderow = false; 
+      
         var currentSearchtext = $rootScope.getLocalStorageValue("SearchText");
         //localStorage.setItem("SearchText", '');       
         localStorage.setItem("SearchByAlphabet", '');
@@ -621,6 +615,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                 return false;
             }
         }
+
+        //Modified code by sandeep for fixed issue of ADAM Images
+        $('ul li span').removeAttr("style");
+
+        $scope.idSelected = '';
+        $scope.hiderow = false;
+        $scope.SetAIwindowStoreData(windowviewid, 'searchAIListViewData', []);
+
         $scope.filterstring = true;
         if (typeof ($scope.query.SearchText) !== "undefined" && ($scope.query.SearchText !== null && $scope.query.SearchText !== "")) {
@@ -5521,7 +5521,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         //  alert("doclick");
         // annotation history
-        if (event != undefined) {
+        if (event != undefined && (event.target.id).match("canvasDA")) {
             if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
@@ -1444,7 +1444,7 @@ footer .browserIcons
      display:none;
 }
 /*  ........Add paging bootstrap CSS...  Birendra 14/2/2020 */
-.pagination{margin:20px 0;}
+.pagination{margin:0px 0;}
 .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);}
 .pagination ul>li{display:inline;}
 .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;}