Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into 20253

unknown
2 parents def0bb99 2ca490b1
Showing 4 changed files with 143 additions and 99 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.html
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -1471,7 +1471,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         FlipedImgCanvas.addEventListener('click', function (evt) {
-
+            var canvasDiv = document.getElementById('canvasDiv');
+            $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
             //to get correct data on multihighlight highlight
             if ($scope.isLayerChange == true) {
                 $scope.isLayerChange = false;
@@ -1872,8 +1873,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
         imgCanvas.addEventListener('click', function (evt) {
-
-     
+            var canvasDiv = document.getElementById('canvasDiv');
+            $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
             if ($scope.isLayerChange == true) {
                 $scope.isLayerChange = false;
             }
@@ -353,99 +353,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.lexiconLanguageArray = [];
     $rootScope.lexiconLanguageArray.push({ id: "1", language: "English" });
     $(document).ready(function () {
-        // getUserDetails();
-
-        //  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) {
@@ -841,6 +748,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $("#DrawMode").removeClass("annotationtoolbartab");
         $('.btnCursor').removeClass('activebtncolor');
         $("#annotationButton").removeClass("active");
+        $("#annotationButton").blur();
         $("#annotationToolBarOptions").removeClass("active");
@@ -3555,8 +3463,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 OpenJSPanel();  // open jsPanel here
                 if ($('#jsPanel-1').length > 0) {
-                    $('.jsPanel-btn-min').attr('style', 'display: none');
-                    $('.jsPanel-btn-max').attr('style', 'display: none');
                     $('.jsPanel-btn-norm').attr('style', 'display: none');
                 }
@@ -1669,6 +1669,140 @@
         });
     </script>
+    <script>
+        $(function () {
+            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();
+
+
+
+                    $("#btnBrushSize").val(ui.value);
+
+                    $("#annotationpaintbrushsize").css({ "pointer-events": "auto", "opacity": "1" });
+                    $("#annotationpainteraser").css({ "pointer-events": "auto", "opacity": "1" });
+                    $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
+                    $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
+
+                },
+                stop: function (event, ui) {
+
+                    $("#paintLine").attr("data-size", ui.value);
+
+                }
+
+            });
+
+
+            $("#btnBrushSize").keydown(function () {
+                $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
+                $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
+                onBrushSizeChange();
+                var brushSizevalue = this.value;
+
+                $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
+            });
+            $("#btnBrushSize").keyup(function () {
+                onBrushSizeChange();
+                var brushSizevalue = this.value;
+                if (brushSizevalue == "") {
+
+                    $("#slider-range-min-2").slider("value", 0);
+
+                    $("#annotationpaintbrushsize").css({ "pointer-events": "none", "opacity": ".5" });
+                    $("#annotationpainteraser").css({ "pointer-events": "none", "opacity": ".5" });
+                }
+                else {
+                    $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
+                    $("#annotationpaintbrushsize").css({ "pointer-events": "auto", "opacity": "1" });
+                    $("#annotationpainteraser").css({ "pointer-events": "auto", "opacity": "1" });
+                }
+                // $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
+            });
+            $("#btnBrushSizeIncrement").click(function () {
+                if ($("#annotationpaintbrushsize").css('pointer-events') == 'none') {
+                    $("#annotationpaintbrushsize").css({ "pointer-events": "auto", "opacity": "1" });
+                    $("#annotationpainteraser").css({ "pointer-events": "auto", "opacity": "1" });
+                    $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
+                    $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
+                }
+
+                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 == "") {
+
+                    $("#btnBrushSizeDecrease").css({ "pointer-events": "none", "opacity": ".5" });
+                    $("#btnBrushSizeDecrease").css({ "pointer-events": "none", "opacity": ".5" });
+                    
+                }
+                else if (brushDecreaseVar <= 1) {
+                    $("#slider-range-min-2").slider("value", 1);
+                    if ($("#annotationpaintbrushsize").css('pointer-events') == 'none') {
+                        $("#annotationpaintbrushsize").css({ "pointer-events": "auto", "opacity": "1" });
+                        $("#annotationpainteraser").css({ "pointer-events": "auto", "opacity": "1" });
+                        $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": ".5" });
+                        $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": ".5" });
+                    }
+                 
+                }
+                else {
+                    var brushDecrementedValue = parseInt(brushDecreaseVar) - 1;
+                    if ($("#annotationpaintbrushsize").css('pointer-events') == 'none') {
+                        $("#annotationpaintbrushsize").css({ "pointer-events": "auto", "opacity": "1" });
+                        $("#annotationpainteraser").css({ "pointer-events": "auto", "opacity": "1" });
+                        $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
+                        $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
+                    }
+                    $("#btnBrushSize").val(brushDecrementedValue);
+                    $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
+                }
+            });
+
+            $("#btnBrushSize").val($("#slider-range-min-2").slider("value"));
+        });
+    </script>
     <script>
         $(function () {
@@ -1017,7 +1017,10 @@ background-size:cover;
     height: 95px !important;
 }
-  
+  #bodySystemList
+   {
+      z-index:100000;
+  }
  .GridViewDataDivHeight
        {
             height:175px;