diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
index b06110c..b66936a 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -145,22 +145,22 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
}
- $window.onbeforeunload = function (e) {
- var confirmation = {};
- if($location.url()== "/curriculum-builder-detail") {
- var event = $rootScope.$broadcast('onBeforeUnload', confirmation);
- if (event.defaultPrevented) {
- return confirmation.message;
- }
- }
+ // $window.onbeforeunload = function (e) {
+ // var confirmation = {};
+ // if($location.url()== "/curriculum-builder-detail") {
+ // var event = $rootScope.$broadcast('onBeforeUnload', confirmation);
+ // if (event.defaultPrevented) {
+ // return confirmation.message;
+ // }
+ // }
- };
+ // };
});
- $scope.$on('onBeforeUnload', function (e, confirmation) {
- confirmation.message = "All data willl be lost.";
- e.preventDefault();
- });
+ // $scope.$on('onBeforeUnload', function (e, confirmation) {
+ // confirmation.message = "All data willl be lost.";
+ // e.preventDefault();
+ // });
$rootScope.firstSelectedNodeId = null;
//load json data
@@ -324,14 +324,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
objFileRead.readAsText(file);
}, 300);
} else {
- alert("Please select only Saved Curriculum Builder Json file!");
+ alert("Please select exported\saved Curriculum Builder Json file!");
}
}
- function receivedFile(e) {
- //let lines = e.target.result;
- $scope.CBEnableUI();
+ function receivedFile(e) {
var jsonData = JSON.parse(e.target.result);
localStorage.setItem("cbJsonDataObject", JSON.stringify(jsonData));
$rootScope.cbJsonData = "";
@@ -1259,7 +1257,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
objFileRead.readAsText(file);
}, 300);
} else {
- alert("Please select only Export Curriculum Builder Json file!");
+ alert("Please select exported\saved Curriculum Builder Json file!");
}
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 98ea234..6d30b24 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -5090,7 +5090,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var verticalScrollPosition = canvasDiv.scrollTop;
var horizontlScrollPosition = canvasDiv.scrollLeft;
- $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, true,windid);
+ $scope.angle(x-2, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, true,windid);
},
//Update Annotation Cordianate in case of show single Annotation
stop: function (evt) {
@@ -5270,7 +5270,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var canvasDiv = document.getElementById('canvasDivDA_' + windid);
var verticalScrollPosition = canvasDiv.scrollTop;
var horizontlScrollPosition = canvasDiv.scrollLeft;
- $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, false,windid);
+ $scope.angle(x-2, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, false,windid);
},
//Update Annotation Cordianate in case of show single Annotation
@@ -5436,10 +5436,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var isHighlightBodyWithCBTermData=$scope.GetwindowStoreData(windowviewid,'isHighlightBodyWithCBTermData');
if (isHighlightBodyWithCBTermData == true) {
- var sppechBubbleHTML = "";
+ var sppechBubbleHTML = "";
}
else {
- var sppechBubbleHTML = "";
+ var sppechBubbleHTML = "";
}
//Issue #7286 :Undefined annotation should not appear
@@ -5486,7 +5486,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.createSpeechBubbleBasedOnAnnotationLengthwithoutCtrl = function (x, y, windowviewid, termNumber) {
- var sppechBubbleDotHTML = ''
+ var sppechBubbleDotHTML = ''
+ ''
+ '
'
+ '
'
+ '
'
+ ''
+ '
'
+ '