Commit c8437ee28a0a506fdc2add2cf7711589dab1b8a2
1 parent
d0b2e3e1
AIA bug fixed
Showing
3 changed files
with
18 additions
and
17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
| ... | ... | @@ -341,6 +341,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
| 341 | 341 | $('table > #ListViewDiv > #searchItem').remove(); |
| 342 | 342 | |
| 343 | 343 | $('#ListViewDiv').append('<tr id="searchItem"><td colspan="6"><strong style="color:black;">No illustration found for the selected search criteria!</strong></td></tr>'); |
| 344 | + localStorage.setItem("SearchText", ''); | |
| 344 | 345 | } |
| 345 | 346 | $rootScope.isLoading = false; |
| 346 | 347 | $('#spinner').css('visibility', 'hidden'); |
| ... | ... | @@ -520,7 +521,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
| 520 | 521 | theme: 'success', |
| 521 | 522 | currentController: 'AIController', |
| 522 | 523 | parentSlug: 'ADAM-images', |
| 523 | - content: '<div class="row" id="canvasDiv"><div style="align:left;"><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1369" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="1369" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas></div>' + | |
| 524 | + content: '<div class="row" id="canvasDiv"><div style="align:left;"><canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="1369" height="536" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas> <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="1369" height="536" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas></div>' + | |
| 524 | 525 | '<div class="col-sm-12 img-thumbnail" align="center">' + |
| 525 | 526 | '<img src="' + $scope.clickedAIImage + '" alt="" title="" class="img-responsive ">' + |
| 526 | 527 | '<script>$(document).ready(function(){ var $ua = navigator.userAgent;if(($ua.match(/(iPod|iPhone|iPad|android)/i))) { var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });$("#aiImagePanel").css("width", "100%"); }$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script></div>' + |
| ... | ... | @@ -538,42 +539,36 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
| 538 | 539 | |
| 539 | 540 | }); |
| 540 | 541 | |
| 541 | - | |
| 542 | 542 | $('#canvasDiv img').load(function () { |
| 543 | 543 | |
| 544 | 544 | $rootScope.isLoading = false; |
| 545 | 545 | $('#spinner').css('visibility', 'hidden'); |
| 546 | + | |
| 546 | 547 | }); |
| 547 | 548 | |
| 548 | 549 | $rootScope.currentSlug = 'adam-images-detail'; |
| 549 | - | |
| 550 | 550 | $rootScope.openViews.push( |
| 551 | 551 | { |
| 552 | 552 | "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentAIImageId, |
| 553 | 553 | "slug": $rootScope.currentSlug |
| 554 | 554 | }); |
| 555 | 555 | |
| 556 | - | |
| 557 | - //$("#aiImagePanel .img-thumbnail").css("height", $("#aiImagePanel .jsPanel-content").height()); | |
| 556 | + $("#aiImagePanel .img-thumbnail").css("min-height", $("#aiImagePanel .jsPanel-content").height()); | |
| 558 | 557 | $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important') |
| 559 | 558 | var jspContentHeight = $('.jsPanel-content').height(); |
| 560 | 559 | |
| 560 | + | |
| 561 | 561 | } |
| 562 | - | |
| 563 | - | |
| 564 | 562 | }, |
| 565 | 563 | function (error) { |
| 566 | 564 | // handle errors here |
| 567 | 565 | console.log(' $scope.AIllustrationData = ' + error.statusText); |
| 568 | 566 | } |
| 569 | - | |
| 570 | 567 | ); |
| 571 | - | |
| 572 | 568 | // console.log($rootScope.OpenAdamImages); |
| 573 | 569 | $('#AIView').css("height", $(window).outerHeight()); |
| 574 | 570 | |
| 575 | - $('#AIView').css("width", $(window).outerWidth()); | |
| 576 | - | |
| 571 | + $('#AIView').css("width", $(window).outerWidth()); | |
| 577 | 572 | } |
| 578 | 573 | |
| 579 | 574 | $scope.$on('annotationToolEvent', function (event, data) { |
| ... | ... | @@ -583,8 +578,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
| 583 | 578 | $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)") |
| 584 | 579 | $('#outlineColor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" }); |
| 585 | 580 | |
| 581 | + | |
| 586 | 582 | $("#canvas").css("display", "block"); |
| 587 | 583 | $("#canvasPaint").css("display", "block"); |
| 584 | + //$("#canvas").css("min-height", $(".img-thumbnail").height()); | |
| 585 | + //$("#canvasPaint").css("min-height", $(".img-thumbnail").height()); | |
| 588 | 586 | |
| 589 | 587 | $rootScope.onDrawingCanvasClick(); |
| 590 | 588 | $rootScope.FreeStylePaint(); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -1351,7 +1351,8 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
| 1351 | 1351 | if (alreadyOpenThisView != null) { |
| 1352 | 1352 | for (var i = 0; i < $rootScope.openViews.length; i++) { |
| 1353 | 1353 | k++; |
| 1354 | - if ($rootScope.openViews[i].body - views == title) { | |
| 1354 | + //if ($rootScope.openViews[i].body - views == title) { | |
| 1355 | + if ($rootScope.openViews[i].body == title) { | |
| 1355 | 1356 | $rootScope.openViews.splice((k - 1), 1); |
| 1356 | 1357 | |
| 1357 | 1358 | $rootScope.openViews.push( |
| ... | ... | @@ -5596,13 +5597,15 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
| 5596 | 5597 | ResizeImage(0); |
| 5597 | 5598 | } |
| 5598 | 5599 | }); |
| 5599 | - | |
| 5600 | - $(document).on('click', '#btnPrint', function () { | |
| 5600 | + | |
| 5601 | + $(document).one('click', '#btnPrint', function () { | |
| 5602 | + | |
| 5601 | 5603 | PrintDivContentByID('printBoxPor'); |
| 5604 | + this.stopPropagation(); | |
| 5605 | + | |
| 5602 | 5606 | }); |
| 5603 | - | |
| 5607 | + | |
| 5604 | 5608 | function PrintDivContentByID(id) { |
| 5605 | - | |
| 5606 | 5609 | if (id == 'printBoxPor') { |
| 5607 | 5610 | $("#printPSOptions").val("100%"); |
| 5608 | 5611 | ResizeImage(1); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | <form class="form-inline padd5"> |
| 9 | 9 | <div class="form-group"> |
| 10 | 10 | <label for="exampleInputName2" class="text-primary">Search</label> |
| 11 | - <input type="text" ng-change="hideListViewDiv()" ng-model="query.SearchText" class="form-control input-sm col-sm" id="txtSerachInput" placeholder=""> | |
| 11 | + <input type="text" ng-model="query.SearchText" class="form-control input-sm col-sm" id="txtSerachInput" placeholder=""> | |
| 12 | 12 | </div> |
| 13 | 13 | <button type="button" class="btn btn-primary btn-sm" ng-click="ApplySearch(query)" style="margin-right:2px;"> |
| 14 | 14 | <i class="fa fa-search"></i> | ... | ... |