diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index 431e6e3..b3c410f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -36,7 +36,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $("#sidebar-wrapper").on('click', function (event) { //4. on click disable menu option - $scope.$emit("cBEnableDisableMenuOption",""); + $scope.$emit("cBEnableDisableMenuOption", ""); }); // close all selected open panel in CB @@ -84,14 +84,34 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $('#HomeContainerDiv').css('pointer-events', 'none'); $('#HomeContainerDiv').css('opacity', '0.7'); + + $('#CBTextArea_ifr').css('pointer-events', 'none'); + $('#CBTextArea_ifr').css('opacity', '0.7'); + + + $('#jstree').css('pointer-events', 'none'); + $('#jstree').css('opacity', '0.7'); + + $('#cbEditorTopMenuBar').css('pointer-events', 'none'); + $('#cbEditorTopMenuBar').css('opacity', '0.7'); + + $('#cbEditorLeftSideBar').css('pointer-events', 'none'); + $('#cbEditorLeftSideBar').css('opacity', '0.7'); + + $('#cbEditorRightSideBar').css('pointer-events', 'none'); + $('#cbEditorRightSideBar').css('opacity', '0.7'); + + $('.tox-editor-header').css('pointer-events', 'none'); + $('.tox-editor-header').css('opacity', '0.7'); + + $timeout(function () { // in case failed default time out 40 second var opcity = $("#HomeContainerDiv").css("opacity") - if (opcity != 1) - { + if (opcity != 1) { $scope.CBEnableUI(); } }, 40000); @@ -105,6 +125,25 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ // CB module enable all $('#HomeContainerDiv').css('pointer-events', 'auto'); $('#HomeContainerDiv').css('opacity', '1'); + + $('#CBTextArea_ifr').css('pointer-events', 'auto'); + $('#CBTextArea_ifr').css('opacity', '1'); + + $('#jstree').css('pointer-events', 'auto'); + $('#jstree').css('opacity', '1'); + + $('#cbEditorTopMenuBar').css('pointer-events', 'auto'); + $('#cbEditorTopMenuBar').css('opacity', '1'); + + $('#cbEditorLeftSideBar').css('pointer-events', 'auto'); + $('#cbEditorLeftSideBar').css('opacity', '1'); + + $('#cbEditorRightSideBar').css('pointer-events', 'auto'); + $('#cbEditorRightSideBar').css('opacity', '01'); + + $('.tox-editor-header').css('pointer-events', 'auto'); + $('.tox-editor-header').css('opacity', '1'); + } }); @@ -169,9 +208,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $scope.loadSlideShowXmldata = function (e) { $scope.CBDisableUI(); - $rootScope.AutherName=""; - $rootScope.summary=""; - $rootScope.FileTitle=e.target.text; + $rootScope.AutherName = ""; + $rootScope.summary = ""; + $rootScope.FileTitle = e.target.text; $scope.fileName = e.target.id.split('.'); $('#modal-CurBuilder').css("display", "block"); @@ -284,12 +323,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $scope.ImagePanelclick(); var imfgEle = document.getElementById("imgtag"); - if (imfgEle!=null) + if (imfgEle != null) imfgEle.src = "data:image/png;base64," + $rootScope.windowsimageSource; setTimeout(function () { - var cleintht=imfgEle.clientHeight; - if(cleintht>0) + var cleintht = imfgEle.clientHeight; + if (cleintht > 0) $('#CBSourceImagePanel .jsPanel-content').css('height', cleintht); $scope.CBEnableUI(); }, 200) @@ -299,8 +338,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $scope.ImagePanelclick = function () { $("#CBSourceImagePanel").on('click', function (event) { - var pnlName=event.currentTarget.id; - $scope.$emit("cBEnableDisableMenuOption",pnlName); + var pnlName = event.currentTarget.id; + $scope.$emit("cBEnableDisableMenuOption", pnlName); }); } $rootScope.getCBsummary = function () { @@ -382,7 +421,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $timeout(function () { $scope.TinyMCEPanelclick(); - },1000); + }, 1000); } @@ -391,15 +430,15 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $("#CBTinyMCEPanel").on('click', function (event) { //3. on click disable menu option - $scope.$emit("cBEnableDisableMenuOption",""); + $scope.$emit("cBEnableDisableMenuOption", ""); }); } - $scope.myeditorclick=function() { + $scope.myeditorclick = function () { //1. disable menu options - $scope.$emit("cBEnableDisableMenuOption",""); + $scope.$emit("cBEnableDisableMenuOption", ""); } @@ -478,31 +517,28 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ if ($scope.SelectedNotes != "" && $scope.SelectedNotes != undefined) { tinymce.get("CBTextArea").setContent($scope.SelectedNotes); - $scope.LoadModuleName = []; - $scope.Slidenumber = $scope.selectedNodeSingleObj._id; + $scope.LoadModuleName = []; + $scope.Slidenumber = $scope.selectedNodeSingleObj._id; setTimeout(function () { if ($scope.selectedNodeSingleObj.windows != "") { $scope.loadContentOfSelectedSlide($scope.selectedNodeSingleObj._id) } - else - { + else { $scope.CBEnableUI(); } - },200); + }, 200); //$scope.CBEnableUI(); } - else - { + else { tinymce.get("CBTextArea").setContent(""); $scope.CBEnableUI(); } } - else - { + else { $scope.CBEnableUI(); } } @@ -571,7 +607,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ //document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSingleObj).length; document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSiblingObjs).length; } - else{ + else { document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSingleObj).length; } } @@ -815,7 +851,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ var newSummary = document.getElementById('cbRenameSummary').value; var newversion = document.getElementById('cbRenameVersionNo').value; var newSectionText = document.getElementById('cbRenameSectionTitle').value; - if (newSectionText == ""){ + if (newSectionText == "") { newSectionText = $scope.selectedNodeSingleObj._label; } var newSlideName = ("" + newSectionText + ""); @@ -1262,15 +1298,15 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $rootScope.contentNotesForSaveCB = remaingNotesForCB; - traverseTreeSelectedSingleObj($rootScope.stru, cbCurrentId); + traverseTreeSelectedSingleObj($rootScope.stru, cbCurrentId); if ($scope.selectedNodeSingleObj._isBranch == "false") { - $rootScope.contentNotesForSaveCB.push( - { - "notes": notesForSelectedSlide, - "windows": windowsInSelectedSlide, - "_id": cbCurrentId - }); + $rootScope.contentNotesForSaveCB.push( + { + "notes": notesForSelectedSlide, + "windows": windowsInSelectedSlide, + "_id": cbCurrentId + }); } else if ($scope.selectedNodeSingleObj._isBranch == "true" && $scope.selectedNodeSingleObj._isRoot == "true") { @@ -1280,7 +1316,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ { "windows": windowsInSelectedSlide, "summary": $scope.selectedNodeSingleObj.summary, - "author": $scope.selectedNodeSingleObj.author, + "author": $scope.selectedNodeSingleObj.author, "modified": $scope.selectedNodeSingleObj.modified, "password": "", "version": $scope.selectedNodeSingleObj.version, @@ -1310,7 +1346,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $rootScope.cbDynamicContents = $rootScope.contentNotesForSaveCB; $rootScope.note = $rootScope.contentNotesForSaveCB; - console.log($rootScope.contentNotesForSaveCB); + console.log($rootScope.contentNotesForSaveCB); } @@ -1327,7 +1363,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ //$rootScope.contentNotesForSaveCB = $rootScope.cbJsonData.slideshow.content.element; $rootScope.contentNotesForSaveCB = $rootScope.cbDynamicContents;//Assign Dnamic Contents } - $rootScope.updatedContentFromEditor(cbCurrentId); + $rootScope.updatedContentFromEditor(cbCurrentId); $rootScope.dynamicUpdatedJsonForSaveCB = { @@ -1368,12 +1404,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ else { $(document).execCommand("SaveAs", true, filename); - document.execCommand("SaveAs", true, filename); - angular.element(document.execCommand("SaveAs", false, filename)).scope(); + document.execCommand("SaveAs", true, filename); + angular.element(document.execCommand("SaveAs", false, filename)).scope(); //var e = document.createEvent('MouseEvents'), //a = document.createElement('a'); - // a.download = filename; + // a.download = filename; //a.href = window.URL.createObjectURL(blob); //a.dataset.downloadurl = ['text/json', a.download, a.href].join(':'); //e.initEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); @@ -1384,19 +1420,19 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ //$rootScope.contentNotesForSaveCB = []; //$rootScope.structureObjForSaveCB = []; - // $http({ method: 'Post', url: $scope.fileName }).success(function (data) { - // localStorage.setItem("cbJsonDataObject", JSON.stringify(data)); - // $rootScope.cbJsonData = JSON.parse(localStorage.getItem("cbJsonDataObject")); - // $rootScope.cbDynamicJsonData = data; - // //$scope.getCBsummary(); - // $rootScope.cbJsonData.slideshow.content.element = "Eement data"; - // $rootScope.cbDynamicJsonData.slideshow.content.element = "slideshow element data"; - // $rootScope.note = "save data" - // //$scope.openCurriculumDetail(); - // }) - //.error(function (data, status, headers, config) { - // console.log(data); - //}); + // $http({ method: 'Post', url: $scope.fileName }).success(function (data) { + // localStorage.setItem("cbJsonDataObject", JSON.stringify(data)); + // $rootScope.cbJsonData = JSON.parse(localStorage.getItem("cbJsonDataObject")); + // $rootScope.cbDynamicJsonData = data; + // //$scope.getCBsummary(); + // $rootScope.cbJsonData.slideshow.content.element = "Eement data"; + // $rootScope.cbDynamicJsonData.slideshow.content.element = "slideshow element data"; + // $rootScope.note = "save data" + // //$scope.openCurriculumDetail(); + // }) + //.error(function (data, status, headers, config) { + // console.log(data); + //}); }; $scope.addSection = function (currentid, AddSecionId) { @@ -1413,14 +1449,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ if (currentid == "-225638207") { $rootScope.selectedNodeSingle.push( { - "structure": { - "structure": [ - ], - "_label": "New Section", - "_id": AddSecionId, - "_isRoot": "false", - "_isBranch": "true", - "_isLocked": "false" + "structure": { + "structure": [ + ], + "_label": "New Section", + "_id": AddSecionId, + "_isRoot": "false", + "_isBranch": "true", + "_isLocked": "false" } }); @@ -1475,11 +1511,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ // }); //} //else { - for (var i = 0; i < $rootScope.structureObjForSaveCB.length; i++) { - if ($rootScope.structureObjForSaveCB[i]._id == currentid) { - $rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure']; - } + for (var i = 0; i < $rootScope.structureObjForSaveCB.length; i++) { + if ($rootScope.structureObjForSaveCB[i]._id == currentid) { + $rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure']; } + } //} } // setTimeout(function () { traverseTreeForSetIcons($rootScope.stru, currentid); }, 1500); @@ -1504,13 +1540,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ "_isBranch": "false", "_isLocked": "false" }); - $rootScope.structureObjForSaveCB.push({ + $rootScope.structureObjForSaveCB.push({ "_label": "NEW Slide1", "_id": AddSlideId, "_isRoot": "false", "_isBranch": "false", "_isLocked": "false" - }); + }); } else { $scope.selectedNodeSingleObj['structure'].push({ @@ -1537,11 +1573,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ // }); //} //else { - for (var i = 0; i < $rootScope.structureObjForSaveCB.length; i++) { - if ($rootScope.structureObjForSaveCB[i]._id == currentid) { - $rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure']; - } + for (var i = 0; i < $rootScope.structureObjForSaveCB.length; i++) { + if ($rootScope.structureObjForSaveCB[i]._id == currentid) { + $rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure']; } + } //} } // setTimeout(function () { traverseTreeForSetIcons($rootScope.stru, currentid); }, 3000); @@ -1617,7 +1653,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ .from(content) .where("_id == " + id) .select(); - // console.log('contenctForSelectedSlide' + contenctForSelectedSlide[0].notes) + // console.log('contenctForSelectedSlide' + contenctForSelectedSlide[0].notes) var windowsInSelectedSlide = contenctForSelectedSlide[0].windows; var allwindowData = windowsInSelectedSlide.window; var windowData; @@ -1765,49 +1801,49 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ if ($scope.LoadModuleName != undefined) { - var index = $scope.LoadModuleName.indexOf(name); - if (index != -1) { - // remove module which one is loaded - $scope.LoadModuleName.splice(index, 1); - } + var index = $scope.LoadModuleName.indexOf(name); + if (index != -1) { + // remove module which one is loaded + $scope.LoadModuleName.splice(index, 1); + } - if ($scope.LoadModuleName.length > 0) { - var nextmodulename = $scope.LoadModuleName[0]; - $scope.loadModuleWithCB(nextmodulename); + if ($scope.LoadModuleName.length > 0) { + var nextmodulename = $scope.LoadModuleName[0]; + $scope.loadModuleWithCB(nextmodulename); - } - else { //Added Code by sandeep for user story-52696 - $("#viwerSelect").empty(); - var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']"); - if (modulePanel != undefined && modulePanel != null) { - // $('#viwerSelect').append(''); - - //Added code by sandeep for fixed Bug-58066 - if (modulePanel.length > 0) { - $('#viwerSelect').show(); - } - } - else { - $('#viwerSelect').hide(); - } - for (var i = 0 ; i < modulePanel.length; i++) { - var paneld = modulePanel[i].id; - var panelTitle = document.getElementById(paneld).childNodes[0].innerText; - $('#viwerSelect').append(''); - } + } + else { //Added Code by sandeep for user story-52696 + $("#viwerSelect").empty(); + var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']"); + if (modulePanel != undefined && modulePanel != null) { + // $('#viwerSelect').append(''); - $scope.CBEnableUI(); - // scroll down to first panel + //Added code by sandeep for fixed Bug-58066 if (modulePanel.length > 0) { - if (modulePanel[0].id != undefined) { - var lastpanel = modulePanel[0].id; - //$('body,html').animate({ scrollTop: $('#' + lastpanel).position().top }, 1000); - } - } - - + $('#viwerSelect').show(); + } + } + else { + $('#viwerSelect').hide(); + } + for (var i = 0 ; i < modulePanel.length; i++) { + var paneld = modulePanel[i].id; + var panelTitle = document.getElementById(paneld).childNodes[0].innerText; + $('#viwerSelect').append(''); } + $scope.CBEnableUI(); + // scroll down to first panel + if (modulePanel.length > 0) { + if (modulePanel[0].id != undefined) { + var lastpanel = modulePanel[0].id; + //$('body,html').animate({ scrollTop: $('#' + lastpanel).position().top }, 1000); + } + } + + + } + } }); @@ -1970,24 +2006,23 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } $scope.loadDissectibleAnatomyModule = function (moduleName) { - var DAData = ModuleService.getModuleData(moduleName); + var DAData = ModuleService.getModuleData(moduleName); - if (DAData != undefined && DAData.length > 0) { - $rootScope.isCallFromOtherModule = true; + if (DAData != undefined && DAData.length > 0) { + $rootScope.isCallFromOtherModule = true; - var daSectionExist = document.getElementById('daCustomModuleDiv'); + var daSectionExist = document.getElementById('daCustomModuleDiv'); - if (daSectionExist==null){ - $('#cbparentcustomDiv').append($('
')); - $e = $('#daCustomModuleDiv').append(""); - $compile($e)($scope); - } - else - { - // open new da panel on same slide by open resource - $rootScope.openDABodyViewMain(); - } + if (daSectionExist == null) { + $('#cbparentcustomDiv').append($('
')); + $e = $('#daCustomModuleDiv').append(""); + $compile($e)($scope); } + else { + // open new da panel on same slide by open resource + $rootScope.openDABodyViewMain(); + } + } } @@ -2061,13 +2096,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ findKeyForChange($rootScope.contentNotesForSaveCB, currentId); $scope.selectedKey.windows.window = []; - for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) - { + for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) { var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]); $scope.selectedKey.windows.window.push(arrToStrWinObj); } - $scope.updatedWindowListForSaveCB = []; - console.log($scope.selectedKey.windows.window); + $scope.updatedWindowListForSaveCB = []; + console.log($scope.selectedKey.windows.window); } $scope.saveCIWindowActivity_Old = function (keyName, value) { @@ -2128,7 +2162,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ for (i in o) { if (o[i] !== null && typeof (o[i]) == "object") { - if (o[i]._id == keyname) { + if (o[i]._id == keyname) { $scope.selectedKey = o[i]; } findKeyForChange(o[i], keyname); @@ -2143,31 +2177,31 @@ 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 ) { + if ($rootScope.CIWindowData != undefined && $rootScope.CIWindowData.length > 0) { for (var i = 0; i < $rootScope.CIWindowData.length; i++) { $scope.updatedWindowListForSaveCB.push({ containsCapturedContent: true,//$rootScope.CIWindowData[i] // N - annotationData: "",//$rootScope.CIWindowData[i] N - contextMenu: { lockResize: false, hideTitleBar: false }, // N - position: { - top: $rootScope.CIWindowData[i].top, - left: $rootScope.CIWindowData[i].left, - }, - size: { - height: $rootScope.CIWindowData[i].height, - width: $rootScope.CIWindowData[i].width - }, - textVisible: $rootScope.CIWindowData[i].isTextVisible, - imageId: $rootScope.CIWindowData[i].imageId, - minimised: $rootScope.CIWindowData[i].minimised, - windowTitle: $rootScope.CIWindowData[i].currentViewTitle, - maximised: $rootScope.CIWindowData[i].maximised, - mType: $rootScope.CIWindowData[i].moduleName, - id: $rootScope.CIWindowData[i].imageId, - scrollPosition: { vertical: 0, horizontal: 0 },// N - windowListId: 0 //$rootScope.CIWindowData[i] // N - }); + annotationData: "",//$rootScope.CIWindowData[i] N + contextMenu: { lockResize: false, hideTitleBar: false }, // N + position: { + top: $rootScope.CIWindowData[i].top, + left: $rootScope.CIWindowData[i].left, + }, + size: { + height: $rootScope.CIWindowData[i].height, + width: $rootScope.CIWindowData[i].width + }, + textVisible: $rootScope.CIWindowData[i].isTextVisible, + imageId: $rootScope.CIWindowData[i].imageId, + minimised: $rootScope.CIWindowData[i].minimised, + windowTitle: $rootScope.CIWindowData[i].currentViewTitle, + maximised: $rootScope.CIWindowData[i].maximised, + mType: $rootScope.CIWindowData[i].moduleName, + id: $rootScope.CIWindowData[i].imageId, + scrollPosition: { vertical: 0, horizontal: 0 },// N + windowListId: 0 //$rootScope.CIWindowData[i] // N + }); } $rootScope.CIWindowData = []; @@ -2216,7 +2250,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ containsCapturedContent: true,//$rootScope.TheeDWindowData[i] // N //annotationData: "",//$rootScope.TheeDWindowData[i] N - contextMenu:{ lockResize: true, hideTitleBar: true, hideToolBar: false, hideLeftBar: false, hideTopToolBar: false }, + contextMenu: { lockResize: true, hideTitleBar: true, hideToolBar: false, hideLeftBar: false, hideTopToolBar: false }, position: { top: $rootScope.TheeDWindowData[i].top, left: $rootScope.TheeDWindowData[i].left, @@ -2235,7 +2269,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ windowListId: 0, //$rootScope.TheeDWindowData[i] // N threeDData: $rootScope.TheeDWindowData[i].threeDAnatomyData, contentPath: $rootScope.TheeDWindowData[i].ImagePath, - scrollPosition: { vertical: $rootScope.TheeDWindowData[i].verticalScroll ? 0 : 0 , horizontal: 0 }, + scrollPosition: { vertical: $rootScope.TheeDWindowData[i].verticalScroll ? 0 : 0, horizontal: 0 }, }); } @@ -2245,33 +2279,33 @@ 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 = []; + // 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 = []; //} } @@ -2282,49 +2316,49 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ for (var i = 0; i < $rootScope.AAWindowData.length; i++) { $scope.updatedWindowListForSaveCB.push({ - windowTitle: $rootScope.AAWindowData[i].currentViewTitle, - hideAllPins: $rootScope.AAWindowData[i].isHidePinBtnClicked, - selectedCallouts: $rootScope.AAWindowData[i].CBselectedpinCordinate, - annotationData: "",//No find in AA.js - minimised: $rootScope.AAWindowData[i].minimised, - scrollPosition: { - vertical: $rootScope.AAWindowData[i].verticalScroll, - horizontal: $rootScope.AAWindowData[i].horizontalScroll - }, - selectedStructureID: 0,//N - selectedPins: $rootScope.AAWindowData[i].selectedPins, - maximised: $rootScope.AAWindowData[i].maximised, - size: { - width: $rootScope.AAWindowData[i].width, - height: $rootScope.AAWindowData[i].height - }, - id: $rootScope.AAWindowData[i].id, - showSelectedPins: $rootScope.AAWindowData[i].isShowSelectedPins, - hideCallOuts: false,//N - showAllPins: $rootScope.AAWindowData[i].isShowAllPins, - scaleIndex: $rootScope.AAWindowData[i].sliderVal, - bodySystemId: $rootScope.AAWindowData[i].SelectedSystemID, - windowListId: "0",//N - imageId: $rootScope.AAWindowData[i].imageId, - //position: { x: 840, y: 263 }, - position: { - top: $rootScope.AAWindowData[i].top, - left: $rootScope.AAWindowData[i].left, - }, - mType: $rootScope.AAWindowData[i].moduleName, - containsCapturedContent: true, - contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false }, - //activePinArray: $rootScope.AAWindowData[i].activePinArray, - selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId - //typeOfEvent: $rootScope.AAWindowData[i].typeOfEvent + windowTitle: $rootScope.AAWindowData[i].currentViewTitle, + hideAllPins: $rootScope.AAWindowData[i].isHidePinBtnClicked, + selectedCallouts: $rootScope.AAWindowData[i].CBselectedpinCordinate, + annotationData: "",//No find in AA.js + minimised: $rootScope.AAWindowData[i].minimised, + scrollPosition: { + vertical: $rootScope.AAWindowData[i].verticalScroll, + horizontal: $rootScope.AAWindowData[i].horizontalScroll + }, + selectedStructureID: 0,//N + selectedPins: $rootScope.AAWindowData[i].selectedPins, + maximised: $rootScope.AAWindowData[i].maximised, + size: { + width: $rootScope.AAWindowData[i].width, + height: $rootScope.AAWindowData[i].height + }, + id: $rootScope.AAWindowData[i].id, + showSelectedPins: $rootScope.AAWindowData[i].isShowSelectedPins, + hideCallOuts: false,//N + showAllPins: $rootScope.AAWindowData[i].isShowAllPins, + scaleIndex: $rootScope.AAWindowData[i].sliderVal, + bodySystemId: $rootScope.AAWindowData[i].SelectedSystemID, + windowListId: "0",//N + imageId: $rootScope.AAWindowData[i].imageId, + //position: { x: 840, y: 263 }, + position: { + top: $rootScope.AAWindowData[i].top, + left: $rootScope.AAWindowData[i].left, + }, + mType: $rootScope.AAWindowData[i].moduleName, + containsCapturedContent: true, + contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false }, + //activePinArray: $rootScope.AAWindowData[i].activePinArray, + selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId + //typeOfEvent: $rootScope.AAWindowData[i].typeOfEvent }); } $rootScope.AAWindowData = []; - } } + } //Save DISSECTIBLE_ANATOMY activity for CB $scope.saveDAWindowActivity = function () { @@ -2338,7 +2372,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ highlightOptionsSelectedId: 0, selectedStructureID: 0,//N contentDescriptorId: 0, - callOuts: $rootScope.DaWindowData[i].CurriculumTermData, + callOuts: $rootScope.DaWindowData[i].CurriculumTermData, //hideAllPins: $rootScope.DaWindowData[i].isHidePinBtnClicked, //selectedCallouts: $rootScope.DaWindowData[i].CBselectedpinCordinate, layerNumber: parseInt($rootScope.DaWindowData[i].layerNumber) + 1, @@ -2360,7 +2394,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ }, id: $rootScope.DaWindowData[i].voId, //showSelectedPins: $rootScope.DaWindowData[i].isShowSelectedSystemPinsClicked, - // hideCallOuts: false,//N + // hideCallOuts: false,//N //showAllPins: $rootScope.DaWindowData[i].isShowBodyWithCBPinData,//N //scaleIndex: 0,//N //bodySystemId: $rootScope.DaWindowData[i].SelectedSystemID, @@ -2375,14 +2409,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ //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, + zoom: $rootScope.DaWindowData[i].zoomInOut, skinId: $rootScope.DaWindowData[i].curentEthnicity, - isResizeLock: false , //.isResizeLock,//N + isResizeLock: false, //.isResizeLock,//N mode: $rootScope.DaWindowData[i].mode, windowListId: 0,//windowData.windowListId,//25 canvasVScrollX: $rootScope.DaWindowData[i].CanvasDivTopPosition, - canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition, - isCallOutVisible: false, + canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition, + isCallOutVisible: false, annotationData: "", // .annotationData,//24 transparencyBounds: 0,//windowData.transparencyBounds, isLeftToolBarVisible: false, //windowData.isLeftToolBarVisible,//N @@ -2398,27 +2432,27 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } } - $scope.updateWindowsContentForSaveCB = function (currentId) { - + $scope.updateWindowsContentForSaveCB = function (currentId) { + $scope.saveDAWindowActivity(currentId); $scope.saveAAWindowActivity(currentId); $scope.saveCIWindowActivity(currentId); $scope.saveCAWindowActivity(currentId); - $scope.save3DWindowActivity(currentId); + $scope.save3DWindowActivity(currentId); //$scope.savePicWindowActivity($scope.windowDataforCB); //if ($scope.updatedWindowListForSaveCB.length > 0) { - findKeyForChange($rootScope.contentNotesForSaveCB, currentId); - $scope.selectedKey.windows.window = []; - if ($scope.updatedWindowListForSaveCB.length > 0) { - for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) { - var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]); - if ($scope.selectedKey.windows.window != undefined) { - $scope.selectedKey.windows.window.push(arrToStrWinObj); - } - + findKeyForChange($rootScope.contentNotesForSaveCB, currentId); + $scope.selectedKey.windows.window = []; + if ($scope.updatedWindowListForSaveCB.length > 0) { + for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) { + var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]); + if ($scope.selectedKey.windows.window != undefined) { + $scope.selectedKey.windows.window.push(arrToStrWinObj); } + } + } //} $scope.updatedWindowListForSaveCB = []; console.log($rootScope.contentNotesForSaveCB); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-TinyMCEjspanel.html b/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-TinyMCEjspanel.html index d48b840..d44815f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-TinyMCEjspanel.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-TinyMCEjspanel.html @@ -3,19 +3,19 @@
-
+
- + - +
@@ -56,48 +56,48 @@
-
- -
- +
+
+
+ +