ADAM / AIAHTML5

Commit c6d78f134b23bbb709271846fa2dfcc89ecdbabf

Authored by unknown
1 parent 44d0a505

Commit Changes

Inline Side-by-side
Showing 2 changed files with 69 additions and 39 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @c6d78f1
@@ -941,7 +941,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -941,7 +941,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
941 a = parseInt(a) + 1; 941 a = parseInt(a) + 1;
942 $("#aaDetailViewCanvas").css("z-index", a); 942 $("#aaDetailViewCanvas").css("z-index", a);
943 } 943 }
944 -  
945 for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) { 944 for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) {
946 945
947 for (var j = 0; j <= $rootScope.aaPinDataArray.length - 1; j++) { 946 for (var j = 0; j <= $rootScope.aaPinDataArray.length - 1; j++) {
@@ -960,6 +959,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -960,6 +959,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
960 }).drawLayers(); 959 }).drawLayers();
961 960
962 } 961 }
  962 +
963 } 963 }
964 } 964 }
965 965
@@ -2330,6 +2330,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2330,6 +2330,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2330 $rootScope.rectDimension.push({ width: layer.width, height: layer.height, x: layer.x, y: layer.y }); 2330 $rootScope.rectDimension.push({ width: layer.width, height: layer.height, x: layer.x, y: layer.y });
2331 2331
2332 if ($location.path() == "/module-item-view") { 2332 if ($location.path() == "/module-item-view") {
  2333 + $rootScope.initialTextAreaName = layer.name;
2333 $rootScope.jcanvasObjectArray.push({ "name": layer.name, "x": layer.x, "y": layer.y, "width": layer.width, "height": layer.height }); 2334 $rootScope.jcanvasObjectArray.push({ "name": layer.name, "x": layer.x, "y": layer.y, "width": layer.width, "height": layer.height });
2334 } 2335 }
2335 2336
@@ -2739,8 +2740,24 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2739,8 +2740,24 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2739 document.getElementById('modelbackground').style.display = "none"; 2740 document.getElementById('modelbackground').style.display = "none";
2740 $rootScope.selectedBGColorForTextArea = $("#drawTextBGColorpicker span.minicolors-swatch-color").css('background-color'); 2741 $rootScope.selectedBGColorForTextArea = $("#drawTextBGColorpicker span.minicolors-swatch-color").css('background-color');
2741 2742
  2743 +
  2744 +
  2745 +
2742 // this part will work first time when save button will be clicked 2746 // this part will work first time when save button will be clicked
2743 if ($rootScope.IsTextAlreadySave == false) { 2747 if ($rootScope.IsTextAlreadySave == false) {
  2748 +
  2749 +
  2750 + if ($location.path() == "/module-item-view") {
  2751 + for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) {
  2752 + if ($rootScope.jcanvasObjectArray[i].name == $rootScope.initialTextAreaName) {
  2753 + $rootScope.jcanvasObjectArray.splice(i, 1);
  2754 + $rootScope.initialTextAreaName = '';
  2755 + }
  2756 + }
  2757 + }
  2758 +
  2759 +
  2760 +
2744 // getting textarea style properties 2761 // getting textarea style properties
2745 $rootScope.fontSizes = $("#text_area").css("font-size"); 2762 $rootScope.fontSizes = $("#text_area").css("font-size");
2746 $rootScope.fontWeight = $("#text_area").css("font-weight"); 2763 $rootScope.fontWeight = $("#text_area").css("font-weight");
@@ -2777,6 +2794,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2777,6 +2794,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2777 var TextAreaLayerNameAftrSplit = TextAreaLayerName.split("_"); 2794 var TextAreaLayerNameAftrSplit = TextAreaLayerName.split("_");
2778 $rootScope.postFixLayerNumber = TextAreaLayerNameAftrSplit[1]; 2795 $rootScope.postFixLayerNumber = TextAreaLayerNameAftrSplit[1];
2779 if ($location.path() == "/module-item-view") { 2796 if ($location.path() == "/module-item-view") {
  2797 + $rootScope.initialTextAreaName = layer.name;
2780 $rootScope.jcanvasObjectArray.push({ "name": layer.name, "x": layer.x, "y": layer.y, "width": layer.width, "height": layer.height }); 2798 $rootScope.jcanvasObjectArray.push({ "name": layer.name, "x": layer.x, "y": layer.y, "width": layer.width, "height": layer.height });
2781 } 2799 }
2782 }, 2800 },
@@ -2815,7 +2833,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -2815,7 +2833,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2815 width: 10, height: 10, 2833 width: 10, height: 10,
2816 cornerRadius: 3, 2834 cornerRadius: 3,
2817 click: function () { 2835 click: function () {
2818 - debugger;  
2819 if ($location.path() == "/module-item-view") { 2836 if ($location.path() == "/module-item-view") {
2820 $rootScope.isRectangleInAAClicked = true; 2837 $rootScope.isRectangleInAAClicked = true;
2821 } 2838 }
@@ -3009,7 +3026,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -3009,7 +3026,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3009 width: 10, height: 10, 3026 width: 10, height: 10,
3010 cornerRadius: 3, 3027 cornerRadius: 3,
3011 click: function () { 3028 click: function () {
3012 - debugger  
3013 $rootScope.isTextAReaRectangleClicked = true; 3029 $rootScope.isTextAReaRectangleClicked = true;
3014 if ($location.path() == "/module-item-view") { 3030 if ($location.path() == "/module-item-view") {
3015 $rootScope.isRectangleInAAClicked = true; 3031 $rootScope.isRectangleInAAClicked = true;
@@ -3040,24 +3056,28 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -3040,24 +3056,28 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3040 //} 3056 //}
3041 $rootScope.textXAxisAftrResize = layer.x; 3057 $rootScope.textXAxisAftrResize = layer.x;
3042 $rootScope.textYAxisAftrResize = layer.y; 3058 $rootScope.textYAxisAftrResize = layer.y;
3043 - }  
3044 - }  
3045 3059
3046 - if ($location.path() == "/module-item-view") {  
3047 -  
3048 - if ($rootScope.isRectangleInAAClicked == true) {  
3049 - $rootScope.isRectangleInAAClicked = false;  
3050 - debugger;  
3051 - for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) {  
3052 - if ($rootScope.jcanvasObjectArray[i].name == layer.name) {  
3053 - $rootScope.jcanvasObjectArray[i].x = layer.x;  
3054 - $rootScope.jcanvasObjectArray[i].y = layer.y;  
3055 - $rootScope.jcanvasObjectArray[i].width = layer.width;  
3056 - $rootScope.jcanvasObjectArray[i].height = layer.height; 3060 +
  3061 + if ($location.path() == "/module-item-view") {
  3062 +
  3063 + if ($rootScope.isRectangleInAAClicked == true) {
  3064 + $rootScope.isRectangleInAAClicked = false;
  3065 + for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) {
  3066 + if ($rootScope.jcanvasObjectArray[i].name == layer.name) {
  3067 + $rootScope.jcanvasObjectArray[i].x = layer.x;
  3068 + $rootScope.jcanvasObjectArray[i].y = layer.y;
  3069 + $rootScope.jcanvasObjectArray[i].width = layer.width;
  3070 + $rootScope.jcanvasObjectArray[i].height = layer.height;
  3071 + }
  3072 + }
3057 } 3073 }
3058 } 3074 }
  3075 +
  3076 +
3059 } 3077 }
3060 } 3078 }
  3079 +
  3080 +
3061 } 3081 }
3062 3082
3063 }).drawText({ 3083 }).drawText({
@@ -3117,6 +3137,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -3117,6 +3137,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3117 // this part will work second time when save button will be clicked 3137 // this part will work second time when save button will be clicked
3118 else { 3138 else {
3119 3139
  3140 +
  3141 + if ($location.path() == "/module-item-view") {
  3142 + for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) {
  3143 + if ($rootScope.jcanvasObjectArray[i].name == $rootScope.initialTextAreaName) {
  3144 + $rootScope.jcanvasObjectArray.splice(i, 1);
  3145 + $rootScope.initialTextAreaName = '';
  3146 + }
  3147 + }
  3148 + }
  3149 +
  3150 +
3120 // getting textarea style properties 3151 // getting textarea style properties
3121 var _modifiedText = $("#text_area").val(); 3152 var _modifiedText = $("#text_area").val();
3122 var _modifiedFontSize = $("#text_area").css("font-size"); 3153 var _modifiedFontSize = $("#text_area").css("font-size");
@@ -3196,8 +3227,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -3196,8 +3227,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3196 width: 10, height: 10, 3227 width: 10, height: 10,
3197 cornerRadius: 3, 3228 cornerRadius: 3,
3198 click: function () { 3229 click: function () {
3199 - debugger;  
3200 -  
3201 if ($location.path() == "/module-item-view") { 3230 if ($location.path() == "/module-item-view") {
3202 $rootScope.isRectangleInAAClicked = true; 3231 $rootScope.isRectangleInAAClicked = true;
3203 } 3232 }
@@ -3347,7 +3376,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -3347,7 +3376,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3347 click: function () { 3376 click: function () {
3348 $rootScope.isTextAReaRectangleClickedAftrEdit = true; 3377 $rootScope.isTextAReaRectangleClickedAftrEdit = true;
3349 if ($location.path() == "/module-item-view") { 3378 if ($location.path() == "/module-item-view") {
3350 - debugger;  
3351 $rootScope.isRectangleInAAClicked = true; 3379 $rootScope.isRectangleInAAClicked = true;
3352 } 3380 }
3353 } 3381 }
@@ -3379,25 +3407,27 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -3379,25 +3407,27 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3379 $rootScope.editTextXAxisAftrResize = layer.x; 3407 $rootScope.editTextXAxisAftrResize = layer.x;
3380 $rootScope.editTextYAxisAftrResize = layer.y; 3408 $rootScope.editTextYAxisAftrResize = layer.y;
3381 3409
3382 -  
3383 - }  
3384 - }  
3385 -  
3386 - if ($location.path() == "/module-item-view") {  
3387 -  
3388 - if ($rootScope.isRectangleInAAClicked == true) {  
3389 - $rootScope.isRectangleInAAClicked = false;  
3390 - debugger;  
3391 - for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) {  
3392 - if ($rootScope.jcanvasObjectArray[i].name == layer.name) {  
3393 - $rootScope.jcanvasObjectArray[i].x = layer.x;  
3394 - $rootScope.jcanvasObjectArray[i].y = layer.y;  
3395 - $rootScope.jcanvasObjectArray[i].width = layer.width;  
3396 - $rootScope.jcanvasObjectArray[i].height = layer.height; 3410 +
  3411 + if ($location.path() == "/module-item-view") {
  3412 +
  3413 + if ($rootScope.isRectangleInAAClicked == true) {
  3414 + $rootScope.isRectangleInAAClicked = false;
  3415 + for (var i = 0; i <= $rootScope.jcanvasObjectArray.length - 1; i++) {
  3416 + if ($rootScope.jcanvasObjectArray[i].name == layer.name) {
  3417 + $rootScope.jcanvasObjectArray[i].x = layer.x;
  3418 + $rootScope.jcanvasObjectArray[i].y = layer.y;
  3419 + $rootScope.jcanvasObjectArray[i].width = layer.width;
  3420 + $rootScope.jcanvasObjectArray[i].height = layer.height;
  3421 + }
  3422 + }
3397 } 3423 }
3398 } 3424 }
  3425 +
  3426 +
3399 } 3427 }
3400 } 3428 }
  3429 +
  3430 +
3401 } 3431 }
3402 3432
3403 }).drawText({ 3433 }).drawText({
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @c6d78f1
@@ -372,7 +372,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -372,7 +372,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
372 372
373 }); 373 });
374 }) 374 })
375 - 375 + $rootScope.aaPinDataArray = [];
376 $scope.showAllPins = function () { 376 $scope.showAllPins = function () {
377 377
378 $scope.allPinDataArray = []; 378 $scope.allPinDataArray = [];
@@ -394,7 +394,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -394,7 +394,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
394 //draw pins 394 //draw pins
395 $scope.aaPinData = result.data.Root.Item; 395 $scope.aaPinData = result.data.Root.Item;
396 if ($scope.aaPinData != null && $scope.aaPinData.length > 0) { 396 if ($scope.aaPinData != null && $scope.aaPinData.length > 0) {
397 - 397 + $rootScope.aaPinDataArray = $scope.aaPinData
398 angular.forEach($scope.aaPinData, function (value, key) { 398 angular.forEach($scope.aaPinData, function (value, key) {
399 $scope.allPinDataArray.push(value._PinId); 399 $scope.allPinDataArray.push(value._PinId);
400 $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY) 400 $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY)
@@ -885,12 +885,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -885,12 +885,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
885 x = x * $scope.sliderPercentValue; 885 x = x * $scope.sliderPercentValue;
886 y = y * $scope.sliderPercentValue; 886 y = y * $scope.sliderPercentValue;
887 887
888 - var speechBubbleHTML = '<div id="speechBubbleLine' + PinId + '" 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>'  
889 - + '<div id="speechBubble' + PinId + '" class="common-drag" style="height:auto!important;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;">' 888 + var speechBubbleHTML = '<div id="speechBubbleLine' + PinId + '" style="position:absolute;height:15px;width:35px;display:none;z-index:13000;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>'
  889 + + '<div id="speechBubble' + PinId + '" class="common-drag" style="height:auto!important;z-index:13000;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;">'
890 + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">' 890 + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
891 + '<img id="closeBtn' + PinId + ' " class="crossDiv_temp" style="width:18px" src=' + $rootScope.closeBtnImgPath + '></span></div>' 891 + '<img id="closeBtn' + PinId + ' " class="crossDiv_temp" style="width:18px" src=' + $rootScope.closeBtnImgPath + '></span></div>'
892 892
893 - + '<div style="position:absolute;border:1px solid #000;display:none;z-index:9000;" id="speechBubbleDraggedLine' + PinId + '">' 893 + + '<div style="position:absolute;border:1px solid #000;display:none;z-index:12000;" id="speechBubbleDraggedLine' + PinId + '">'
894 + '</div>'; 894 + '</div>';
895 895
896 //Issue #7286 :Undefined annotation should not appear 896 //Issue #7286 :Undefined annotation should not appear