Merge branch 'PrintPreviewDelay' into Develop

Amrita Vishnoi
2 parents 222969cc b80fdc83
Showing 1 changed file with 4 additions and 19 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -3109,9 +3109,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 $('#snipImage').attr('src', dataURL);
                 $('#spnModule').text($rootScope.currentActiveModuleTitle);
-                $('#spnPosture').text(localStorage.getItem('currentViewTitle'));
+                $('#spnBodyViewTitle').text(localStorage.getItem('currentViewTitle'));
-                PrintDIVContent('printBox');    // Open Print Window
+                PrintDivContentByID('printBox');    // Open Print Window
             }
         });
     };
@@ -3144,7 +3144,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
                         document.getElementById('spnModuleLan').innerHTML = curModule;
                         document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
-                    }, 100);
+                    }, 320);
                 }
                 $('#fileMenuAnchor').addClass('disableMenuannotation');
@@ -3260,7 +3260,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             window.frames["frame1"].focus();
             window.frames["frame1"].print();
             frame1.remove();
-        }, 250);
+        }, 320);
         console.log('close')
     }
@@ -3272,21 +3272,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         console.log('close')
     });
-    $rootScope.ShowPrintWindow = function () {  // Print Active Viewer
-        html2canvas($("#canvasDiv"), {
-            onrendered: function (canvas) {
-                var dataURL = canvas.toDataURL("image/jpeg");
-                var imageToPrint = new Image();
-                imageToPrint.src = dataURL;
-                $('#snipImage').attr('src', dataURL);
-
-                $('#spnModule').text($rootScope.currentActiveModuleTitle);
-                $('#spnBodyViewTitle').text(localStorage.getItem('currentViewTitle'));
-
-                PrintDivContentByID('printBox');    // Open Print Window
-            }
-        });
-    };
     $rootScope.restrictBodySystemList = function () {
         var RestrictListDiv = document.getElementById("restrictListDiv");
         if (RestrictListDiv.style.display == 'block') {