diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index 141d26b..e565ae5 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -1109,8 +1109,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-min #minSpan", function (event) {
var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id');
- var len = (currentPanelId).split("_").length;
- windowviewid = $scope.jsPanelCI.on('jspanelstatechange' , event);
+ var len = (currentPanelId).split("_").length;
+ var windowviewid = (currentPanelId).split("_")[len - 1];
$scope.SetCIwindowStoreData(windowviewid, 'maximised', false);
$scope.SetCIwindowStoreData(windowviewid, 'minimised', true);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
index 66ca609..32752f0 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -2327,6 +2327,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
}
}
+ //Save DISSECTIBLE_ANATOMY activity for CB
$scope.saveCIWindowActivity = function (currentId) {
if ($rootScope.CIWindowData != undefined && $rootScope.CIWindowData.length > 0 ) {
for (var i = 0; i < $rootScope.CIWindowData.length; i++) {
@@ -2360,6 +2361,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
}
+ //Save CLINICAL_ANIMATIONS activity for CB
$scope.saveCAWindowActivity = function (currentId) {
if ($rootScope.CAWindowData != undefined && $rootScope.CAWindowData.length > 0) {
for (var i = 0; i < $rootScope.CAWindowData.length; i++) {
@@ -2392,6 +2394,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
}
}
+ //Save THREE_D_ANATOMY activity for CB
$scope.save3DWindowActivity = function (currentId) {
if ($rootScope.TheeDWindowData != undefined && $rootScope.TheeDWindowData.length > 0) {
for (var i = 0; i < $rootScope.TheeDWindowData.length; i++) {
@@ -2408,7 +2411,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
height: $rootScope.TheeDWindowData[i].height,
width: $rootScope.TheeDWindowData[i].width
},
- textVisible: $rootScope.TheeDWindowData[i].isTextVisible,
+ //textVisible: $rootScope.TheeDWindowData[i].isTextVisible,
imageId: $rootScope.TheeDWindowData[i].imageId,
minimised: $rootScope.TheeDWindowData[i].minimised,
windowTitle: $rootScope.TheeDWindowData[i].currentViewTitle,
@@ -2426,6 +2429,39 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
}
}
+ //Save MY_PICTURES activity for CB
+ $scope.saveMyPictureWindowActivity = function (currentId) {
+ // if ($rootScope.TheeDWindowData != undefined && $rootScope.TheeDWindowData.length > 0) {
+ for (var i = 0; i < $rootScope.TheeDWindowData.length; i++) {
+ $scope.updatedWindowListForSaveCB.push({
+
+ containsCapturedContent: true,//$rootScope.TheeDWindowData[i] // N
+ //annotationData: "",//$rootScope.TheeDWindowData[i] N
+ contextMenu: { lockResize: true, hideTitleBar: true },
+ position: {
+ top: $rootScope.TheeDWindowData[i].top,
+ left: $rootScope.TheeDWindowData[i].left,
+ },
+ size: {
+ height: $rootScope.TheeDWindowData[i].height,
+ width: $rootScope.TheeDWindowData[i].width
+ },
+ imageId: $rootScope.TheeDWindowData[i].imageId,
+ minimised: $rootScope.TheeDWindowData[i].minimised,
+ windowTitle: $rootScope.TheeDWindowData[i].currentViewTitle,
+ maximised: $rootScope.TheeDWindowData[i].maximised,
+ mType: $rootScope.TheeDWindowData[i].moduleName,
+ id: $rootScope.TheeDWindowData[i].imageId,
+ windowListId: 0, //$rootScope.TheeDWindowData[i] // N
+ scrollPosition: { vertical: 0, horizontal: 0 },
+ imageSource: ""
+ });
+ }
+ //$rootScope.TheeDWindowData = [];
+ //}
+ }
+
+ //Save ATLAS_ANATOMY activity for CB
$scope.saveAAWindowActivity = function () {
if ($rootScope.AAWindowData != undefined && $rootScope.AAWindowData.length > 0) {
@@ -2463,22 +2499,96 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
},
mType: $rootScope.AAWindowData[i].moduleName,
containsCapturedContent: true,
- contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false }
+ contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false },
+ activePinArray: $rootScope.AAWindowData[i].activePinArray, // Selected PINID on Body
+ sliderVal: $rootScope.AAWindowData[i].sliderVal
});
}
$rootScope.AAWindowData = [];
}
+ }
+
+ //Save DISSECTIBLE_ANATOMY activity for CB
+ $scope.saveDAWindowActivity = function () {
+
+ if ($rootScope.DaWindowData != undefined && $rootScope.DaWindowData.length > 0) {
+ for (var i = 0; i < $rootScope.DaWindowData.length; i++) {
+ $scope.updatedWindowListForSaveCB.push({
+
+ bodySystemTermList: $rootScope.DaWindowData[i].BodySystemData,
+ isTitleBarVisible: false, //BodySystemData.isTitleBarVisible,//N
+ highlightOptionsSelectedId: 0,
+ selectedStructureID: 0,//N
+ contentDescriptorId: 0,
+ callOuts: $rootScope.DaWindowData[i].CurriculumTermData,
+ hideAllPins: $rootScope.DaWindowData[i].isHidePinBtnClicked,
+ selectedCallouts: $rootScope.DaWindowData[i].CBselectedpinCordinate,
+ layerNumber: $rootScope.DaWindowData[i].currentLayerNumber,
+ isModestyOn: $rootScope.DaWindowData[i].isModestyOn,
+ isTransparent: $rootScope.DaWindowData[i].isTransparencyActivated,
+ isTopToolBarVisible: false, //$rootScope.DaWindowData[i].isTopToolBarVisible,
+ clickedTermList: $rootScope.DaWindowData[i].fullTermlist,
+ minimised: $rootScope.DaWindowData[i].minimised,
+ windowTitle: $rootScope.DaWindowData[i].currentViewTitle,
+ //scrollPosition: {
+ // vertical: $rootScope.DaWindowData[i].verticalScroll,
+ // horizontal: $rootScope.DaWindowData[i].horizontalScroll
+ //},
+ selectedPins: $rootScope.DaWindowData[i].clickedPins,
+ maximised: $rootScope.DaWindowData[i].maximised,
+ size: {
+ width: $rootScope.DaWindowData[i].width,
+ height: $rootScope.DaWindowData[i].height
+ },
+ id: $rootScope.DaWindowData[i].imageId,
+ //showSelectedPins: $rootScope.DaWindowData[i].isShowSelectedSystemPinsClicked,
+ // hideCallOuts: false,//N
+ //showAllPins: $rootScope.DaWindowData[i].isShowBodyWithCBPinData,//N
+ //scaleIndex: 0,//N
+ //bodySystemId: $rootScope.DaWindowData[i].SelectedSystemID,
+ //position: { x: 840, y: 263 },
+ imageId: $rootScope.DaWindowData[i].imageId,
+ position: {
+ top: $rootScope.DaWindowData[i].top,
+ left: $rootScope.DaWindowData[i].left,
+ },
+ mType: $rootScope.DaWindowData[i].moduleName,
+ containsCapturedContent: true,
+ //contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false },
+ //activePinArray: $rootScope.DaWindowData[i].activePinArray, // Selected PINID on Body
+ //sliderVal: $rootScope.DaWindowData[i].sliderVal,
+ zoom: $rootScope.DaWindowData[i].zoomInOut,
+ skinId: $rootScope.DaWindowData[i].genderId,
+ isResizeLock: false , //.isResizeLock,//N
+ mode: $rootScope.DaWindowData[i].isNormalMode,
+ windowListId: 0,//windowData.windowListId,//25
+ canvasVScrollX: 0,//canvasVScrollX,//N
+ canvasHScrollX: 0,//canvasHScrollX,//N
+ isCallOutVisible: false,
+ annotationData: "", // .annotationData,//24
+ transparencyBounds: 0,//windowData.transparencyBounds,
+ isLeftToolBarVisible: false, //windowData.isLeftToolBarVisible,//N
+ isModuleLoaded: false, //.isModuleLoaded,//N
+ transparencyValue: 0,//N
+ layerNumberTransparency: false, //layerNumberTransparency,//N
+ searchSelectedText: $rootScope.DaWindowData[i].searchSelectedText,
+ prevId: $rootScope.DaWindowData[i].prevId //ActualTermnumber for chnages body image
+
+ });
+ }
+ $rootScope.DaWindowData = [];
}
-
+ }
+
$scope.updateWindowsContentForSaveCB = function (currentId) {
//$scope.saveDAWindowActivity();
//$scope.saveAAWindowActivity(currentId);
//$scope.saveCIWindowActivity(currentId);
//$scope.saveCAWindowActivity();
- $scope.save3DWindowActivity();
+ //$scope.save3DWindowActivity();
//$scope.savePicWindowActivity($scope.windowDataforCB);
if ($scope.updatedWindowListForSaveCB.length > 0) {
findKeyForChange($rootScope.contentNotesForSaveCB, currentId);
@@ -2495,7 +2605,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
//$rootScope.updateWindowsContentForSaveCB = function (windowData) {
-
// //findKeyForChange($scope.windowDataforCB, keyname)
// //if ($scope.selectedKey.length > 0) {
// // for (var x = 0 ; x < $scope.selectedKey.length; x++) {
@@ -2516,60 +2625,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
// // })
// // .at(column[index].keyname = keyname);
- // $scope.windowDataforCB.push({
- // //slideId: currentId,//SlideNo,
- // //currentWindowId: windowId,
- // mType: windowData.mType,
- // layerNumber: windowData.layerNumber,
- // currentBodyViewId: windowData.voId,
- // windowTitle: windowData.currentViewTitle,
- // skinId: windowData.genderId,
- // isModestyOn: windowData.isModestyOn,
- // //size: windowData.size,
- // //position: windowData.position,
- // position: {
- // top: $rootScope.jsPanelTop,
- // left: $rootScope.jsPanelLeft,
- // },
-
- // size: {
- // width: $rootScope.jsPanelWidth,
- // height: $rootScope.jsPanelHeight
- // },
- // zoom: windowData.zoomInOut,
-
- // maximised:windowData.maximised,//Not Found
- // minimised:windowData.minimised,//Not Found
- // highlightOptionsSelectedId: windowData.highlightOptionsSelectedId,//Not Found
- // selectedStructureId: windowData.selectedStructureId,//Not Found
- // isModuleLoaded: windowData.isModuleLoaded,//N
- // isTopToolBarVisible: windowData.isTopToolBarVisible,//N
- // transparencyValue: windowData.transparencyValue,//N
- // imageId: windowData.imageId,//N
- // containsCapturedContent: windowData.containsCapturedContent,//N
- // layerNumberTransparency: windowData.layerNumberTransparency,//N
-
- // isTitleBarVisible: windowData.isTitleBarVisible,//N
- // clickedTermList: windowData.fullTermlist,
- // isResizeLock: windowData.isResizeLock,//N
- // mode: windowData.isNormalMode,
- // isLeftToolBarVisible: windowData.isLeftToolBarVisible,//N
- // contentDescriptorId: windowData.contentDescriptorId,//6
- // bodySystemTermList: windowData.BodySystemData,
- // isTransparent: windowData.isTransparencyActivated,
- // windowListId: windowData.windowListId,//25
- // canvasVScrollX: windowData.canvasVScrollX,//N
- // canvasHScrollX: windowData.canvasHScrollX,//N
- // callOuts: windowData.CurriculumTermData,
-
- // isCallOutVisible: windowData.isCallOutVisible,//22
-
- // annotationData: windowData.annotationData,//24
- // transparencyBounds: windowData.transparencyBounds
-
- // });
-
- //}
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 8d2af9f..a2a30a5 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -807,7 +807,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$rootScope.jsPanelTop = 70;
}
- $.jsPanel({
+ $scope.jsPanelDA = $.jsPanel({
id: $scope.jsPanelID,
selector: '.daBodyView',
theme: 'success',
@@ -843,6 +843,30 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//0.3
var daBodyviewElement = angular.element(document.getElementById("daBodyview"));
+ //Perform Activity as per SaveCB JSPanel
+ var max = $scope.GetwindowStoreData(windowviewid, 'maximised');
+ var min = $scope.GetwindowStoreData(windowviewid, 'minimised');
+ if ($scope.jsPanelDA.status === "maximized" && max) {
+ $scope.jsPanelDA.maximize();
+ $scope.SetwindowStoreData(windowviewid, 'maximised', true);
+ $scope.SetwindowStoreData(windowviewid, 'minimised', false);
+ }
+ else if ($scope.jsPanelDA.status === "minimized" && min) {
+ $scope.jsPanelDA.minimize();
+ $scope.SetwindowStoreData(windowviewid, 'minimised', true);
+ $scope.SetwindowStoreData(windowviewid, 'maximised', false);
+ }
+ else {
+ $scope.jsPanelDA.normalize();
+ $scope.SetwindowStoreData(windowviewid, 'maximised', false);
+ $scope.SetwindowStoreData(windowviewid, 'minimised', false);
+ }
+
+ $scope.SetwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
+ $scope.SetwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
+ $scope.SetwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
+ $scope.SetwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
+
$timeout(function () {
$compile(daBodyviewElement.contents())($scope);
@@ -932,7 +956,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$location.path('/');
}
-
+ //Calling methode for save Js Panel Activity for SaveCB
+ $scope.PanelActivity();
}
@@ -10776,6 +10801,75 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
+
+ //Created method by Sandeep for Save JSPanel Activity on the CB module
+ $scope.PanelActivity = function () {
+
+ $("#" + $scope.jsPanelID).resizable({
+ stop: function (event, ui) {
+ var len = (event.currentTarget.id).split("_").length;
+ var windowviewid = (event.currentTarget.id).split("_")[len - 1];
+ $scope.SetwindowStoreData(windowviewid, 'width', ui.size.width);
+ $scope.SetwindowStoreData(windowviewid, 'height', ui.size.height);
+ }
+ });
+
+ $("#" + $scope.jsPanelID).draggable({
+ stop: function (event, ui) {
+ var len = (event.currentTarget.id).split("_").length;
+ var windowviewid = (event.currentTarget.id).split("_")[len - 1];
+ //var offSets = $(this).offset(); var postions = (this).position(); (this).offsetTop (this).offsetLeft
+ $scope.SetwindowStoreData(windowviewid, 'top', ui.position.top);
+ $scope.SetwindowStoreData(windowviewid, 'left', ui.position.left);
+ }
+ });
+
+ $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) {
+ var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id');
+ var len = (currentPanelId).split("_").length;
+ var windowviewid = (currentPanelId).split("_")[len - 1];
+ for (var i in $rootScope.DaWindowData) {
+ if ($rootScope.DaWindowData[i] !== null && typeof ($rootScope.DaWindowData[i]) == "object") {
+ if ($rootScope.DaWindowData[i].multiwinid == windowviewid) {
+ $rootScope.DaWindowData.splice(i, 1);
+ }
+ }
+ }
+ //$(".tools").css("z-index", "15000");
+ });
+
+ $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-max .jsglyph-maximize", function (event) {
+ var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id');
+ var len = (currentPanelId).split("_").length;
+ var windowviewid = (currentPanelId).split("_")[len - 1];
+ $scope.SetwindowStoreData(windowviewid, 'maximised', true);
+ $scope.SetwindowStoreData(windowviewid, 'minimised', false);
+ });
+
+ $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-min #minSpan", function (event) {
+ var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id');
+ var len = (currentPanelId).split("_").length;
+ var windowviewid = (currentPanelId).split("_")[len - 1];
+ $scope.SetwindowStoreData(windowviewid, 'maximised', false);
+ $scope.SetwindowStoreData(windowviewid, 'minimised', true);
+
+ });
+
+ $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-norm .jsglyph-normalize", function (event) {
+ var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id');
+ var len = (currentPanelId).split("_").length;
+ var windowviewid = (currentPanelId).split("_")[len - 1];
+ $scope.SetwindowStoreData(windowviewid, 'maximised', false);
+ $scope.SetwindowStoreData(windowviewid, 'minimised', false);
+
+ });
+
+ }
+
+
+
+
+
}])
function OnGenderChange(event) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index d351112..fd516ce 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -551,7 +551,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
//1. create a jsPanel and load the module item view
if (moduleName == ATLAS_ANATOMY) {
- $.jsPanel({
+ $scope.jsPanelAA = $.jsPanel({
id: $scope.jsPanelID,
selector: '.aaBodyView',
theme: 'success',
@@ -582,6 +582,30 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$rootScope.isLoading = true;
$('#spinner').css('visibility', 'visible');
+ //Perform Activity as per SaveCb JSPanel
+ var max = $scope.GetAAwindowStoreData(windowviewid, 'maximised');
+ var min = $scope.GetAAwindowStoreData(windowviewid, 'minimised');
+ if ($scope.jsPanelAA.status === "maximized" && max) {
+ $scope.jsPanelAA.maximize();
+ $scope.SetAAwindowStoreData(windowviewid, 'maximised', true);
+ $scope.SetAAwindowStoreData(windowviewid, 'minimised', false);
+ }
+ else if ($scope.jsPanelAA.status === "minimized" && min) {
+ $scope.jsPanelAA.minimize();
+ $scope.SetAAwindowStoreData(windowviewid, 'minimised', true);
+ $scope.SetAAwindowStoreData(windowviewid, 'maximised', false);
+ }
+ else {
+ $scope.jsPanelAA.normalize();
+ $scope.SetAAwindowStoreData(windowviewid, 'maximised', false);
+ $scope.SetAAwindowStoreData(windowviewid, 'minimised', false);
+ }
+
+ $scope.SetAAwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
+ $scope.SetAAwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
+ $scope.SetAAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
+ $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
+
$timeout(function () {
$compile(aaViewElement.contents())($scope);
@@ -2969,64 +2993,72 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
});
- //Created method by Sandeep for Save JSPanel Activity on the CB module
- $scope.PanelActivity = function () {
+ //Created method by Sandeep for Save JSPanel Activity on the CB module
+ $scope.PanelActivity = function () {
+
$("#" + $scope.jsPanelID).resizable({
- resize: function (event, ui) {
+ stop: function (event, ui) {
var len = (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len - 1];
- //$scope.jsPanelWidth = ui.size.width;
- //$scope.jsPanelHeight = ui.size.height;
- $scope.SetCIwindowStoreData(windowviewid, 'width', ui.size.width);
- $scope.SetCIwindowStoreData(windowviewid, 'height', ui.size.height);
- //console.log($rootScope.jsPanelWidth, $rootScope.jsPanelHeight);
+ $scope.SetAAwindowStoreData(windowviewid, 'width', ui.size.width);
+ $scope.SetAAwindowStoreData(windowviewid, 'height', ui.size.height);
}
});
- $("#" + $scope.jsPanelID).mousemove(function (event) {
- var len = (event.currentTarget.id).split("_").length;
- var windowviewid = (event.currentTarget.id).split("_")[len - 1];
- var offSet = $(this).offset();
- $scope.SetCIwindowStoreData(windowviewid, 'top', offSet.top);
- $scope.SetCIwindowStoreData(windowviewid, 'left', offSet.left);
- $scope.SetCIwindowStoreData(windowviewid, 'width', event.currentTarget.offsetWidth);
- $scope.SetCIwindowStoreData(windowviewid, 'height', event.currentTarget.offsetHeight);
-
- console.log(offSet.top, offSet.left, event.currentTarget.offsetWidth, event.currentTarget.offsetHeight)
+ $("#" + $scope.jsPanelID).draggable({
+ stop: function (event, ui) {
+ var len = (event.currentTarget.id).split("_").length;
+ var windowviewid = (event.currentTarget.id).split("_")[len - 1];
+ //var offSets = $(this).offset(); var postions = (this).position(); (this).offsetTop (this).offsetLeft
+ $scope.SetAAwindowStoreData(windowviewid, 'top', ui.position.top);
+ $scope.SetAAwindowStoreData(windowviewid, 'left', ui.position.left);
+ }
});
- $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
- var len = ($scope.jsPanelID).split("_").length;
- var windowviewid = ($scope.jsPanelID).split("_")[len - 1];
- $(".tools").css("z-index", "15000");
+ $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) {
+ var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id');
+ var len = (currentPanelId).split("_").length;
+ var windowviewid = (currentPanelId).split("_")[len - 1];
+ for (var i in $rootScope.AAWindowData) {
+ if ($rootScope.AAWindowData[i] !== null && typeof ($rootScope.AAWindowData[i]) == "object") {
+ if ($rootScope.AAWindowData[i].multiwinid == windowviewid) {
+ $rootScope.AAWindowData.splice(i, 1);
+ }
+ }
+ }
+ //$(".tools").css("z-index", "15000");
});
- $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-max .jsglyph-maximize", function () {
- var len = ($scope.jsPanelID).split("_").length;
- var windowviewid = ($scope.jsPanelID).split("_")[len - 1];
- $scope.SetCIwindowStoreData(windowviewid, 'maximised', true);
- $scope.SetCIwindowStoreData(windowviewid, 'minimised', false);
-
+ $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-max .jsglyph-maximize", function (event) {
+ var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id');
+ var len = (currentPanelId).split("_").length;
+ var windowviewid = (currentPanelId).split("_")[len - 1];
+ $scope.SetAAwindowStoreData(windowviewid, 'maximised', true);
+ $scope.SetAAwindowStoreData(windowviewid, 'minimised', false);
});
- $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-min #minSpan", function () {
- var len = ($scope.jsPanelID).split("_").length;
- var windowviewid = ($scope.jsPanelID).split("_")[len - 1];
- $scope.SetCIwindowStoreData(windowviewid, 'maximised', false);
- $scope.SetCIwindowStoreData(windowviewid, 'minimised', true);
+ $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-min #minSpan", function (event) {
+ var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id');
+ var len = (currentPanelId).split("_").length;
+ var windowviewid = (currentPanelId).split("_")[len - 1];
+ $scope.SetAAwindowStoreData(windowviewid, 'maximised', false);
+ $scope.SetAAwindowStoreData(windowviewid, 'minimised', true);
});
- $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-norm .jsglyph-normalize", function () {
- var len = ($scope.jsPanelID).split("_").length;
- var windowviewid = ($scope.jsPanelID).split("_")[len - 1];
- $scope.SetCIwindowStoreData(windowviewid, 'maximised', false);
- $scope.SetCIwindowStoreData(windowviewid, 'minimised', false);
+ $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-norm .jsglyph-normalize", function (event) {
+ var currentPanelId = $(event.target).parent().parent().parent().parent().attr('id');
+ var len = (currentPanelId).split("_").length;
+ var windowviewid = (currentPanelId).split("_")[len - 1];
+ $scope.SetAAwindowStoreData(windowviewid, 'maximised', false);
+ $scope.SetAAwindowStoreData(windowviewid, 'minimised', false);
});
}
+
+
}]);