Merge branch 'Develop' into QA

Amrita Vishnoi
2 parents e5b64827 539a13fb
Showing 15 changed files with 220 additions and 141 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
400-SOURCECODE/AIAHTML5.Web/content/images/da/75/body-views/3/layers/0/1/L/2303.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/11/L/thumbnails/da_tni_3345_LY.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/6/A/thumbnails/da_tni_3340_AN.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/7/B/thumbnails/da_tni_3341_BY.jpg
400-SOURCECODE/AIAHTML5.Web/index.html
400-SOURCECODE/AIAHTML5.Web/libs/html2canvas.js
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -39,7 +39,7 @@
     <add key="EnableSSL" value="false" />
     <add key="Site_Url" value ="http://qa.beta.interactiveanatomy.com/"/>
     <add key ="HostAddress" value="10.100.12.13" />
-    <add key="isUserAuthenticated" value="false"/>
+    <add key="isUserAuthenticated" value="true"/>
     <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
   </appSettings>  
   <system.web>
@@ -71,6 +71,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         else {
             $scope.setActiveTab(1);
             $scope.reRunSearchOnLoad();
+            $('html, body').animate({ scrollTop: localStorage.getItem('CAGridViewScroll') });
         }
@@ -449,7 +450,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
         localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
-
+        var CAGridViewScrollPosition = $($window).scrollTop();
+        localStorage.setItem('CAGridViewScroll', CAGridViewScrollPosition);
         var u = $location.url();
         $location.url('/clinical-animations-detail');
@@ -538,7 +540,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               theme: 'success',
                               currentController: 'CAController',
                               parentSlug: 'clinical-animations',
-                              content: '<script src="' + $scope.playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo").pause();$("#btnTxtOnOff").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script><div id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' +
+                              content: '<script src="' + $scope.playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo").pause();$("#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 id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' +
                                 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo"' +
                                 ' poster="' + $scope.poster + '"' +
                                  'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' +
@@ -570,7 +572,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           $rootScope.currentSlug = 'clinical-animations-detail';
-
+                          $('html, body').animate({ scrollTop: 0 });
                           $rootScope.openViews.push(
                          {
                              "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
@@ -644,8 +646,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       var curCAListViewScroll = localStorage.getItem("CAListViewScroll");
                       if (typeof (curCAListViewScroll) !== "undefined" && curCAListViewScroll !== null && curCAListViewScroll !== '') {
-
-                          $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll"));
+                          if (typeof InstallTrigger !== 'undefined') {
+                              
+                              $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CAListViewScroll") });
+
+                          }
+                          else
+                          {
+                              $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll"));
+                          }
                       }
                       //else {
                       //    $('#ListViewDiv').scrollTop(0);
@@ -175,7 +175,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       $('#grid-view').empty();
-                      var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}"  title = "{{value._Title}}"  data-ng-click="openView($event)">'
+                      var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}"  title = "{{value._Title}}"  class="GridViewDataDivHeight" data-ng-click="openView($event)">'
                               + '<div class="thumbnail" >'
                                          + '<img id="{{value._Title}}" ng-src="~/../content/images/ci/thumbnails/{{value._ThumbnailImage}}" >'//alt="{{value._Title}}" >'
                                          + '<div class="caption"><p> {{value._Title}}</p></div></a></div></div></li></ul>').appendTo('#grid-view');
@@ -603,7 +603,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               '<div class="col-sm-12 img-thumbnail" align="center">' +
                               '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' +
                               '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
-                              '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div>' +
+                              '<script>$(document).ready(function(){$("#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>' +
                               '</div></div>',
                               //ajax: {
                               //    url: 'app/views/ci/ci-view-detail.html'
@@ -693,9 +693,18 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       var curCIListViewScroll = localStorage.getItem("CIListViewScroll");
                       if (typeof (curCIListViewScroll) !== "undefined" && curCIListViewScroll !== null && curCIListViewScroll !== '') {
-
+                          if (typeof InstallTrigger !== 'undefined')
+                          {
+                              
+                                    $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CIListViewScroll") });
+                          }
+                      else
+                          {
+                              
                           $('#ListViewDiv').scrollTop(localStorage.getItem("CIListViewScroll"));
                       }
+                          
+                      }
                       //else {
                       //    $('#ListViewDiv').scrollTop(0);
                       //}
@@ -4242,7 +4242,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $rootScope.switchToTransparencycanvas();
             }
         }
+        else
+        {
+            $rootScope.UIWrapperZIndex = 12000;
+        
+            $(".ui-wrapper").css("z-index", $rootScope.UIWrapperZIndex);
+        
+            }
         //hide the speechbubble
@@ -357,6 +357,95 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         //  var ajaxResult = [];
         //   var ajaxResult1 = [];
+
+        function onBrushSizeChange() {
+            $('.btnCursor').addClass('activebtncolor');
+            $(".btn-annotation").removeClass("activebtncolor");
+            $(".btn-annotation-erase").removeClass("activebtncolor");
+            $(".btn-annotation-erase").removeClass("activebtncolor");
+            $(".annotationpaintbrushsize").removeClass("activebtncolor");
+            var x = $('#canvasPaint').css("z-index");
+
+            var y = $('#canvas').css("z-index");
+            if (x > y) {
+                y = parseInt(x) + 1;
+            } else {
+                y = parseInt(y) + 1;
+            }
+            $('#canvas').css("z-index", y);
+        }
+
+        $("#slider-range-min-2").slider({
+            range: "min",
+            min: 1,
+            max: 60,
+            value: 1,
+            slide: function (event, ui) {
+
+                onBrushSizeChange();
+                console.log("sliding");
+                $("#btnBrushSize").val(ui.value);
+
+            },
+            stop: function (event, ui) {
+
+                $("#paintLine").attr("data-size", ui.value);
+
+            }
+
+        });
+
+
+        $("#btnBrushSize").keydown(function () {
+            onBrushSizeChange();
+            var brushSizevalue = this.value;
+            $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
+        });
+        $("#btnBrushSize").keyup(function () {
+            onBrushSizeChange();
+            var brushSizevalue = this.value;
+            $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
+        });
+        $("#btnBrushSizeIncrement").click(function () {
+            onBrushSizeChange();
+            var brushIncrementVar = $("#btnBrushSize").val();
+            if (brushIncrementVar >= 60) {
+                $("#slider-range-min-2").slider("value", 60);
+            }
+            else if (brushIncrementVar == "") {
+                var brushIncrementedValue = 1;
+                $("#btnBrushSize").val(brushIncrementedValue);
+                $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
+            }
+            else {
+                var brushIncrementedValue = parseInt(brushIncrementVar) + 1;
+                $("#btnBrushSize").val(brushIncrementedValue);
+                $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
+            }
+        });
+        $("#btnBrushSizeDecrease").click(function () {
+            onBrushSizeChange();
+            var brushDecreaseVar = $("#btnBrushSize").val();
+            if (brushDecreaseVar == "") {
+                var brushDecrementedValue = 1;
+                $("#btnBrushSize").val(brushDecrementedValue);
+                $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
+            }
+            else if (brushDecreaseVar <= 1) {
+                $("#slider-range-min-2").slider("value", 1);
+            }
+            else {
+                var brushDecrementedValue = parseInt(brushDecreaseVar) - 1;
+                $("#btnBrushSize").val(brushDecrementedValue);
+                $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
+            }
+        });
+
+        $("#btnBrushSize").val($("#slider-range-min-2").slider("value"));
+
+
+        // annotation slider ends
+
         $rootScope.isLexiconTabClicked = true;
         $rootScope.lexiconData = function () {
             if ($rootScope.isLexiconTabClicked == true) {
@@ -515,6 +604,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             return moduleUrl === currentRoute ? 'active' : '';
         }
         $("#annotationToolBarOptions").removeClass("disableMenuoption");
+        $("#optionsListManagerTab").removeClass("disableMenuoption");
+    
+
         if (($location.url() == "/da-body-view")) {
             $rootScope.disableMenuannotation = " ";
             $rootScope.disableMenuoption = " ";
@@ -526,17 +618,28 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $rootScope.disableMenuoption = " ";
             $rootScope.disableSubMenu = "disableSubMenu";
             $("#annotationToolBarOptions").removeClass("disableSubMenu");
+            $("#optionsListManagerTab").addClass("disableSubMenu");
             $rootScope.disableFileMenu = " ";
         }
+        else if ($location.url() == "/module-item-view") {
+            $rootScope.disableMenuannotation = " ";
+            $rootScope.disableMenuoption = " ";
+            $rootScope.disableSubMenu = "disableSubMenu";
+            $("#annotationToolBarOptions").removeClass("disableSubMenu");
+            $rootScope.disableFileMenu = " ";
+        }
+       
         else if ($location.url() == "/clinical-animations-detail") {
             $rootScope.disableMenuannotation = "disableMenuannotation";
             $rootScope.disableMenuoption = " ";
             $rootScope.disableSubMenu = "disableSubMenu";
             $("#annotationToolBarOptions").addClass("disableSubMenu");
+            $("#optionsListManagerTab").addClass("disableSubMenu");
             $rootScope.disableFileMenu = "disableFileMenu";
         }
         else {
             $("#annotationToolBarOptions").removeClass("disableSubMenu");
+            $("#optionsListManagerTab").removeClass("disableSubMenu");
             $rootScope.disableMenuannotation = "disableMenuannotation";
             $rootScope.disableMenuoption = "disableMenuoption";
             $rootScope.disableSubMenu = "";
@@ -1403,9 +1506,20 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 $("#borderWidthCanvasElement").css({ "pointer-events": "none" });
                 $("#outlineColor").css({ "pointer-events": "none" });
             }
+            if ((isfilloptionChecked == false) && (isOutlineOptionChecked == false)) {
+                $(".setEnableDisableForEditShapeStyle").css({ "opacity": "1" });
+                $("#borderWidthCanvasElement").css({ "pointer-events": "auto" });
+                $("#outlineColor").css({ "pointer-events": "auto" });
+                $(".enableDisableOpacity label").css({ "cursor": "pointer" });
+                $(".enableDisableOpacity").css({ "opacity": "1" });
+                $("#edit-slider-3").css({ "pointer-events": "auto" });
+                $("#edit-slider-4").css({ "pointer-events": "auto" });
+                $("#editstylebackgroundcolor").css({ "pointer-events": "auto" });
+                document.getElementById("editStyleForm").reset();
+            }
             var previewBgColor = $("#shapeStyleDiv").css('background-color');
-            var previewBorderColor = $('#previewBorder').css('border-color');
-            var previewBorderWidth = $('#previewBorder').css('border-width');
+            var previewBorderColor = $('#previewBorder').css('border-top-color');
+            var previewBorderWidth = $('#previewBorder').css('border-top-width');
             var previewOpacity = $('#previewBorder').css('opacity');
             $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", previewBgColor);
             $("#imgOpacity").css("background-color", previewBgColor);
@@ -3427,10 +3541,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     };
     $rootScope.ShowPrintPreviewWindow = function (event) {  // Print Preview
-
+        $rootScope.CloseListManager();
         $rootScope.CloseAnnotationTool();
         $("#annotationButton").parent().addClass("disableMenuannotation");
         $("#annotationToolBarOptions").addClass("disableMenuoption");
+        $("#optionsListManagerTab").addClass("disableMenuoption");
         $('#dvPrintPreview').css('display', 'block');
         html2canvas($("#canvasDiv"), {
             onrendered: function (canvas) {
@@ -3512,6 +3627,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 top: 70,
                 left: 1,
             },
+            controls: { buttons: 'closeonly'},
             size: { width: $(window).outerWidth(), height: $(window).outerHeight() + 60 },
             //size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
         });
@@ -3611,6 +3727,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
         $("#annotationButton").parent().removeClass("disableMenuannotation");
         $("#annotationToolBarOptions").removeClass("disableMenuoption");
+        $("#optionsListManagerTab").removeClass("disableMenuoption");
         $('#fileMenuAnchor').removeClass('disableMenuannotation');
         if ($('#jsPanel-1').length > 0)
             $('#jsPanel-1').remove();
@@ -155,7 +155,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     canvas.style.top = '0px';
                     canvas.style.position = "absolute";
-                    $("#imageDiv").append(canvas);
+                    $("#canvasDiv").append(canvas);
                     $scope.context = canvas.getContext("2d")
                     //6. Show all pins on AA opened item
@@ -197,8 +197,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     angular.element(document).ready(function (e) {
         $("#ImagePanel").resize(function () {
-            $("#imageDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
-            $("#imageDiv").scrollTop($rootScope.CanvasDivTopPosition);
+            $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
+            $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
         });
     })
@@ -610,7 +610,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $("#dot").css("visibility", "hidden");
                 var verticalScrollPosition = canvasDiv.scrollTop;
                 var horizontlScrollPosition = canvasDiv.scrollLeft;
-                $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#imageDiv').offset().left, evt.pageY + verticalScrollPosition - $('#imageDiv').offset().top, true);
+                $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
             },
         });
@@ -634,7 +634,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         if (MultipleLanguage == undefined) {
             console.log("No text is found");
         } else {
-            $('#imageDiv').append(speechBubbleHTML);
+            $('#canvasDiv').append(speechBubbleHTML);
             if ($scope.MultiLanguageAnnationArray.length > 0) {
                 for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
@@ -709,8 +709,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             drag: function (evt) {
-                var verticalScrollPosition = document.getElementById('imageDiv').scrollTop;
-                var horizontlScrollPosition = document.getElementById('imageDiv').scrollLeft;
+                var verticalScrollPosition = document.getElementById('canvasDiv').scrollTop;
+                var horizontlScrollPosition = document.getElementById('canvasDiv').scrollLeft;
                 var clickedSpeechBubbleId = $(this).attr("id");
                 var clickedPinId = clickedSpeechBubbleId.substring(12, clickedSpeechBubbleId.length);
@@ -720,7 +720,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 for (var i = 0; i <= $rootScope.speechBubbleDimaensions.length - 1; i++) {
                     if ($rootScope.speechBubbleDimaensions[i].id == clickedPinId) {
-                        $scope.angle(clickedPinId, $rootScope.speechBubbleDimaensions[i].currentX, $rootScope.speechBubbleDimaensions[i].currentY, evt.pageX + horizontlScrollPosition - $('#imageDiv').offset().left, evt.pageY + verticalScrollPosition - $('#imageDiv').offset().top, true);
+                        $scope.angle(clickedPinId, $rootScope.speechBubbleDimaensions[i].currentX, $rootScope.speechBubbleDimaensions[i].currentY, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
                     }
                 }
@@ -879,6 +879,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $scope.removeSpeechBubble();
     }
+
+    $rootScope.$on('annotationToolEvent', function (event, data) {
+        $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(255,255,255)")
+        $('#editstylebackgroundcolor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" });
+        $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)")
+        $('#outlineColor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" });
+
+        $("#canvas").css("display", "block");
+        $("#canvasPaint").css("display", "block");
+        $rootScope.onDrawingCanvasClick();
+        $rootScope.FreeStylePaint();
+    });
 }]);
 function showSelectedSystemPins(event) {
-
+<style>
+    .canvas-annotationStyle {
+        display: none;
+        background-color: transparent;
+        z-index: 12000;
+        position: absolute;
+        left: 0;
+        right: 0;
+    }
+
+    .canvas-annotationStyle1 {
+        display: none;
+        background-color: transparent;
+        z-index: 12000;
+        position: absolute;
+        left: 0;
+        right: 0;
+    }
+</style>
 <div id="aaDetailPageDiv" class="bodyWrap row" ng-controller="TileViewListController">
     <!--<div class="col-sm-12 pageHeading">
@@ -89,9 +107,13 @@
             <div class="container-fluid">
                 <div class="row">
-                    <div class=" col-sm-12 img-thumbnail"  id="imageDiv" style="height: 478px; overflow: scroll;">
+                    <div class=" col-sm-12 img-thumbnail"  id="canvasDiv" style="height: 478px; overflow: scroll;">
+                        <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="2277" height="3248" class="canvas-annotationStyle1"></canvas>
+                        <canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>
+
                         <img id="modItemImage" alt="" title=""  style="left:0px;top:0px;position:absolute">
                          <!--<div class="clearfix">
+
                            <img id="modItemImage" ng-init="alert('hi')" alt="" title="" class="img-responsive">
                         </div>
                         <!--<div class="col-sm-1 img-thumbnail pull-right" align="center"><img src="../../content/images/1000x600.jpg" alt="" title="" class="img-responsive"></div>
@@ -111,21 +133,6 @@
         $(".stickey-area").sticky();
     });
 </script>
-<script>
-    $(function () {
-        $("#slider-range-min-2").slider({
-            range: "min",
-            min: 1,
-            max: 60,
-            value: 10,
-            slide: function (event, ui) {
-                $("#amount-2").val(ui.value);
-            }
-        });
-        $("#amount-2").val($("#slider-vertical-2").slider("value"));
-
-    });
-</script>
 <script>
     $(document).ready(function () {
@@ -23,7 +23,7 @@
             </ul>
         </li>
         <!--#7904-->
-        <li class="navbarItem" ng-class=" disablemenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
+        <li class="navbarItem" ng-class=" disableMenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
         <li class="dropdown navbarDropdownItem" ng-class="disableMenuoption">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
@@ -1451,109 +1451,11 @@
     </script>-->
     <script>
-        function onBrushSizeChange() {
-            $('.btnCursor').addClass('activebtncolor');
-            $(".btn-annotation").removeClass("activebtncolor");
-            $(".btn-annotation-erase").removeClass("activebtncolor");
-            $(".btn-annotation-erase").removeClass("activebtncolor");
-            $(".annotationpaintbrushsize").removeClass("activebtncolor");
-            var x = $('#canvasPaint').css("z-index");
-
-            var y = $('#canvas').css("z-index");
-            if (x > y) {
-                y = parseInt(x) + 1;
-            } else {
-                y = parseInt(y) + 1;
-            }
-            $('#canvas').css("z-index", y);
-        }
-        $(function () {
-            $("#slider-range-min-2").slider({
-                range: "min",
-                min: 1,
-                max: 60,
-                value: 1,
-                slide: function (event, ui) {
-                    onBrushSizeChange();
-                    $("#btnBrushSize").val(ui.value);
-
-                },
-                stop: function (event, ui) {
-
-                    $("#paintLine").attr("data-size", ui.value);
-
-                }
-
-            });
-
-
-            $("#btnBrushSize").keydown(function () {
-                onBrushSizeChange();
-                var brushSizevalue = this.value;
-                $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
-            });
-            $("#btnBrushSize").keyup(function () {
-                onBrushSizeChange();
-                var brushSizevalue = this.value;
-                $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
-            });
-            $("#btnBrushSizeIncrement").click(function () {
-                onBrushSizeChange();
-                var brushIncrementVar = $("#btnBrushSize").val();
-                if (brushIncrementVar >= 60) {
-                    $("#slider-range-min-2").slider("value", 60);
-                }
-                else if (brushIncrementVar == "") {
-                    var brushIncrementedValue = 1;
-                    $("#btnBrushSize").val(brushIncrementedValue);
-                    $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
-                }
-                else {
-                    var brushIncrementedValue = parseInt(brushIncrementVar) + 1;
-                    $("#btnBrushSize").val(brushIncrementedValue);
-                    $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
-                }
-            });
-            $("#btnBrushSizeDecrease").click(function () {
-                onBrushSizeChange();
-                var brushDecreaseVar = $("#btnBrushSize").val();
-                if (brushDecreaseVar == "") {
-                    var brushDecrementedValue = 1;
-                    $("#btnBrushSize").val(brushDecrementedValue);
-                    $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
-                }
-                else if (brushDecreaseVar <= 1) {
-                    $("#slider-range-min-2").slider("value", 1);
-                }
-                else {
-                    var brushDecrementedValue = parseInt(brushDecreaseVar) - 1;
-                    $("#btnBrushSize").val(brushDecrementedValue);
-                    $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
-                }
-            });
-
-            $("#btnBrushSize").val($("#slider-range-min-2").slider("value"));
-
-
-
-
-
-            //$("#slider-range-min-2").on("slidestart", function (event, ui) {
-
-            //    $('.btnCursor').trigger('click');
-            //    $(".btn-annotation").removeClass("activebtncolor");
-            //    $('.btnCursor').addClass('activebtncolor');
-            //  //  ctx.clearRect(0, 0, canvasPaint.width, canvasPaint.height);
-
-
-            //});
-            //  $("#slider-range-min-2").on("slidechange", function (event, ui) { alert("ssasa"); });
-
             $(function () {
                 $('[data-toggle="tooltip"]').tooltip();
             })
-        });
+     
     </script>
     <script>
         (function ($) {
@@ -2855,8 +2855,16 @@ _html2canvas.Renderer.Canvas = function(options) {
         newCanvas.width = Math.ceil(bounds.width);
         newCanvas.height = Math.ceil(bounds.height);
         ctx = newCanvas.getContext("2d");
-
-        ctx.drawImage(canvas, bounds.left, bounds.top, bounds.width, bounds.height, 0, 0, bounds.width, bounds.height);
+        if (/*@cc_on!@*/false || !!document.documentMode) {
+           
+            var imgData = canvas.getContext("2d").getImageData(bounds.left, bounds.top, bounds.width, bounds.height);
+            ctx.putImageData(imgData, 50, 0);
+        }
+        else {
+           
+            ctx.drawImage(canvas, bounds.left, bounds.top, bounds.width, bounds.height, 0, 0, bounds.width, bounds.height);
+        }
+      
         canvas = null;
         return newCanvas;
       }
@@ -1008,10 +1008,18 @@ background-size:cover;
         {
           z-index:11111;
       }
-      .tinyImg {
+
+   .tinyImg {
     display: block;
     max-width: 230px;
     /*max-height: 95px;*/
     width: auto;
     height: 95px !important;
-}
 \ No newline at end of file
+}
+
+  
+ .GridViewDataDivHeight
+       {
+            height:175px;
+      }
+