ADAM / AIAHTML5

Commit 631de7a212afed1627e3b2a3b8a9223d35aa46c7

Authored by Nikita Kulshreshtha
1 parent fc9b187b

few lines was for MAC issue resolution

Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @631de7a
@@ -1474,7 +1474,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1474,7 +1474,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1474 $scope.isLayerChange = false; 1474 $scope.isLayerChange = false;
1475 } 1475 }
1476 1476
1477 - if (evt.ctrlKey || evt.metaKey) { 1477 + if (evt.ctrlKey) {
1478 $rootScope.multiAnnotationIsON = true; 1478 $rootScope.multiAnnotationIsON = true;
1479 1479
1480 //document.getElementById("btnZoom").setAttribute('disabled', 'disabled'); 1480 //document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
@@ -1890,7 +1890,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1890,7 +1890,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1890 $scope.isLayerChange = false; 1890 $scope.isLayerChange = false;
1891 } 1891 }
1892 1892
1893 - if (evt.ctrlKey || evt.metaKey) { 1893 + if (evt.ctrlKey) {
1894 $rootScope.multiAnnotationIsON = true; 1894 $rootScope.multiAnnotationIsON = true;
1895 1895
1896 //$("#btnZoom").addClass('disabled'); 1896 //$("#btnZoom").addClass('disabled');
@@ -3625,7 +3625,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3625,7 +3625,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3625 // we decide the size of speech bubble 3625 // we decide the size of speech bubble
3626 //2. 3626 //2.
3627 3627
3628 - if (event.ctrlKey || event.metaKey) { 3628 + if (event.ctrlKey) {
3629 console.log('ctrl pressed'); 3629 console.log('ctrl pressed');
3630 $scope.multiAnnotationIsON = true; 3630 $scope.multiAnnotationIsON = true;
3631 //2.1 create unique speech bubbles 3631 //2.1 create unique speech bubbles
@@ -3694,7 +3694,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3694,7 +3694,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3694 else { 3694 else {
3695 $scope.longest_annotationT1 = $scope.annotationTextArrayT1.reduce(function (a, b) { return a.length > b.length ? a : b; }); 3695 $scope.longest_annotationT1 = $scope.annotationTextArrayT1.reduce(function (a, b) { return a.length > b.length ? a : b; });
3696 $scope.longest_annotationT2 = $scope.annotationTextArrayT2.reduce(function (a, b) { return a.length > b.length ? a : b; }); 3696 $scope.longest_annotationT2 = $scope.annotationTextArrayT2.reduce(function (a, b) { return a.length > b.length ? a : b; });
3697 - if (event.ctrlKey || event.metaKey) { 3697 + if (event.ctrlKey) {
3698 $scope.j = $scope.j + 1; 3698 $scope.j = $scope.j + 1;
3699 var sub_id_annotation = "black_annotation" + $scope.j; 3699 var sub_id_annotation = "black_annotation" + $scope.j;
3700 var pointClicked_annotation = parseInt(x) + parseInt(y); 3700 var pointClicked_annotation = parseInt(x) + parseInt(y);