ADAM / AIAHTML5

Commit 15527ff9e411e5a30b1ebb32cd6f249b066a9865

Authored by unknown
2 parents 77cf2dee fad2f955

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

# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
Inline Side-by-side
Showing 2 changed files with 11 additions and 13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @15527ff
... ... @@ -2892,8 +2892,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2892 2892  
2893 2893 var sppechBubbleDotHTML = '<div id="dot" style="position:absolute;height:15px;width:35px;display:none;z-index:10000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
2894 2894 + '<div id="sppeachBubble" style="height:auto!important;z-index:10000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size:12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
2895   - + '<span style="position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;">'
2896   - + '<img class="crossDiv_temp" src=' + $rootScope.path + '></span></div>'
  2895 + + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
  2896 + + '<img class="crossDiv_temp" style="width:18px" src=' + $rootScope.path + '></span></div>'
2897 2897  
2898 2898 + '<div style="position:absolute;border:1px solid #000;display:none;z-index:9000;" id="bord">'
2899 2899 + '</div>';
... ... @@ -3037,7 +3037,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3037 3037 var Exists_annotation = $("#canvasDiv").find("div[id=" + pointClicked_annotation + "]").length;
3038 3038 // alert(Exists_annotation);
3039 3039 // alert(pointClicked_annotation);
3040   - var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord_annotation" + $scope.j + "'></div></div>";
  3040 + var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord_annotation" + $scope.j + "'></div></div>";
3041 3041 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
3042 3042 if (Exists_annotation == 0) {
3043 3043 $("#canvasDiv").append(sppechBubbleHTML_annotation);
... ... @@ -3264,8 +3264,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3264 3264 $('.dynCross_anno').parent().parent().parent().remove();
3265 3265 var sppechBubbleDotHTML_annotation = '<div id="dot_annotation" style="position:absolute;height:15px;width:35px;display:none;z-index:10000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
3266 3266 + '<div id="sppeachBubble_annotation" style="height:auto!important;z-index:10000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size:12px;background-color:#19100e;font-weight:bold;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
3267   - + '<span style="position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;">'
3268   - + '<img class="crossDiv_temp_annotation" src=' + $rootScope.path + '></span></div>'
  3267 + + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
  3268 + + '<img class="crossDiv_temp_annotation" style="width:18px" src=' + $rootScope.path + '></span></div>'
3269 3269  
3270 3270 + '<div style="position:absolute;border:1px solid #000;display:none;z-index:9000;" id="bord_annotation">'
3271 3271 + '</div>';
... ... @@ -3475,7 +3475,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3475 3475 }
3476 3476  
3477 3477 $scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id) {
3478   - var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.speechBubbleCounter + "'></div><div data=" + $scope.speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
  3478 + var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.speechBubbleCounter + "'></div><div data=" + $scope.speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
3479 3479 //Issue #7286 :Undefined annotation should not appear
3480 3480 for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
3481 3481 var annotation = $scope.MultiLanguageAnnationArray[i];
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @15527ff
... ... @@ -969,8 +969,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
969 969  
970 970 },
971 971 dblclick: function (layer) {
972   -
973   -
  972 +
  973 + $rootScope.IsTextAlreadySave = false;
974 974 var RectNameArray = (layer.name).split("_");
975 975  
976 976 var TextAreaRectangleName = "TextArea_";
... ... @@ -1275,7 +1275,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1275 1275 }).drawLayers();
1276 1276 },
1277 1277 dblclick: function (layer) {
1278   -
  1278 +
1279 1279 $rootScope.isTextAreaClosedButtonActive = false;
1280 1280 $rootScope.IsTextAlreadySave = true;
1281 1281  
... ... @@ -1429,9 +1429,6 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1429 1429 }
1430 1430  
1431 1431  
1432   -
1433   -
1434   -
1435 1432 // _rectLayerOnSaveSplitInt = '';
1436 1433 textArrVal = '';
1437 1434 $("#annotationTextModal").css("padding-right", "0px");
... ... @@ -1564,7 +1561,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1564 1561  
1565 1562 },
1566 1563 dblclick: function (layer) {
1567   -
  1564 +
  1565 +
1568 1566 $rootScope.isTextAreaClosedButtonActive = false;
1569 1567 $rootScope.IsTextAlreadySave = true;
1570 1568 var _rectLayerOnSave = layer.name;
... ...