Commit 8de63810f4bf3d96f3ce8b85ebccd2df615871bb
1 parent
33514e8a
bug is fixed
Showing
2 changed files
with
309 additions
and
279 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
... | ... | @@ -36,7 +36,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
36 | 36 | $("#sidebar-wrapper").on('click', function (event) { |
37 | 37 | |
38 | 38 | //4. on click disable menu option |
39 | - $scope.$emit("cBEnableDisableMenuOption",""); | |
39 | + $scope.$emit("cBEnableDisableMenuOption", ""); | |
40 | 40 | }); |
41 | 41 | |
42 | 42 | // close all selected open panel in CB |
... | ... | @@ -84,14 +84,34 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
84 | 84 | $('#HomeContainerDiv').css('pointer-events', 'none'); |
85 | 85 | $('#HomeContainerDiv').css('opacity', '0.7'); |
86 | 86 | |
87 | + | |
88 | + $('#CBTextArea_ifr').css('pointer-events', 'none'); | |
89 | + $('#CBTextArea_ifr').css('opacity', '0.7'); | |
90 | + | |
91 | + | |
92 | + $('#jstree').css('pointer-events', 'none'); | |
93 | + $('#jstree').css('opacity', '0.7'); | |
94 | + | |
95 | + $('#cbEditorTopMenuBar').css('pointer-events', 'none'); | |
96 | + $('#cbEditorTopMenuBar').css('opacity', '0.7'); | |
97 | + | |
98 | + $('#cbEditorLeftSideBar').css('pointer-events', 'none'); | |
99 | + $('#cbEditorLeftSideBar').css('opacity', '0.7'); | |
100 | + | |
101 | + $('#cbEditorRightSideBar').css('pointer-events', 'none'); | |
102 | + $('#cbEditorRightSideBar').css('opacity', '0.7'); | |
103 | + | |
104 | + $('.tox-editor-header').css('pointer-events', 'none'); | |
105 | + $('.tox-editor-header').css('opacity', '0.7'); | |
106 | + | |
107 | + | |
87 | 108 | $timeout(function () { |
88 | 109 | |
89 | 110 | // in case failed default time out 40 second |
90 | 111 | |
91 | 112 | var opcity = $("#HomeContainerDiv").css("opacity") |
92 | 113 | |
93 | - if (opcity != 1) | |
94 | - { | |
114 | + if (opcity != 1) { | |
95 | 115 | $scope.CBEnableUI(); |
96 | 116 | } |
97 | 117 | }, 40000); |
... | ... | @@ -105,6 +125,25 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
105 | 125 | // CB module enable all |
106 | 126 | $('#HomeContainerDiv').css('pointer-events', 'auto'); |
107 | 127 | $('#HomeContainerDiv').css('opacity', '1'); |
128 | + | |
129 | + $('#CBTextArea_ifr').css('pointer-events', 'auto'); | |
130 | + $('#CBTextArea_ifr').css('opacity', '1'); | |
131 | + | |
132 | + $('#jstree').css('pointer-events', 'auto'); | |
133 | + $('#jstree').css('opacity', '1'); | |
134 | + | |
135 | + $('#cbEditorTopMenuBar').css('pointer-events', 'auto'); | |
136 | + $('#cbEditorTopMenuBar').css('opacity', '1'); | |
137 | + | |
138 | + $('#cbEditorLeftSideBar').css('pointer-events', 'auto'); | |
139 | + $('#cbEditorLeftSideBar').css('opacity', '1'); | |
140 | + | |
141 | + $('#cbEditorRightSideBar').css('pointer-events', 'auto'); | |
142 | + $('#cbEditorRightSideBar').css('opacity', '01'); | |
143 | + | |
144 | + $('.tox-editor-header').css('pointer-events', 'auto'); | |
145 | + $('.tox-editor-header').css('opacity', '1'); | |
146 | + | |
108 | 147 | } |
109 | 148 | |
110 | 149 | }); |
... | ... | @@ -169,9 +208,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
169 | 208 | |
170 | 209 | $scope.loadSlideShowXmldata = function (e) { |
171 | 210 | $scope.CBDisableUI(); |
172 | - $rootScope.AutherName=""; | |
173 | - $rootScope.summary=""; | |
174 | - $rootScope.FileTitle=e.target.text; | |
211 | + $rootScope.AutherName = ""; | |
212 | + $rootScope.summary = ""; | |
213 | + $rootScope.FileTitle = e.target.text; | |
175 | 214 | |
176 | 215 | $scope.fileName = e.target.id.split('.'); |
177 | 216 | $('#modal-CurBuilder').css("display", "block"); |
... | ... | @@ -284,12 +323,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
284 | 323 | |
285 | 324 | $scope.ImagePanelclick(); |
286 | 325 | var imfgEle = document.getElementById("imgtag"); |
287 | - if (imfgEle!=null) | |
326 | + if (imfgEle != null) | |
288 | 327 | imfgEle.src = "data:image/png;base64," + $rootScope.windowsimageSource; |
289 | 328 | |
290 | 329 | setTimeout(function () { |
291 | - var cleintht=imfgEle.clientHeight; | |
292 | - if(cleintht>0) | |
330 | + var cleintht = imfgEle.clientHeight; | |
331 | + if (cleintht > 0) | |
293 | 332 | $('#CBSourceImagePanel .jsPanel-content').css('height', cleintht); |
294 | 333 | $scope.CBEnableUI(); |
295 | 334 | }, 200) |
... | ... | @@ -299,8 +338,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
299 | 338 | |
300 | 339 | $scope.ImagePanelclick = function () { |
301 | 340 | $("#CBSourceImagePanel").on('click', function (event) { |
302 | - var pnlName=event.currentTarget.id; | |
303 | - $scope.$emit("cBEnableDisableMenuOption",pnlName); | |
341 | + var pnlName = event.currentTarget.id; | |
342 | + $scope.$emit("cBEnableDisableMenuOption", pnlName); | |
304 | 343 | }); |
305 | 344 | } |
306 | 345 | $rootScope.getCBsummary = function () { |
... | ... | @@ -382,7 +421,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
382 | 421 | |
383 | 422 | $timeout(function () { |
384 | 423 | $scope.TinyMCEPanelclick(); |
385 | - },1000); | |
424 | + }, 1000); | |
386 | 425 | |
387 | 426 | } |
388 | 427 | |
... | ... | @@ -391,15 +430,15 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
391 | 430 | $("#CBTinyMCEPanel").on('click', function (event) { |
392 | 431 | |
393 | 432 | //3. on click disable menu option |
394 | - $scope.$emit("cBEnableDisableMenuOption",""); | |
433 | + $scope.$emit("cBEnableDisableMenuOption", ""); | |
395 | 434 | }); |
396 | 435 | } |
397 | 436 | |
398 | 437 | |
399 | - $scope.myeditorclick=function() { | |
438 | + $scope.myeditorclick = function () { | |
400 | 439 | |
401 | 440 | //1. disable menu options |
402 | - $scope.$emit("cBEnableDisableMenuOption",""); | |
441 | + $scope.$emit("cBEnableDisableMenuOption", ""); | |
403 | 442 | |
404 | 443 | } |
405 | 444 | |
... | ... | @@ -478,31 +517,28 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
478 | 517 | |
479 | 518 | if ($scope.SelectedNotes != "" && $scope.SelectedNotes != undefined) { |
480 | 519 | tinymce.get("CBTextArea").setContent($scope.SelectedNotes); |
481 | - $scope.LoadModuleName = []; | |
482 | - $scope.Slidenumber = $scope.selectedNodeSingleObj._id; | |
520 | + $scope.LoadModuleName = []; | |
521 | + $scope.Slidenumber = $scope.selectedNodeSingleObj._id; | |
483 | 522 | |
484 | 523 | setTimeout(function () { |
485 | 524 | if ($scope.selectedNodeSingleObj.windows != "") { |
486 | 525 | $scope.loadContentOfSelectedSlide($scope.selectedNodeSingleObj._id) |
487 | 526 | |
488 | 527 | } |
489 | - else | |
490 | - { | |
528 | + else { | |
491 | 529 | $scope.CBEnableUI(); |
492 | 530 | |
493 | 531 | } |
494 | - },200); | |
532 | + }, 200); | |
495 | 533 | //$scope.CBEnableUI(); |
496 | 534 | } |
497 | - else | |
498 | - { | |
535 | + else { | |
499 | 536 | tinymce.get("CBTextArea").setContent(""); |
500 | 537 | $scope.CBEnableUI(); |
501 | 538 | } |
502 | 539 | |
503 | 540 | } |
504 | - else | |
505 | - { | |
541 | + else { | |
506 | 542 | $scope.CBEnableUI(); |
507 | 543 | } |
508 | 544 | } |
... | ... | @@ -571,7 +607,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
571 | 607 | //document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSingleObj).length; |
572 | 608 | document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSiblingObjs).length; |
573 | 609 | } |
574 | - else{ | |
610 | + else { | |
575 | 611 | document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSingleObj).length; |
576 | 612 | } |
577 | 613 | } |
... | ... | @@ -815,7 +851,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
815 | 851 | var newSummary = document.getElementById('cbRenameSummary').value; |
816 | 852 | var newversion = document.getElementById('cbRenameVersionNo').value; |
817 | 853 | var newSectionText = document.getElementById('cbRenameSectionTitle').value; |
818 | - if (newSectionText == ""){ | |
854 | + if (newSectionText == "") { | |
819 | 855 | newSectionText = $scope.selectedNodeSingleObj._label; |
820 | 856 | } |
821 | 857 | var newSlideName = ("<span id=" + nodeid + " class='ng-binding ng-scope'>" + newSectionText + "</span>"); |
... | ... | @@ -1262,15 +1298,15 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1262 | 1298 | $rootScope.contentNotesForSaveCB = remaingNotesForCB; |
1263 | 1299 | |
1264 | 1300 | |
1265 | - traverseTreeSelectedSingleObj($rootScope.stru, cbCurrentId); | |
1301 | + traverseTreeSelectedSingleObj($rootScope.stru, cbCurrentId); | |
1266 | 1302 | |
1267 | 1303 | if ($scope.selectedNodeSingleObj._isBranch == "false") { |
1268 | - $rootScope.contentNotesForSaveCB.push( | |
1269 | - { | |
1270 | - "notes": notesForSelectedSlide, | |
1271 | - "windows": windowsInSelectedSlide, | |
1272 | - "_id": cbCurrentId | |
1273 | - }); | |
1304 | + $rootScope.contentNotesForSaveCB.push( | |
1305 | + { | |
1306 | + "notes": notesForSelectedSlide, | |
1307 | + "windows": windowsInSelectedSlide, | |
1308 | + "_id": cbCurrentId | |
1309 | + }); | |
1274 | 1310 | } |
1275 | 1311 | |
1276 | 1312 | else if ($scope.selectedNodeSingleObj._isBranch == "true" && $scope.selectedNodeSingleObj._isRoot == "true") { |
... | ... | @@ -1280,7 +1316,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1280 | 1316 | { |
1281 | 1317 | "windows": windowsInSelectedSlide, |
1282 | 1318 | "summary": $scope.selectedNodeSingleObj.summary, |
1283 | - "author": $scope.selectedNodeSingleObj.author, | |
1319 | + "author": $scope.selectedNodeSingleObj.author, | |
1284 | 1320 | "modified": $scope.selectedNodeSingleObj.modified, |
1285 | 1321 | "password": "", |
1286 | 1322 | "version": $scope.selectedNodeSingleObj.version, |
... | ... | @@ -1310,7 +1346,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1310 | 1346 | $rootScope.cbDynamicContents = $rootScope.contentNotesForSaveCB; |
1311 | 1347 | $rootScope.note = $rootScope.contentNotesForSaveCB; |
1312 | 1348 | |
1313 | - console.log($rootScope.contentNotesForSaveCB); | |
1349 | + console.log($rootScope.contentNotesForSaveCB); | |
1314 | 1350 | |
1315 | 1351 | } |
1316 | 1352 | |
... | ... | @@ -1327,7 +1363,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1327 | 1363 | //$rootScope.contentNotesForSaveCB = $rootScope.cbJsonData.slideshow.content.element; |
1328 | 1364 | $rootScope.contentNotesForSaveCB = $rootScope.cbDynamicContents;//Assign Dnamic Contents |
1329 | 1365 | } |
1330 | - $rootScope.updatedContentFromEditor(cbCurrentId); | |
1366 | + $rootScope.updatedContentFromEditor(cbCurrentId); | |
1331 | 1367 | |
1332 | 1368 | $rootScope.dynamicUpdatedJsonForSaveCB = |
1333 | 1369 | { |
... | ... | @@ -1368,12 +1404,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1368 | 1404 | else { |
1369 | 1405 | |
1370 | 1406 | $(document).execCommand("SaveAs", true, filename); |
1371 | - document.execCommand("SaveAs", true, filename); | |
1372 | - angular.element(document.execCommand("SaveAs", false, filename)).scope(); | |
1407 | + document.execCommand("SaveAs", true, filename); | |
1408 | + angular.element(document.execCommand("SaveAs", false, filename)).scope(); | |
1373 | 1409 | |
1374 | 1410 | //var e = document.createEvent('MouseEvents'), |
1375 | 1411 | //a = document.createElement('a'); |
1376 | - // a.download = filename; | |
1412 | + // a.download = filename; | |
1377 | 1413 | //a.href = window.URL.createObjectURL(blob); |
1378 | 1414 | //a.dataset.downloadurl = ['text/json', a.download, a.href].join(':'); |
1379 | 1415 | //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, $ |
1384 | 1420 | //$rootScope.contentNotesForSaveCB = []; |
1385 | 1421 | //$rootScope.structureObjForSaveCB = []; |
1386 | 1422 | |
1387 | - // $http({ method: 'Post', url: $scope.fileName }).success(function (data) { | |
1388 | - // localStorage.setItem("cbJsonDataObject", JSON.stringify(data)); | |
1389 | - // $rootScope.cbJsonData = JSON.parse(localStorage.getItem("cbJsonDataObject")); | |
1390 | - // $rootScope.cbDynamicJsonData = data; | |
1391 | - // //$scope.getCBsummary(); | |
1392 | - // $rootScope.cbJsonData.slideshow.content.element = "Eement data"; | |
1393 | - // $rootScope.cbDynamicJsonData.slideshow.content.element = "slideshow element data"; | |
1394 | - // $rootScope.note = "save data" | |
1395 | - // //$scope.openCurriculumDetail(); | |
1396 | - // }) | |
1397 | - //.error(function (data, status, headers, config) { | |
1398 | - // console.log(data); | |
1399 | - //}); | |
1423 | + // $http({ method: 'Post', url: $scope.fileName }).success(function (data) { | |
1424 | + // localStorage.setItem("cbJsonDataObject", JSON.stringify(data)); | |
1425 | + // $rootScope.cbJsonData = JSON.parse(localStorage.getItem("cbJsonDataObject")); | |
1426 | + // $rootScope.cbDynamicJsonData = data; | |
1427 | + // //$scope.getCBsummary(); | |
1428 | + // $rootScope.cbJsonData.slideshow.content.element = "Eement data"; | |
1429 | + // $rootScope.cbDynamicJsonData.slideshow.content.element = "slideshow element data"; | |
1430 | + // $rootScope.note = "save data" | |
1431 | + // //$scope.openCurriculumDetail(); | |
1432 | + // }) | |
1433 | + //.error(function (data, status, headers, config) { | |
1434 | + // console.log(data); | |
1435 | + //}); | |
1400 | 1436 | }; |
1401 | 1437 | |
1402 | 1438 | $scope.addSection = function (currentid, AddSecionId) { |
... | ... | @@ -1413,14 +1449,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1413 | 1449 | if (currentid == "-225638207") { |
1414 | 1450 | $rootScope.selectedNodeSingle.push( |
1415 | 1451 | { |
1416 | - "structure": { | |
1417 | - "structure": [ | |
1418 | - ], | |
1419 | - "_label": "New Section", | |
1420 | - "_id": AddSecionId, | |
1421 | - "_isRoot": "false", | |
1422 | - "_isBranch": "true", | |
1423 | - "_isLocked": "false" | |
1452 | + "structure": { | |
1453 | + "structure": [ | |
1454 | + ], | |
1455 | + "_label": "New Section", | |
1456 | + "_id": AddSecionId, | |
1457 | + "_isRoot": "false", | |
1458 | + "_isBranch": "true", | |
1459 | + "_isLocked": "false" | |
1424 | 1460 | } |
1425 | 1461 | |
1426 | 1462 | }); |
... | ... | @@ -1475,11 +1511,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1475 | 1511 | // }); |
1476 | 1512 | //} |
1477 | 1513 | //else { |
1478 | - for (var i = 0; i < $rootScope.structureObjForSaveCB.length; i++) { | |
1479 | - if ($rootScope.structureObjForSaveCB[i]._id == currentid) { | |
1480 | - $rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure']; | |
1481 | - } | |
1514 | + for (var i = 0; i < $rootScope.structureObjForSaveCB.length; i++) { | |
1515 | + if ($rootScope.structureObjForSaveCB[i]._id == currentid) { | |
1516 | + $rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure']; | |
1482 | 1517 | } |
1518 | + } | |
1483 | 1519 | //} |
1484 | 1520 | } |
1485 | 1521 | // setTimeout(function () { traverseTreeForSetIcons($rootScope.stru, currentid); }, 1500); |
... | ... | @@ -1504,13 +1540,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1504 | 1540 | "_isBranch": "false", |
1505 | 1541 | "_isLocked": "false" |
1506 | 1542 | }); |
1507 | - $rootScope.structureObjForSaveCB.push({ | |
1543 | + $rootScope.structureObjForSaveCB.push({ | |
1508 | 1544 | "_label": "NEW Slide1", |
1509 | 1545 | "_id": AddSlideId, |
1510 | 1546 | "_isRoot": "false", |
1511 | 1547 | "_isBranch": "false", |
1512 | 1548 | "_isLocked": "false" |
1513 | - }); | |
1549 | + }); | |
1514 | 1550 | } |
1515 | 1551 | else { |
1516 | 1552 | $scope.selectedNodeSingleObj['structure'].push({ |
... | ... | @@ -1537,11 +1573,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1537 | 1573 | // }); |
1538 | 1574 | //} |
1539 | 1575 | //else { |
1540 | - for (var i = 0; i < $rootScope.structureObjForSaveCB.length; i++) { | |
1541 | - if ($rootScope.structureObjForSaveCB[i]._id == currentid) { | |
1542 | - $rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure']; | |
1543 | - } | |
1576 | + for (var i = 0; i < $rootScope.structureObjForSaveCB.length; i++) { | |
1577 | + if ($rootScope.structureObjForSaveCB[i]._id == currentid) { | |
1578 | + $rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure']; | |
1544 | 1579 | } |
1580 | + } | |
1545 | 1581 | //} |
1546 | 1582 | } |
1547 | 1583 | // setTimeout(function () { traverseTreeForSetIcons($rootScope.stru, currentid); }, 3000); |
... | ... | @@ -1617,7 +1653,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1617 | 1653 | .from(content) |
1618 | 1654 | .where("_id == " + id) |
1619 | 1655 | .select(); |
1620 | - // console.log('contenctForSelectedSlide' + contenctForSelectedSlide[0].notes) | |
1656 | + // console.log('contenctForSelectedSlide' + contenctForSelectedSlide[0].notes) | |
1621 | 1657 | var windowsInSelectedSlide = contenctForSelectedSlide[0].windows; |
1622 | 1658 | var allwindowData = windowsInSelectedSlide.window; |
1623 | 1659 | var windowData; |
... | ... | @@ -1765,49 +1801,49 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1765 | 1801 | |
1766 | 1802 | if ($scope.LoadModuleName != undefined) { |
1767 | 1803 | |
1768 | - var index = $scope.LoadModuleName.indexOf(name); | |
1769 | - if (index != -1) { | |
1770 | - // remove module which one is loaded | |
1771 | - $scope.LoadModuleName.splice(index, 1); | |
1772 | - } | |
1804 | + var index = $scope.LoadModuleName.indexOf(name); | |
1805 | + if (index != -1) { | |
1806 | + // remove module which one is loaded | |
1807 | + $scope.LoadModuleName.splice(index, 1); | |
1808 | + } | |
1773 | 1809 | |
1774 | - if ($scope.LoadModuleName.length > 0) { | |
1775 | - var nextmodulename = $scope.LoadModuleName[0]; | |
1776 | - $scope.loadModuleWithCB(nextmodulename); | |
1810 | + if ($scope.LoadModuleName.length > 0) { | |
1811 | + var nextmodulename = $scope.LoadModuleName[0]; | |
1812 | + $scope.loadModuleWithCB(nextmodulename); | |
1777 | 1813 | |
1778 | - } | |
1779 | - else { //Added Code by sandeep for user story-52696 | |
1780 | - $("#viwerSelect").empty(); | |
1781 | - var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']"); | |
1782 | - if (modulePanel != undefined && modulePanel != null) { | |
1783 | - // $('#viwerSelect').append('<option selected value="' + 0 + '">' + "Select Viewer" + '</option>'); | |
1784 | - | |
1785 | - //Added code by sandeep for fixed Bug-58066 | |
1786 | - if (modulePanel.length > 0) { | |
1787 | - $('#viwerSelect').show(); | |
1788 | - } | |
1789 | - } | |
1790 | - else { | |
1791 | - $('#viwerSelect').hide(); | |
1792 | - } | |
1793 | - for (var i = 0 ; i < modulePanel.length; i++) { | |
1794 | - var paneld = modulePanel[i].id; | |
1795 | - var panelTitle = document.getElementById(paneld).childNodes[0].innerText; | |
1796 | - $('#viwerSelect').append('<option value="' + paneld + '">' + panelTitle + '</option>'); | |
1797 | - } | |
1814 | + } | |
1815 | + else { //Added Code by sandeep for user story-52696 | |
1816 | + $("#viwerSelect").empty(); | |
1817 | + var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']"); | |
1818 | + if (modulePanel != undefined && modulePanel != null) { | |
1819 | + // $('#viwerSelect').append('<option selected value="' + 0 + '">' + "Select Viewer" + '</option>'); | |
1798 | 1820 | |
1799 | - $scope.CBEnableUI(); | |
1800 | - // scroll down to first panel | |
1821 | + //Added code by sandeep for fixed Bug-58066 | |
1801 | 1822 | if (modulePanel.length > 0) { |
1802 | - if (modulePanel[0].id != undefined) { | |
1803 | - var lastpanel = modulePanel[0].id; | |
1804 | - //$('body,html').animate({ scrollTop: $('#' + lastpanel).position().top }, 1000); | |
1805 | - } | |
1806 | - } | |
1807 | - | |
1808 | - | |
1823 | + $('#viwerSelect').show(); | |
1824 | + } | |
1825 | + } | |
1826 | + else { | |
1827 | + $('#viwerSelect').hide(); | |
1828 | + } | |
1829 | + for (var i = 0 ; i < modulePanel.length; i++) { | |
1830 | + var paneld = modulePanel[i].id; | |
1831 | + var panelTitle = document.getElementById(paneld).childNodes[0].innerText; | |
1832 | + $('#viwerSelect').append('<option value="' + paneld + '">' + panelTitle + '</option>'); | |
1809 | 1833 | } |
1810 | 1834 | |
1835 | + $scope.CBEnableUI(); | |
1836 | + // scroll down to first panel | |
1837 | + if (modulePanel.length > 0) { | |
1838 | + if (modulePanel[0].id != undefined) { | |
1839 | + var lastpanel = modulePanel[0].id; | |
1840 | + //$('body,html').animate({ scrollTop: $('#' + lastpanel).position().top }, 1000); | |
1841 | + } | |
1842 | + } | |
1843 | + | |
1844 | + | |
1845 | + } | |
1846 | + | |
1811 | 1847 | } |
1812 | 1848 | |
1813 | 1849 | }); |
... | ... | @@ -1970,24 +2006,23 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
1970 | 2006 | |
1971 | 2007 | } |
1972 | 2008 | $scope.loadDissectibleAnatomyModule = function (moduleName) { |
1973 | - var DAData = ModuleService.getModuleData(moduleName); | |
2009 | + var DAData = ModuleService.getModuleData(moduleName); | |
1974 | 2010 | |
1975 | - if (DAData != undefined && DAData.length > 0) { | |
1976 | - $rootScope.isCallFromOtherModule = true; | |
2011 | + if (DAData != undefined && DAData.length > 0) { | |
2012 | + $rootScope.isCallFromOtherModule = true; | |
1977 | 2013 | |
1978 | - var daSectionExist = document.getElementById('daCustomModuleDiv'); | |
2014 | + var daSectionExist = document.getElementById('daCustomModuleDiv'); | |
1979 | 2015 | |
1980 | - if (daSectionExist==null){ | |
1981 | - $('#cbparentcustomDiv').append($('<div id="daCustomModuleDiv"></div>')); | |
1982 | - $e = $('#daCustomModuleDiv').append("<da-directive></da-directive>"); | |
1983 | - $compile($e)($scope); | |
1984 | - } | |
1985 | - else | |
1986 | - { | |
1987 | - // open new da panel on same slide by open resource | |
1988 | - $rootScope.openDABodyViewMain(); | |
1989 | - } | |
2016 | + if (daSectionExist == null) { | |
2017 | + $('#cbparentcustomDiv').append($('<div id="daCustomModuleDiv"></div>')); | |
2018 | + $e = $('#daCustomModuleDiv').append("<da-directive></da-directive>"); | |
2019 | + $compile($e)($scope); | |
1990 | 2020 | } |
2021 | + else { | |
2022 | + // open new da panel on same slide by open resource | |
2023 | + $rootScope.openDABodyViewMain(); | |
2024 | + } | |
2025 | + } | |
1991 | 2026 | |
1992 | 2027 | } |
1993 | 2028 | |
... | ... | @@ -2061,13 +2096,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2061 | 2096 | findKeyForChange($rootScope.contentNotesForSaveCB, currentId); |
2062 | 2097 | $scope.selectedKey.windows.window = []; |
2063 | 2098 | |
2064 | - for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) | |
2065 | - { | |
2099 | + for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) { | |
2066 | 2100 | var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]); |
2067 | 2101 | $scope.selectedKey.windows.window.push(arrToStrWinObj); |
2068 | 2102 | } |
2069 | - $scope.updatedWindowListForSaveCB = []; | |
2070 | - console.log($scope.selectedKey.windows.window); | |
2103 | + $scope.updatedWindowListForSaveCB = []; | |
2104 | + console.log($scope.selectedKey.windows.window); | |
2071 | 2105 | } |
2072 | 2106 | |
2073 | 2107 | $scope.saveCIWindowActivity_Old = function (keyName, value) { |
... | ... | @@ -2128,7 +2162,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2128 | 2162 | for (i in o) { |
2129 | 2163 | |
2130 | 2164 | if (o[i] !== null && typeof (o[i]) == "object") { |
2131 | - if (o[i]._id == keyname) { | |
2165 | + if (o[i]._id == keyname) { | |
2132 | 2166 | $scope.selectedKey = o[i]; |
2133 | 2167 | } |
2134 | 2168 | findKeyForChange(o[i], keyname); |
... | ... | @@ -2143,31 +2177,31 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2143 | 2177 | |
2144 | 2178 | //Save DISSECTIBLE_ANATOMY activity for CB |
2145 | 2179 | $scope.saveCIWindowActivity = function (currentId) { |
2146 | - if ($rootScope.CIWindowData != undefined && $rootScope.CIWindowData.length > 0 ) { | |
2180 | + if ($rootScope.CIWindowData != undefined && $rootScope.CIWindowData.length > 0) { | |
2147 | 2181 | for (var i = 0; i < $rootScope.CIWindowData.length; i++) { |
2148 | 2182 | $scope.updatedWindowListForSaveCB.push({ |
2149 | 2183 | |
2150 | 2184 | containsCapturedContent: true,//$rootScope.CIWindowData[i] // N |
2151 | - annotationData: "",//$rootScope.CIWindowData[i] N | |
2152 | - contextMenu: { lockResize: false, hideTitleBar: false }, // N | |
2153 | - position: { | |
2154 | - top: $rootScope.CIWindowData[i].top, | |
2155 | - left: $rootScope.CIWindowData[i].left, | |
2156 | - }, | |
2157 | - size: { | |
2158 | - height: $rootScope.CIWindowData[i].height, | |
2159 | - width: $rootScope.CIWindowData[i].width | |
2160 | - }, | |
2161 | - textVisible: $rootScope.CIWindowData[i].isTextVisible, | |
2162 | - imageId: $rootScope.CIWindowData[i].imageId, | |
2163 | - minimised: $rootScope.CIWindowData[i].minimised, | |
2164 | - windowTitle: $rootScope.CIWindowData[i].currentViewTitle, | |
2165 | - maximised: $rootScope.CIWindowData[i].maximised, | |
2166 | - mType: $rootScope.CIWindowData[i].moduleName, | |
2167 | - id: $rootScope.CIWindowData[i].imageId, | |
2168 | - scrollPosition: { vertical: 0, horizontal: 0 },// N | |
2169 | - windowListId: 0 //$rootScope.CIWindowData[i] // N | |
2170 | - }); | |
2185 | + annotationData: "",//$rootScope.CIWindowData[i] N | |
2186 | + contextMenu: { lockResize: false, hideTitleBar: false }, // N | |
2187 | + position: { | |
2188 | + top: $rootScope.CIWindowData[i].top, | |
2189 | + left: $rootScope.CIWindowData[i].left, | |
2190 | + }, | |
2191 | + size: { | |
2192 | + height: $rootScope.CIWindowData[i].height, | |
2193 | + width: $rootScope.CIWindowData[i].width | |
2194 | + }, | |
2195 | + textVisible: $rootScope.CIWindowData[i].isTextVisible, | |
2196 | + imageId: $rootScope.CIWindowData[i].imageId, | |
2197 | + minimised: $rootScope.CIWindowData[i].minimised, | |
2198 | + windowTitle: $rootScope.CIWindowData[i].currentViewTitle, | |
2199 | + maximised: $rootScope.CIWindowData[i].maximised, | |
2200 | + mType: $rootScope.CIWindowData[i].moduleName, | |
2201 | + id: $rootScope.CIWindowData[i].imageId, | |
2202 | + scrollPosition: { vertical: 0, horizontal: 0 },// N | |
2203 | + windowListId: 0 //$rootScope.CIWindowData[i] // N | |
2204 | + }); | |
2171 | 2205 | |
2172 | 2206 | } |
2173 | 2207 | $rootScope.CIWindowData = []; |
... | ... | @@ -2216,7 +2250,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2216 | 2250 | |
2217 | 2251 | containsCapturedContent: true,//$rootScope.TheeDWindowData[i] // N |
2218 | 2252 | //annotationData: "",//$rootScope.TheeDWindowData[i] N |
2219 | - contextMenu:{ lockResize: true, hideTitleBar: true, hideToolBar: false, hideLeftBar: false, hideTopToolBar: false }, | |
2253 | + contextMenu: { lockResize: true, hideTitleBar: true, hideToolBar: false, hideLeftBar: false, hideTopToolBar: false }, | |
2220 | 2254 | position: { |
2221 | 2255 | top: $rootScope.TheeDWindowData[i].top, |
2222 | 2256 | left: $rootScope.TheeDWindowData[i].left, |
... | ... | @@ -2235,7 +2269,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2235 | 2269 | windowListId: 0, //$rootScope.TheeDWindowData[i] // N |
2236 | 2270 | threeDData: $rootScope.TheeDWindowData[i].threeDAnatomyData, |
2237 | 2271 | contentPath: $rootScope.TheeDWindowData[i].ImagePath, |
2238 | - scrollPosition: { vertical: $rootScope.TheeDWindowData[i].verticalScroll ? 0 : 0 , horizontal: 0 }, | |
2272 | + scrollPosition: { vertical: $rootScope.TheeDWindowData[i].verticalScroll ? 0 : 0, horizontal: 0 }, | |
2239 | 2273 | |
2240 | 2274 | }); |
2241 | 2275 | } |
... | ... | @@ -2245,33 +2279,33 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2245 | 2279 | |
2246 | 2280 | //Save MY_PICTURES activity for CB |
2247 | 2281 | $scope.saveMyPictureWindowActivity = function (currentId) { |
2248 | - // if ($rootScope.TheeDWindowData != undefined && $rootScope.TheeDWindowData.length > 0) { | |
2249 | - for (var i = 0; i < $rootScope.TheeDWindowData.length; i++) { | |
2250 | - $scope.updatedWindowListForSaveCB.push({ | |
2251 | - | |
2252 | - containsCapturedContent: true,//$rootScope.TheeDWindowData[i] // N | |
2253 | - //annotationData: "",//$rootScope.TheeDWindowData[i] N | |
2254 | - contextMenu: { lockResize: true, hideTitleBar: true }, | |
2255 | - position: { | |
2256 | - top: $rootScope.TheeDWindowData[i].top, | |
2257 | - left: $rootScope.TheeDWindowData[i].left, | |
2258 | - }, | |
2259 | - size: { | |
2260 | - height: $rootScope.TheeDWindowData[i].height, | |
2261 | - width: $rootScope.TheeDWindowData[i].width | |
2262 | - }, | |
2263 | - imageId: $rootScope.TheeDWindowData[i].imageId, | |
2264 | - minimised: $rootScope.TheeDWindowData[i].minimised, | |
2265 | - windowTitle: $rootScope.TheeDWindowData[i].currentViewTitle, | |
2266 | - maximised: $rootScope.TheeDWindowData[i].maximised, | |
2267 | - mType: $rootScope.TheeDWindowData[i].moduleName, | |
2268 | - id: $rootScope.TheeDWindowData[i].imageId, | |
2269 | - windowListId: 0, //$rootScope.TheeDWindowData[i] // N | |
2270 | - scrollPosition: { vertical: 0, horizontal: 0 }, | |
2271 | - imageSource: "" | |
2272 | - }); | |
2273 | - } | |
2274 | - //$rootScope.TheeDWindowData = []; | |
2282 | + // if ($rootScope.TheeDWindowData != undefined && $rootScope.TheeDWindowData.length > 0) { | |
2283 | + for (var i = 0; i < $rootScope.TheeDWindowData.length; i++) { | |
2284 | + $scope.updatedWindowListForSaveCB.push({ | |
2285 | + | |
2286 | + containsCapturedContent: true,//$rootScope.TheeDWindowData[i] // N | |
2287 | + //annotationData: "",//$rootScope.TheeDWindowData[i] N | |
2288 | + contextMenu: { lockResize: true, hideTitleBar: true }, | |
2289 | + position: { | |
2290 | + top: $rootScope.TheeDWindowData[i].top, | |
2291 | + left: $rootScope.TheeDWindowData[i].left, | |
2292 | + }, | |
2293 | + size: { | |
2294 | + height: $rootScope.TheeDWindowData[i].height, | |
2295 | + width: $rootScope.TheeDWindowData[i].width | |
2296 | + }, | |
2297 | + imageId: $rootScope.TheeDWindowData[i].imageId, | |
2298 | + minimised: $rootScope.TheeDWindowData[i].minimised, | |
2299 | + windowTitle: $rootScope.TheeDWindowData[i].currentViewTitle, | |
2300 | + maximised: $rootScope.TheeDWindowData[i].maximised, | |
2301 | + mType: $rootScope.TheeDWindowData[i].moduleName, | |
2302 | + id: $rootScope.TheeDWindowData[i].imageId, | |
2303 | + windowListId: 0, //$rootScope.TheeDWindowData[i] // N | |
2304 | + scrollPosition: { vertical: 0, horizontal: 0 }, | |
2305 | + imageSource: "" | |
2306 | + }); | |
2307 | + } | |
2308 | + //$rootScope.TheeDWindowData = []; | |
2275 | 2309 | //} |
2276 | 2310 | } |
2277 | 2311 | |
... | ... | @@ -2282,49 +2316,49 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2282 | 2316 | for (var i = 0; i < $rootScope.AAWindowData.length; i++) { |
2283 | 2317 | $scope.updatedWindowListForSaveCB.push({ |
2284 | 2318 | |
2285 | - windowTitle: $rootScope.AAWindowData[i].currentViewTitle, | |
2286 | - hideAllPins: $rootScope.AAWindowData[i].isHidePinBtnClicked, | |
2287 | - selectedCallouts: $rootScope.AAWindowData[i].CBselectedpinCordinate, | |
2288 | - annotationData: "",//No find in AA.js | |
2289 | - minimised: $rootScope.AAWindowData[i].minimised, | |
2290 | - scrollPosition: { | |
2291 | - vertical: $rootScope.AAWindowData[i].verticalScroll, | |
2292 | - horizontal: $rootScope.AAWindowData[i].horizontalScroll | |
2293 | - }, | |
2294 | - selectedStructureID: 0,//N | |
2295 | - selectedPins: $rootScope.AAWindowData[i].selectedPins, | |
2296 | - maximised: $rootScope.AAWindowData[i].maximised, | |
2297 | - size: { | |
2298 | - width: $rootScope.AAWindowData[i].width, | |
2299 | - height: $rootScope.AAWindowData[i].height | |
2300 | - }, | |
2301 | - id: $rootScope.AAWindowData[i].id, | |
2302 | - showSelectedPins: $rootScope.AAWindowData[i].isShowSelectedPins, | |
2303 | - hideCallOuts: false,//N | |
2304 | - showAllPins: $rootScope.AAWindowData[i].isShowAllPins, | |
2305 | - scaleIndex: $rootScope.AAWindowData[i].sliderVal, | |
2306 | - bodySystemId: $rootScope.AAWindowData[i].SelectedSystemID, | |
2307 | - windowListId: "0",//N | |
2308 | - imageId: $rootScope.AAWindowData[i].imageId, | |
2309 | - //position: { x: 840, y: 263 }, | |
2310 | - position: { | |
2311 | - top: $rootScope.AAWindowData[i].top, | |
2312 | - left: $rootScope.AAWindowData[i].left, | |
2313 | - }, | |
2314 | - mType: $rootScope.AAWindowData[i].moduleName, | |
2315 | - containsCapturedContent: true, | |
2316 | - contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false }, | |
2317 | - //activePinArray: $rootScope.AAWindowData[i].activePinArray, | |
2318 | - selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId | |
2319 | - //typeOfEvent: $rootScope.AAWindowData[i].typeOfEvent | |
2319 | + windowTitle: $rootScope.AAWindowData[i].currentViewTitle, | |
2320 | + hideAllPins: $rootScope.AAWindowData[i].isHidePinBtnClicked, | |
2321 | + selectedCallouts: $rootScope.AAWindowData[i].CBselectedpinCordinate, | |
2322 | + annotationData: "",//No find in AA.js | |
2323 | + minimised: $rootScope.AAWindowData[i].minimised, | |
2324 | + scrollPosition: { | |
2325 | + vertical: $rootScope.AAWindowData[i].verticalScroll, | |
2326 | + horizontal: $rootScope.AAWindowData[i].horizontalScroll | |
2327 | + }, | |
2328 | + selectedStructureID: 0,//N | |
2329 | + selectedPins: $rootScope.AAWindowData[i].selectedPins, | |
2330 | + maximised: $rootScope.AAWindowData[i].maximised, | |
2331 | + size: { | |
2332 | + width: $rootScope.AAWindowData[i].width, | |
2333 | + height: $rootScope.AAWindowData[i].height | |
2334 | + }, | |
2335 | + id: $rootScope.AAWindowData[i].id, | |
2336 | + showSelectedPins: $rootScope.AAWindowData[i].isShowSelectedPins, | |
2337 | + hideCallOuts: false,//N | |
2338 | + showAllPins: $rootScope.AAWindowData[i].isShowAllPins, | |
2339 | + scaleIndex: $rootScope.AAWindowData[i].sliderVal, | |
2340 | + bodySystemId: $rootScope.AAWindowData[i].SelectedSystemID, | |
2341 | + windowListId: "0",//N | |
2342 | + imageId: $rootScope.AAWindowData[i].imageId, | |
2343 | + //position: { x: 840, y: 263 }, | |
2344 | + position: { | |
2345 | + top: $rootScope.AAWindowData[i].top, | |
2346 | + left: $rootScope.AAWindowData[i].left, | |
2347 | + }, | |
2348 | + mType: $rootScope.AAWindowData[i].moduleName, | |
2349 | + containsCapturedContent: true, | |
2350 | + contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false }, | |
2351 | + //activePinArray: $rootScope.AAWindowData[i].activePinArray, | |
2352 | + selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId | |
2353 | + //typeOfEvent: $rootScope.AAWindowData[i].typeOfEvent | |
2320 | 2354 | |
2321 | 2355 | |
2322 | 2356 | |
2323 | 2357 | }); |
2324 | 2358 | } |
2325 | 2359 | $rootScope.AAWindowData = []; |
2326 | - } | |
2327 | 2360 | } |
2361 | + } | |
2328 | 2362 | |
2329 | 2363 | //Save DISSECTIBLE_ANATOMY activity for CB |
2330 | 2364 | $scope.saveDAWindowActivity = function () { |
... | ... | @@ -2338,7 +2372,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2338 | 2372 | highlightOptionsSelectedId: 0, |
2339 | 2373 | selectedStructureID: 0,//N |
2340 | 2374 | contentDescriptorId: 0, |
2341 | - callOuts: $rootScope.DaWindowData[i].CurriculumTermData, | |
2375 | + callOuts: $rootScope.DaWindowData[i].CurriculumTermData, | |
2342 | 2376 | //hideAllPins: $rootScope.DaWindowData[i].isHidePinBtnClicked, |
2343 | 2377 | //selectedCallouts: $rootScope.DaWindowData[i].CBselectedpinCordinate, |
2344 | 2378 | layerNumber: parseInt($rootScope.DaWindowData[i].layerNumber) + 1, |
... | ... | @@ -2360,7 +2394,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2360 | 2394 | }, |
2361 | 2395 | id: $rootScope.DaWindowData[i].voId, |
2362 | 2396 | //showSelectedPins: $rootScope.DaWindowData[i].isShowSelectedSystemPinsClicked, |
2363 | - // hideCallOuts: false,//N | |
2397 | + // hideCallOuts: false,//N | |
2364 | 2398 | //showAllPins: $rootScope.DaWindowData[i].isShowBodyWithCBPinData,//N |
2365 | 2399 | //scaleIndex: 0,//N |
2366 | 2400 | //bodySystemId: $rootScope.DaWindowData[i].SelectedSystemID, |
... | ... | @@ -2375,14 +2409,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2375 | 2409 | //contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false }, |
2376 | 2410 | //activePinArray: $rootScope.DaWindowData[i].activePinArray, // Selected PINID on Body |
2377 | 2411 | //sliderVal: $rootScope.DaWindowData[i].sliderVal, |
2378 | - zoom: $rootScope.DaWindowData[i].zoomInOut, | |
2412 | + zoom: $rootScope.DaWindowData[i].zoomInOut, | |
2379 | 2413 | skinId: $rootScope.DaWindowData[i].curentEthnicity, |
2380 | - isResizeLock: false , //.isResizeLock,//N | |
2414 | + isResizeLock: false, //.isResizeLock,//N | |
2381 | 2415 | mode: $rootScope.DaWindowData[i].mode, |
2382 | 2416 | windowListId: 0,//windowData.windowListId,//25 |
2383 | 2417 | canvasVScrollX: $rootScope.DaWindowData[i].CanvasDivTopPosition, |
2384 | - canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition, | |
2385 | - isCallOutVisible: false, | |
2418 | + canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition, | |
2419 | + isCallOutVisible: false, | |
2386 | 2420 | annotationData: "", // .annotationData,//24 |
2387 | 2421 | transparencyBounds: 0,//windowData.transparencyBounds, |
2388 | 2422 | isLeftToolBarVisible: false, //windowData.isLeftToolBarVisible,//N |
... | ... | @@ -2398,27 +2432,27 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ |
2398 | 2432 | } |
2399 | 2433 | } |
2400 | 2434 | |
2401 | - $scope.updateWindowsContentForSaveCB = function (currentId) { | |
2402 | - | |
2435 | + $scope.updateWindowsContentForSaveCB = function (currentId) { | |
2436 | + | |
2403 | 2437 | $scope.saveDAWindowActivity(currentId); |
2404 | 2438 | $scope.saveAAWindowActivity(currentId); |
2405 | 2439 | $scope.saveCIWindowActivity(currentId); |
2406 | 2440 | $scope.saveCAWindowActivity(currentId); |
2407 | - $scope.save3DWindowActivity(currentId); | |
2441 | + $scope.save3DWindowActivity(currentId); | |
2408 | 2442 | |
2409 | 2443 | //$scope.savePicWindowActivity($scope.windowDataforCB); |
2410 | 2444 | //if ($scope.updatedWindowListForSaveCB.length > 0) { |
2411 | - findKeyForChange($rootScope.contentNotesForSaveCB, currentId); | |
2412 | - $scope.selectedKey.windows.window = []; | |
2413 | - if ($scope.updatedWindowListForSaveCB.length > 0) { | |
2414 | - for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) { | |
2415 | - var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]); | |
2416 | - if ($scope.selectedKey.windows.window != undefined) { | |
2417 | - $scope.selectedKey.windows.window.push(arrToStrWinObj); | |
2418 | - } | |
2419 | - | |
2445 | + findKeyForChange($rootScope.contentNotesForSaveCB, currentId); | |
2446 | + $scope.selectedKey.windows.window = []; | |
2447 | + if ($scope.updatedWindowListForSaveCB.length > 0) { | |
2448 | + for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) { | |
2449 | + var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]); | |
2450 | + if ($scope.selectedKey.windows.window != undefined) { | |
2451 | + $scope.selectedKey.windows.window.push(arrToStrWinObj); | |
2420 | 2452 | } |
2453 | + | |
2421 | 2454 | } |
2455 | + } | |
2422 | 2456 | //} |
2423 | 2457 | $scope.updatedWindowListForSaveCB = []; |
2424 | 2458 | console.log($rootScope.contentNotesForSaveCB); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-TinyMCEjspanel.html
... | ... | @@ -3,19 +3,19 @@ |
3 | 3 | |
4 | 4 | <div class="col-sm-12 nopadding" ng-controller="CurrBuildController"> |
5 | 5 | <div class="col-sm-12 nopadding"> |
6 | - <div class="form-inline"> | |
6 | + <div class="form-inline" id="cbEditorTopMenuBar"> | |
7 | 7 | <!-- <button class="btn btn-primary btn-sm"> |
8 | 8 | <img src="../../../content/images/CB/anchor-icon.png" alt="" title=""> |
9 | 9 | </button> --> |
10 | 10 | |
11 | 11 | <button class="btn btn-black btn-sm" title="Rename Slide" onclick="cbRenameModelShow()"> |
12 | - <img src="../../../content/images/CB/icon-tasks.png" alt="" > | |
12 | + <img src="../../../content/images/CB/icon-tasks.png" alt=""> | |
13 | 13 | </button> |
14 | 14 | <button class="btn btn-black btn-sm" title="Lock" onclick="cbPasswordModelShow()"> |
15 | 15 | <img src="../../../content/images/CB/icon-lock.png" /> |
16 | 16 | </button> |
17 | 17 | <button class="btn btn-black btn-sm" title="Back" onclick="cbBack()"> |
18 | - <img src="../../../content/images/CB/icon-back.png" alt="" > | |
18 | + <img src="../../../content/images/CB/icon-back.png" alt=""> | |
19 | 19 | </button> |
20 | 20 | <button class="btn btn-black btn-sm" title="Forward" onclick="cbNext()"> |
21 | 21 | <img src="../../../content/images/CB/icon-next.png" alt=""> |
... | ... | @@ -36,9 +36,9 @@ |
36 | 36 | </select>--> |
37 | 37 | <label class="font13" id="slideNumber" style="color:#fff !important">Slide 01 of 06</label> |
38 | 38 | </div> |
39 | - <button class="btn btn-black btn-sm " id="hideShowEditor" onclick="editorHideShow()" title="Show/Hide Note"><img title="" alt="" src="../../../content/images/CB/icon-note.png"></button> | |
39 | + <button class="btn btn-black btn-sm " id="hideShowEditor" onclick="editorHideShow()" title="Show/Hide Note"><img title="" alt="" src="../../../content/images/CB/icon-note.png"></button> | |
40 | 40 | |
41 | - <select id='viwerSelect' onchange="viwerSelectOnChange(this)" title="Captured Viewers"> </select> | |
41 | + <select id='viwerSelect' onchange="viwerSelectOnChange(this)" title="Captured Viewers"> </select> | |
42 | 42 | </div> |
43 | 43 | </div> |
44 | 44 | <div class="col-sm-1 nopadding" id="cbEditorLeftSideBar"> |
... | ... | @@ -56,48 +56,48 @@ |
56 | 56 | |
57 | 57 | |
58 | 58 | </div> |
59 | - <div class="col-sm-11 nopadding" id="cbEditorRightSideBar"> | |
60 | - <textarea id="CBTextArea" style="margin-top: 37px;"></textarea> | |
61 | - </div> | |
62 | - | |
59 | + <div class="col-sm-11 nopadding" id="cbEditorRightSideBar"> | |
60 | + <textarea id="CBTextArea" style="margin-top: 37px;"></textarea> | |
63 | 61 | </div> |
64 | 62 | |
63 | +</div> | |
64 | + | |
65 | 65 | |
66 | 66 | <script type="text/javascript"> |
67 | 67 | |
68 | 68 | $(document).ready(function () { |
69 | - tinymce.remove(); | |
70 | - tinymce.init({ | |
71 | - selector: "#CBTextArea", | |
72 | - init_instance_callback: function (editor) { | |
73 | - editor.on('click', function (e) { | |
74 | - myeditorclick(); | |
75 | - | |
76 | - }); | |
77 | - editor.setContent(''); | |
78 | - }, | |
79 | - setup: function (editor) { | |
80 | - editor.on('init', function () { | |
81 | - //birendra | |
82 | - // call after initilization | |
83 | - callEditorOnInit(); | |
84 | - }); | |
85 | - }, | |
86 | - plugins: 'advlist, lists, autolink, link, anchor, print, preview, searchreplace, fullscreen, hr', | |
87 | - menubar: 'file edit view insert format', | |
88 | - toolbar: 'undo redo |fontsizeselect fontselect | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist | forecolor backcolor | link anchor | formatselect |strikethrough | outdent indent | removeformat | fullscreen preview print', | |
89 | - height: 482, | |
90 | - toolbar_drawer: 'sliding', | |
91 | - content_style: ".mce-content-body {font-size:14pt;font-family:Arial;}" | |
92 | - | |
93 | - }); | |
69 | + tinymce.remove(); | |
70 | + tinymce.init({ | |
71 | + selector: "#CBTextArea", | |
72 | + init_instance_callback: function (editor) { | |
73 | + editor.on('click', function (e) { | |
74 | + myeditorclick(); | |
75 | + | |
76 | + }); | |
77 | + editor.setContent(''); | |
78 | + }, | |
79 | + setup: function (editor) { | |
80 | + editor.on('init', function () { | |
81 | + //birendra | |
82 | + // call after initilization | |
83 | + callEditorOnInit(); | |
84 | + }); | |
85 | + }, | |
86 | + plugins: 'advlist, lists, autolink, link, anchor, print, preview, searchreplace, fullscreen, hr', | |
87 | + menubar: 'file edit view insert format', | |
88 | + toolbar: 'undo redo |fontsizeselect fontselect | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist | forecolor backcolor | link anchor | formatselect |strikethrough | outdent indent | removeformat | fullscreen preview print', | |
89 | + height: 482, | |
90 | + toolbar_drawer: 'sliding', | |
91 | + content_style: ".mce-content-body {font-size:14pt;font-family:Arial;}" | |
92 | + | |
93 | + }); | |
94 | 94 | |
95 | 95 | }); |
96 | - | |
96 | + | |
97 | 97 | |
98 | 98 | //Modified code by Sandeep for fixed bug TicketNo: 49226(6) |
99 | - function editorHideShow() { | |
100 | - | |
99 | + function editorHideShow() { | |
100 | + | |
101 | 101 | $("#cbEditorRightSideBar").toggle(); |
102 | 102 | $("#cbEditorLeftSideBar").toggle(); |
103 | 103 | } |
... | ... | @@ -111,21 +111,17 @@ |
111 | 111 | |
112 | 112 | } |
113 | 113 | |
114 | - function cbBack() | |
115 | - { | |
114 | + function cbBack() { | |
116 | 115 | angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().cbBack(); |
117 | 116 | } |
118 | - function cbNext() | |
119 | - { | |
117 | + function cbNext() { | |
120 | 118 | angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().cbNext(); |
121 | 119 | |
122 | 120 | } |
123 | - function CBAddNewSlide() | |
124 | - { | |
121 | + function CBAddNewSlide() { | |
125 | 122 | angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().CBAddSlide(); |
126 | 123 | } |
127 | - function CBDeleteSlide() | |
128 | - { | |
124 | + function CBDeleteSlide() { | |
129 | 125 | |
130 | 126 | angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().showDeleteSlideModel(); |
131 | 127 | } |
... | ... | @@ -138,7 +134,7 @@ |
138 | 134 | angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().myeditorclick(); |
139 | 135 | } |
140 | 136 | |
141 | - //Added Code by Sandeep for User Story-52695 | |
137 | + //Added Code by Sandeep for User Story-52695 | |
142 | 138 | //function captureScreen() { |
143 | 139 | |
144 | 140 | // angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().captureScreen(); |
... | ... | @@ -149,6 +145,6 @@ |
149 | 145 | function viwerSelectOnChange(obj) { |
150 | 146 | |
151 | 147 | angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope().viwerSelectOnChange(obj); |
152 | - } | |
148 | + } | |
153 | 149 | |
154 | - </script> | |
150 | +</script> | ... | ... |