Commit fc572b60b2fa4be45b75c30ce45345e1681504f7

Authored by Birendra Kumar
1 parent 57b87639

partially updated more 3D module

400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
@@ -179,9 +179,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location @@ -179,9 +179,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
179 angular.forEach(threeDAnatomyData, function (value, key) { 179 angular.forEach(threeDAnatomyData, function (value, key) {
180 $scope.imagePath = "~/../content/images/3da/thumbnails/" + value._ThumbnailImage; 180 $scope.imagePath = "~/../content/images/3da/thumbnails/" + value._ThumbnailImage;
181 181
182 - var $el = $('<div id="3dView' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '">' 182 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="Open3DModel($event)">'
183 + '<div class="thumbnail">' 183 + '<div class="thumbnail">'
184 - + '<img id="' + value._id + '"ng-src="' + $scope.imagePath + '" alt="" title="' + value._Title + '" data-ng-click="Open3DModel($event)" >' 184 + + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" >'
185 + '<div class="caption"><p>' + value._Title + '</p></div></div></div>').appendTo('#grid-view'); 185 + '<div class="caption"><p>' + value._Title + '</p></div></div></div>').appendTo('#grid-view');
186 186
187 187
@@ -384,7 +384,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location @@ -384,7 +384,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
384 theme: 'success', 384 theme: 'success',
385 currentController: '3dAController', 385 currentController: '3dAController',
386 parentSlug: $scope.Get3DwindowStoreData(windowviewid, 'parentSlugName'), 386 parentSlug: $scope.Get3DwindowStoreData(windowviewid, 'parentSlugName'),
387 - content: '<div class="col-sm-12">' + 387 + content: '<div class="col-sm-12" >' +
388 '<object data="' + Selected3DImagePath + '" width="100%" height="800px" type="image/svg+xml" id="threedImage_' + windowviewid + '" onload="AnimationOnLoad(event)"></object>' + 388 '<object data="' + Selected3DImagePath + '" width="100%" height="800px" type="image/svg+xml" id="threedImage_' + windowviewid + '" onload="AnimationOnLoad(event)"></object>' +
389 '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#ThreeDView").css("width");$("#ThreeDView").css({"left":"0px","width":"100%","min-idth": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#ThreeDImagePanel_' + windowviewid + '").css("width", "100%"); }});</script>', 389 '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#ThreeDView").css("width");$("#ThreeDView").css({"left":"0px","width":"100%","min-idth": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#ThreeDImagePanel_' + windowviewid + '").css("width", "100%"); }});</script>',
390 title: tittle, 390 title: tittle,
@@ -438,22 +438,14 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location @@ -438,22 +438,14 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
438 438
439 // var pnlName = event.currentTarget.id; 439 // var pnlName = event.currentTarget.id;
440 $scope.$emit("cBEnableDisableMenuOption", ""); 440 $scope.$emit("cBEnableDisableMenuOption", "");
  441 + console.log('event fired')
441 442
442 }); 443 });
443 - $("#threedImage_" + windowviewid).on('click', function (event) {  
444 -  
445 - // var pnlName = event.currentTarget.id;  
446 - $scope.$emit("cBEnableDisableMenuOption", "");  
447 -  
448 - });  
449 - $("#threedImage_" + windowviewid + "#document html body").on('click', function (event) {  
450 -  
451 - // var pnlName = event.currentTarget.id;  
452 - $scope.$emit("cBEnableDisableMenuOption", "");  
453 -  
454 - }); 444 +
455 } 445 }
456 446
  447 +
  448 +
457 }]); 449 }]);
458 450
459 function AnimationOnLoad(event) { 451 function AnimationOnLoad(event) {