ADAM / AIAHTML5

Commit 555dd5dd9b4d33764e49752944fbb3dbe873b82c

Authored by Amrita Vishnoi
1 parent a88d4742

modified Mac code by removal

Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @555dd5d
@@ -1465,7 +1465,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1465,7 +1465,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1465 $scope.isLayerChange = false; 1465 $scope.isLayerChange = false;
1466 } 1466 }
1467 1467
1468 - if (evt.ctrlKey || evt.metaKey) { 1468 + if (evt.ctrlKey) {
1469 $rootScope.multiAnnotationIsON = true; 1469 $rootScope.multiAnnotationIsON = true;
1470 1470
1471 //document.getElementById("btnZoom").setAttribute('disabled', 'disabled'); 1471 //document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
@@ -1881,7 +1881,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1881,7 +1881,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1881 $scope.isLayerChange = false; 1881 $scope.isLayerChange = false;
1882 } 1882 }
1883 1883
1884 - if (evt.ctrlKey || evt.metaKey) { 1884 + if (evt.ctrlKey) {
1885 $rootScope.multiAnnotationIsON = true; 1885 $rootScope.multiAnnotationIsON = true;
1886 1886
1887 //$("#btnZoom").addClass('disabled'); 1887 //$("#btnZoom").addClass('disabled');
@@ -3616,7 +3616,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3616,7 +3616,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3616 // we decide the size of speech bubble 3616 // we decide the size of speech bubble
3617 //2. 3617 //2.
3618 3618
3619 - if (event.ctrlKey || event.metaKey) { 3619 + if (event.ctrlKey) {
3620 console.log('ctrl pressed'); 3620 console.log('ctrl pressed');
3621 $scope.multiAnnotationIsON = true; 3621 $scope.multiAnnotationIsON = true;
3622 //2.1 create unique speech bubbles 3622 //2.1 create unique speech bubbles
@@ -3685,7 +3685,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3685,7 +3685,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3685 else { 3685 else {
3686 $scope.longest_annotationT1 = $scope.annotationTextArrayT1.reduce(function (a, b) { return a.length > b.length ? a : b; }); 3686 $scope.longest_annotationT1 = $scope.annotationTextArrayT1.reduce(function (a, b) { return a.length > b.length ? a : b; });
3687 $scope.longest_annotationT2 = $scope.annotationTextArrayT2.reduce(function (a, b) { return a.length > b.length ? a : b; }); 3687 $scope.longest_annotationT2 = $scope.annotationTextArrayT2.reduce(function (a, b) { return a.length > b.length ? a : b; });
3688 - if (event.ctrlKey || event.metaKey) { 3688 + if (event.ctrlKey) {
3689 $scope.j = $scope.j + 1; 3689 $scope.j = $scope.j + 1;
3690 var sub_id_annotation = "black_annotation" + $scope.j; 3690 var sub_id_annotation = "black_annotation" + $scope.j;
3691 var pointClicked_annotation = parseInt(x) + parseInt(y); 3691 var pointClicked_annotation = parseInt(x) + parseInt(y);