ADAM / AIAHTML5

Commit 6004aaaa218f363ceba9d7d1ee9f880f393661d8

Authored by Birendra
1 parent e6bfc77e

fix bug on ipad device

Inline Side-by-side
Showing 4 changed files with 28 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @6004aaa
... ... @@ -113,7 +113,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
113 113 var opcity = $("#HomeContainerDiv").css("opacity")
114 114  
115 115 if (opcity != 1 && $scope.SectionContentForExportCB.length<=0) {
116   - $scope.CBEnableUI();
  116 + if($rootScope.loadingAnimationstatus==undefined || $rootScope.loadingAnimationstatus==0)
  117 + {
  118 + $scope.CBEnableUI();
  119 + }
  120 +
117 121 }
118 122 }, 40000);
119 123  
... ... @@ -1706,9 +1710,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1706 1710 }
1707 1711  
1708 1712 $scope.saveCBwithAnimation=function(downloadtype,filename)
1709   - {
  1713 + {
1710 1714 if($rootScope.collectAnimationSource.length>0)
1711 1715 {
  1716 + $rootScope.loadingAnimationstatus=1;
  1717 + $("#saveAsCurriculum").modal('hide');
1712 1718 var AnimationData=[];
1713 1719 function getBase64Image(base64string) {
1714 1720 return base64string.replace(/^data:video\/(mp4);base64,/, "");
... ... @@ -1741,7 +1747,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1741 1747 },
1742 1748 function (error) {
1743 1749 console.log(' Error in Saving video = ' + error.statusText);
1744   - $scope.CBEnableUI();
  1750 + $scope.CBEnableUI();
  1751 + $rootScope.loadingAnimationstatus=0;
1745 1752 $scope.SectionContentForExportCB=[];
1746 1753 $rootScope.dynamicUpdatedJsonForExportCB = "";
1747 1754 $rootScope.dynamicUpdatedJsonForSaveCB = "";
... ... @@ -1753,7 +1760,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1753 1760 function(progress){
1754 1761 $('#uploading-curriculum').css("display", "block");
1755 1762 //console.log('uploading: ' + Math.floor(progress) + '%');
1756   - $rootScope.loadingstatus= + Math.floor(progress) + '%';
  1763 + $rootScope.loadingstatus= + Math.floor(progress) + '%';
  1764 + $rootScope.loadingAnimationstatus=1;
  1765 +
1757 1766 }
1758 1767 )
1759 1768 }
... ... @@ -1790,6 +1799,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1790 1799 saveAs(blob, filename);
1791 1800  
1792 1801 // }
  1802 + $rootScope.loadingAnimationstatus=0;
1793 1803 $scope.SectionContentForExportCB=[];
1794 1804 $rootScope.dynamicUpdatedJsonForExportCB = "";
1795 1805 $rootScope.dynamicUpdatedJsonForSaveCB = "";
... ... @@ -1797,7 +1807,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1797 1807 $('#uploading-curriculum').css("display", "none");
1798 1808 $scope.CBEnableUI();
1799 1809 $("#saveAsCurriculum").modal('hide');
1800   -
1801 1810 //disable tiny editor while section active
1802 1811 if($scope.nodeTypeIsBranch=="true")
1803 1812 {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @6004aaa
... ... @@ -5447,7 +5447,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
5447 5447 $("#annotationTextModal").css("padding-right", "0px");
5448 5448 $("#annotationTextModal").modal("toggle");
5449 5449 document.getElementById('modelbackground').style.display = "block";
5450   -
  5450 + $("#annotationTextModal").draggable('disable');
  5451 +
5451 5452 $scope.resetTextarea(shapestyle.fillStyle);
5452 5453 }
5453 5454 else
... ... @@ -5487,6 +5488,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
5487 5488 $(".btn-annotation").removeClass("activebtncolor");
5488 5489  
5489 5490 $('.btnCursor').addClass('activebtncolor');
  5491 + $('#text_area').focus();
5490 5492  
5491 5493 }
5492 5494  
... ... @@ -5630,7 +5632,9 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
5630 5632 $("#annotationTextModal").css("padding-right", "0px");
5631 5633 document.getElementById('modelbackground').style.display = "block";
5632 5634 $("#annotationTextModal").modal("toggle");
5633   -
  5635 + $("#annotationTextModal").draggable('disable');
  5636 + $('#text_area').focus();
  5637 +
5634 5638 }
5635 5639  
5636 5640 $rootScope.TextEditorDrawText=function(canvasId,selectedTextRect,selectedTextArea,areaText)
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @6004aaa
... ... @@ -724,7 +724,7 @@
724 724 </div>
725 725  
726 726 <!--Modal For Annotation Text Box-->
727   - <div id="annotationTextModal" style="display:none;z-index: 1000000000;width:500px;height:241px;padding-right:0!important;position:fixed;left:0;right:0;top:0px;bottom:0;margin:auto;">
  727 + <div id="annotationTextModal" style="display:none;z-index: 1000000000;width:500px;height:241px;padding-right:0!important;position:fixed;left:20%;top:100px;margin:auto;">
728 728  
729 729 <div class="modal-content">
730 730 <div class="modal-header" style="background-color: #808D43;padding:10px;border-bottom:0;">
... ... @@ -1686,6 +1686,7 @@
1686 1686 $(".modeleditstyle").draggable({containment:'window'});
1687 1687 $("#annotationTextModal").draggable({ containment: 'window' });
1688 1688 $("#modal-settings").draggable({ containment: 'window' });
  1689 +
1689 1690 });
1690 1691 </script>
1691 1692  
... ... @@ -2140,11 +2141,11 @@
2140 2141 });
2141 2142  
2142 2143  
2143   - $("#selected-font-family, #selected-font-size").click(function () {
2144   - $("#annotationTextModal").draggable('disable');
2145   - }).blur(function () {
2146   - $("#annotationTextModal").draggable('enable');
2147   - });
  2144 + // $("#selected-font-family, #selected-font-size").click(function () {
  2145 + // $("#annotationTextModal").draggable('disable');
  2146 + // }).blur(function () {
  2147 + // $("#annotationTextModal").draggable('enable');
  2148 + // });
2148 2149 $("#lexiconLangDropdown").click(function () {
2149 2150 $("#modal-settings").draggable('disable');
2150 2151 }).blur(function () {
... ...
400-SOURCECODE/AIAHTML5.Web/term-number-wp.js
  View file @6004aaa
1 1 previousGrayImageDataList = [];
2 2  
3 3 getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, coloredImageData, grayImageData, bodyRegionId, canvasId) {
4   - console.log('for bodyRegionId in worker process: ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
  4 + //console.log('for bodyRegionId in worker process: ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
5 5  
6 6 var masklen = maskCanvasData.data.length;
7 7 var maskData = maskCanvasData.data;
... ...