Commit 26ccbd947d2d5e14695ff132ed5887195a86561b
1 parent
69bd43a8
fix max size in js panel
Showing
11 changed files
with
216 additions
and
120 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
@@ -439,7 +439,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -439,7 +439,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
439 | theme: 'success', | 439 | theme: 'success', |
440 | currentController: '3dAController', | 440 | currentController: '3dAController', |
441 | parentSlug: $scope.Get3DwindowStoreData(windowviewid, 'parentSlugName'), | 441 | parentSlug: $scope.Get3DwindowStoreData(windowviewid, 'parentSlugName'), |
442 | - content: '<div id="thContentDiv_'+windowviewid+'" style="height: 100%;width: 100%;overflow: scroll;" >' + | 442 | + content: '<div id="thContentDiv_'+windowviewid+'" style="height: 100%;width: 100%;" >' + |
443 | '<object data="' + Selected3DImagePath + '" width="100%" height="100%" type="image/svg+xml" id="threedImage_' + windowviewid + '" onload="AnimationOnLoad(event)"></object>' + | 443 | '<object data="' + Selected3DImagePath + '" width="100%" height="100%" type="image/svg+xml" id="threedImage_' + windowviewid + '" onload="AnimationOnLoad(event)"></object>' + |
444 | '</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>', | 444 | '</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>', |
445 | title: tittle, | 445 | title: tittle, |
@@ -545,6 +545,8 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -545,6 +545,8 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
545 | $scope.jsPanel3D.normalize(); | 545 | $scope.jsPanel3D.normalize(); |
546 | } | 546 | } |
547 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanel3D); | 547 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanel3D); |
548 | + | ||
549 | + $("#ThreeDImagePanel_"+windowviewid).css('overflow','hidden'); | ||
548 | // set false after initial call of min,max or normal | 550 | // set false after initial call of min,max or normal |
549 | $scope.Set3DwindowStoreData(windowviewid, 'minmaxAutoEvent', false); | 551 | $scope.Set3DwindowStoreData(windowviewid, 'minmaxAutoEvent', false); |
550 | $scope.Set3DwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); | 552 | $scope.Set3DwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
@@ -1285,6 +1285,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -1285,6 +1285,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
1285 | } | 1285 | } |
1286 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelAI); | 1286 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelAI); |
1287 | 1287 | ||
1288 | + $("#aiImagePanel_"+windowviewid).css('overflow','hidden'); | ||
1289 | + | ||
1288 | // set false after initial call of min,max or normal | 1290 | // set false after initial call of min,max or normal |
1289 | $scope.SetAIwindowStoreData(windowviewid, 'minmaxAutoEvent', false); | 1291 | $scope.SetAIwindowStoreData(windowviewid, 'minmaxAutoEvent', false); |
1290 | $scope.SetAIwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); | 1292 | $scope.SetAIwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
@@ -304,7 +304,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -304,7 +304,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
304 | var uid = $scope.GetAODwindowStoreData(windowviewid, 'uid'); | 304 | var uid = $scope.GetAODwindowStoreData(windowviewid, 'uid'); |
305 | var requestType = $scope.GetAODwindowStoreData(windowviewid, 'requestType'); | 305 | var requestType = $scope.GetAODwindowStoreData(windowviewid, 'requestType'); |
306 | var aodSiteUrl = aodlink+"?SessionId=" + $rootScope.userData.SessionId + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self"; | 306 | var aodSiteUrl = aodlink+"?SessionId=" + $rootScope.userData.SessionId + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self"; |
307 | - //var aodSiteUrl = aodlink+"?SessionId=1625199179202" + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self"; | 307 | + //var aodSiteUrl = aodlink+"?SessionId=1630041584051" + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self"; |
308 | 308 | ||
309 | $scope.jsPanelWidth = $(window).outerWidth() - 20; | 309 | $scope.jsPanelWidth = $(window).outerWidth() - 20; |
310 | $scope.jsPanelHeight = $(window).outerHeight() - 140; | 310 | $scope.jsPanelHeight = $(window).outerHeight() - 140; |
@@ -318,9 +318,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -318,9 +318,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
318 | theme: 'success', | 318 | theme: 'success', |
319 | currentController: 'AODController', | 319 | currentController: 'AODController', |
320 | parentSlug: $scope.GetAODwindowStoreData(windowviewid, 'parentSlugName'), | 320 | parentSlug: $scope.GetAODwindowStoreData(windowviewid, 'parentSlugName'), |
321 | - content: '<div id="aodContentDiv_'+windowviewid+'" style="height: 100%; width: 100%; overflow: scroll;" >' + | ||
322 | - '<iframe name="aodFrame" src="" style="width: 100%;height:100%" id="aodvideo_' + windowviewid + '" onload="MyAODvideoOnLoad(event)" allow="autoplay" allowfullscreen></iframe>'+ | ||
323 | - '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#AODView").css("width");$("#AODView").css({"left":"0px","width":"100%","min-idth": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#aodImagePanel_' + windowviewid + '").css("width", "100%"); }});</script>', | 321 | + content: '<div id="aodContentDiv_'+windowviewid+'" style="height: 100%; width: 100%;" >' + |
322 | + '<iframe name="aodFrame" src="" style="width: 100%;height:100%" id="aodvideo_' + windowviewid + '" onload="MyAODvideoOnLoad(event)" allow="autoplay" allowFullScreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe>'+ | ||
323 | + '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#AODView").css("width");$("#AODView").css({"left":"0px","width":"100%","min-width": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#aodImagePanel_' + windowviewid + '").css("width", "100%"); }});</script>', | ||
324 | title: tittle, | 324 | title: tittle, |
325 | position: { | 325 | position: { |
326 | top: $scope.jsPanelTop, | 326 | top: $scope.jsPanelTop, |
@@ -337,7 +337,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -337,7 +337,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
337 | var len = (pnlName).split("_").length; | 337 | var len = (pnlName).split("_").length; |
338 | var windowviewid = (pnlName).split("_")[len - 1]; | 338 | var windowviewid = (pnlName).split("_")[len - 1]; |
339 | var canvasDIvHeight = $('#aodImagePanel_' + windowviewid+ " .jsPanel-content").height(); | 339 | var canvasDIvHeight = $('#aodImagePanel_' + windowviewid+ " .jsPanel-content").height(); |
340 | - $('#aodContentDiv_'+ windowviewid ).css("height",canvasDIvHeight); | 340 | + $('#aodContentDiv_'+ windowviewid ).css("height",canvasDIvHeight+40); |
341 | var $ua = navigator.userAgent; | 341 | var $ua = navigator.userAgent; |
342 | if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { | 342 | if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { |
343 | var aodheight = screen.height; | 343 | var aodheight = screen.height; |
@@ -362,17 +362,23 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -362,17 +362,23 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
362 | var pnlName=event.currentTarget.id; | 362 | var pnlName=event.currentTarget.id; |
363 | var len = (pnlName).split("_").length; | 363 | var len = (pnlName).split("_").length; |
364 | var windowviewid = (pnlName).split("_")[len - 1]; | 364 | var windowviewid = (pnlName).split("_")[len - 1]; |
365 | - | 365 | + |
366 | var canvasDIvHeight = $('#aodImagePanel_' + windowviewid+ " .jsPanel-content").height(); | 366 | var canvasDIvHeight = $('#aodImagePanel_' + windowviewid+ " .jsPanel-content").height(); |
367 | - $('#aodContentDiv_'+ windowviewid ).css("height",canvasDIvHeight); | 367 | + $('#aodContentDiv_'+ windowviewid ).css("height",canvasDIvHeight+40); |
368 | + var $ua = navigator.userAgent; | ||
369 | + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { | ||
370 | + $('#aodContentDiv_'+ windowviewid ).css("height",canvasDIvHeight); | ||
371 | + } | ||
368 | } | 372 | } |
369 | }, | 373 | }, |
374 | + draggable: "disabled", | ||
370 | 375 | ||
371 | }); | 376 | }); |
372 | 377 | ||
373 | 378 | ||
374 | $scope.jsPanelVideo.maximize(); | 379 | $scope.jsPanelVideo.maximize(); |
375 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelVideo); | 380 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelVideo); |
381 | + $("#aodImagePanel_"+windowviewid).css('overflow','hidden'); | ||
376 | $scope.SetAODwindowStoreData(windowviewid, 'currentSlug', 'AOD-view-detail'); | 382 | $scope.SetAODwindowStoreData(windowviewid, 'currentSlug', 'AOD-view-detail'); |
377 | $('html, body').animate({ scrollTop: 0 }); | 383 | $('html, body').animate({ scrollTop: 0 }); |
378 | 384 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -1053,126 +1053,199 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -1053,126 +1053,199 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
1053 | 1053 | ||
1054 | 1054 | ||
1055 | if (clickedCAVideo.length > 0 && clickedCASummary.length > 0) { | 1055 | if (clickedCAVideo.length > 0 && clickedCASummary.length > 0) { |
1056 | - $scope.jsPanelCA = $.jsPanel({ | ||
1057 | - id: $scope.jsPanelID, | ||
1058 | - selector: '.caView', | ||
1059 | - theme: 'success', | ||
1060 | - currentController: 'CAController', | ||
1061 | - parentSlug: $scope.GetCAwindowStoreData(windowviewid, 'parentSlugName'), | ||
1062 | - content: '<script src="' + playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo_' + windowviewid + '").pause();$("#btnTxtOnOff_' + windowviewid + '").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid_' + windowviewid + '").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid_' + windowviewid + '").css("visibility","visible");} GetTextVisibityCA(event); });});</script>' + | ||
1063 | - '<div id="pid" class="row"><div id="divplayerinlineVideo_' + windowviewid + '" class="col-sm-12" align="center" width="640" height="480"><video width="100%" height="400"' + | ||
1064 | - 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo_' + windowviewid + '" onloadstart="videoOnLoad(event)"' + | ||
1065 | - ' poster="' + poster + '"' + | ||
1066 | - 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' + | ||
1067 | - ' ad="' + admp4 + '"' + | ||
1068 | - ' nonad="' + clickedCAVideo + '"' + | ||
1069 | - ' hd="' + hdvideo + '" ' + | ||
1070 | - ' nonhd="' + clickedCAVideo + '">' + | ||
1071 | - ' <source type="video/mp4" src="' + clickedCAVideo + '">' + | ||
1072 | - ' <source type="video/webm" src="' + webm + '">' + | ||
1073 | - ' <source type="video/ogv" src="' + ogv + '">' + | ||
1074 | - ' <track src="' + vtt + '" ' + | ||
1075 | - ' kind="captions" srclang="en" label="On"><object width="640" height="360"' + | ||
1076 | - ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' + | ||
1077 | - ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' + | ||
1078 | - ' <param name="flashvars" ng-value="controls=true&file=' + clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid_' + windowviewid + '" align="left" style="height:60px;overflow-y:scroll !important;-webkit-overflow-scrolling:touch !important;"><p>' + clickedCASummary + '</p></div><button id="btnTxtOnOff_' + windowviewid + '" class="btn btn-primary pull-right" style="position:relative;top:0px">Text Off</button></div></div></div>', | ||
1079 | - | ||
1080 | - title: tittle, | ||
1081 | - position: { | ||
1082 | - top: $scope.jsPanelTop, | ||
1083 | - left: $scope.jsPanelLeft | ||
1084 | - }, | ||
1085 | - | ||
1086 | - size: { | ||
1087 | - width: $scope.jsPanelWidth, | ||
1088 | - height: $scope.jsPanelHeight | ||
1089 | - }, | ||
1090 | - onminimized:function (panel) { | ||
1091 | - var pnlName=panel[0].id; | ||
1092 | - var len = (pnlName).split("_").length; | ||
1093 | - var windowviewid = (pnlName).split("_")[len - 1]; | ||
1094 | - var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); | ||
1095 | - if(!isAutoCalled) | ||
1096 | - { | ||
1097 | - $rootScope.UnsaveCurriculum = true; | ||
1098 | - } | ||
1099 | - $scope.SetCAwindowStoreData(windowviewid, 'minimised',true); | ||
1100 | - $scope.SetCAwindowStoreData(windowviewid, 'maximised',false); | ||
1101 | - }, | ||
1102 | - onmaximized:function (panel) { | ||
1103 | - var pnlName=panel[0].id; | ||
1104 | - var len = (pnlName).split("_").length; | ||
1105 | - var windowviewid = (pnlName).split("_")[len - 1]; | ||
1106 | - var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); | ||
1107 | - if(!isAutoCalled) | ||
1108 | - { | ||
1109 | - $rootScope.UnsaveCurriculum = true; | ||
1110 | - } | ||
1111 | - $scope.SetCAwindowStoreData(windowviewid, 'maximised',true); | ||
1112 | - $scope.SetCAwindowStoreData(windowviewid, 'minimised',false); | ||
1113 | - var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); | ||
1114 | - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); | ||
1115 | - $rootScope.resetMenuOptionOnClick(pnlName); | ||
1116 | - var $ua = navigator.userAgent; | ||
1117 | - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { | ||
1118 | - var aodheight = screen.height; | ||
1119 | - if(aodheight>=1024) | ||
1120 | - { | ||
1121 | - $("#caImagePanel_"+windowviewid).css('height',canvasDIvHeight+30-150); | ||
1122 | - $('#caImagePanel_' + windowviewid+ " .jsPanel-content").css('height',canvasDIvHeight-150); | ||
1123 | - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-150-120 ); | 1056 | + |
1057 | + if($rootScope.linkToOpenCa==true) | ||
1058 | + { | ||
1059 | + $scope.jsPanelCA = $.jsPanel({ | ||
1060 | + id: $scope.jsPanelID, | ||
1061 | + selector: '.caView', | ||
1062 | + theme: 'success', | ||
1063 | + currentController: 'CAController', | ||
1064 | + parentSlug: $scope.GetCAwindowStoreData(windowviewid, 'parentSlugName'), | ||
1065 | + content: '<script src="' + playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo_' + windowviewid + '").pause();$("#btnTxtOnOff_' + windowviewid + '").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid_' + windowviewid + '").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid_' + windowviewid + '").css("visibility","visible");} GetTextVisibityCA(event); });});</script>' + | ||
1066 | + '<div id="pid" class="row"><div id="divplayerinlineVideo_' + windowviewid + '" class="col-sm-12" align="center" width="640" height="480"><video width="100%" height="400"' + | ||
1067 | + 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo_' + windowviewid + '" onloadstart="videoOnLoad(event)"' + | ||
1068 | + ' poster="' + poster + '"' + | ||
1069 | + 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' + | ||
1070 | + ' ad="' + admp4 + '"' + | ||
1071 | + ' nonad="' + clickedCAVideo + '"' + | ||
1072 | + ' hd="' + hdvideo + '" ' + | ||
1073 | + ' nonhd="' + clickedCAVideo + '">' + | ||
1074 | + ' <source type="video/mp4" src="' + clickedCAVideo + '">' + | ||
1075 | + ' <source type="video/webm" src="' + webm + '">' + | ||
1076 | + ' <source type="video/ogv" src="' + ogv + '">' + | ||
1077 | + ' <track src="' + vtt + '" ' + | ||
1078 | + ' kind="captions" srclang="en" label="On"><object width="640" height="360"' + | ||
1079 | + ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' + | ||
1080 | + ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' + | ||
1081 | + ' <param name="flashvars" ng-value="controls=true&file=' + clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid_' + windowviewid + '" align="left" style="height:60px;overflow-y:scroll !important;-webkit-overflow-scrolling:touch !important;"><p>' + clickedCASummary + '</p></div><button id="btnTxtOnOff_' + windowviewid + '" class="btn btn-primary pull-right" style="position:relative;top:0px">Text Off</button></div></div></div>', | ||
1082 | + | ||
1083 | + title: tittle, | ||
1084 | + position: { | ||
1085 | + top: $scope.jsPanelTop, | ||
1086 | + left: $scope.jsPanelLeft | ||
1087 | + }, | ||
1088 | + | ||
1089 | + size: { | ||
1090 | + width: $scope.jsPanelWidth, | ||
1091 | + height: $scope.jsPanelHeight | ||
1092 | + }, | ||
1093 | + onmaximized:function (panel) { | ||
1094 | + var pnlName=panel[0].id; | ||
1095 | + var len = (pnlName).split("_").length; | ||
1096 | + var windowviewid = (pnlName).split("_")[len - 1]; | ||
1097 | + var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); | ||
1098 | + if(!isAutoCalled) | ||
1099 | + { | ||
1100 | + $rootScope.UnsaveCurriculum = true; | ||
1124 | } | 1101 | } |
1125 | - else if(aodheight<1024) | 1102 | + $scope.SetCAwindowStoreData(windowviewid, 'maximised',true); |
1103 | + $scope.SetCAwindowStoreData(windowviewid, 'minimised',false); | ||
1104 | + var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); | ||
1105 | + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); | ||
1106 | + $rootScope.resetMenuOptionOnClick(pnlName); | ||
1107 | + var $ua = navigator.userAgent; | ||
1108 | + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { | ||
1109 | + var aodheight = screen.height; | ||
1110 | + if(aodheight>=1024) | ||
1111 | + { | ||
1112 | + $("#caImagePanel_"+windowviewid).css('height',canvasDIvHeight+30-150); | ||
1113 | + $('#caImagePanel_' + windowviewid+ " .jsPanel-content").css('height',canvasDIvHeight-150); | ||
1114 | + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-150-120 ); | ||
1115 | + } | ||
1116 | + else if(aodheight<1024) | ||
1117 | + { | ||
1118 | + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); | ||
1119 | + } | ||
1120 | + } | ||
1121 | + }, | ||
1122 | + draggable: "disabled", | ||
1123 | + resizable: "disabled", | ||
1124 | + controls: { buttons: 'none' } | ||
1125 | + }); | ||
1126 | + } | ||
1127 | + else | ||
1128 | + { | ||
1129 | + $scope.jsPanelCA = $.jsPanel({ | ||
1130 | + id: $scope.jsPanelID, | ||
1131 | + selector: '.caView', | ||
1132 | + theme: 'success', | ||
1133 | + currentController: 'CAController', | ||
1134 | + parentSlug: $scope.GetCAwindowStoreData(windowviewid, 'parentSlugName'), | ||
1135 | + content: '<script src="' + playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo_' + windowviewid + '").pause();$("#btnTxtOnOff_' + windowviewid + '").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid_' + windowviewid + '").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid_' + windowviewid + '").css("visibility","visible");} GetTextVisibityCA(event); });});</script>' + | ||
1136 | + '<div id="pid" class="row"><div id="divplayerinlineVideo_' + windowviewid + '" class="col-sm-12" align="center" width="640" height="480"><video width="100%" height="400"' + | ||
1137 | + 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo_' + windowviewid + '" onloadstart="videoOnLoad(event)"' + | ||
1138 | + ' poster="' + poster + '"' + | ||
1139 | + 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' + | ||
1140 | + ' ad="' + admp4 + '"' + | ||
1141 | + ' nonad="' + clickedCAVideo + '"' + | ||
1142 | + ' hd="' + hdvideo + '" ' + | ||
1143 | + ' nonhd="' + clickedCAVideo + '">' + | ||
1144 | + ' <source type="video/mp4" src="' + clickedCAVideo + '">' + | ||
1145 | + ' <source type="video/webm" src="' + webm + '">' + | ||
1146 | + ' <source type="video/ogv" src="' + ogv + '">' + | ||
1147 | + ' <track src="' + vtt + '" ' + | ||
1148 | + ' kind="captions" srclang="en" label="On"><object width="640" height="360"' + | ||
1149 | + ' type="application/x-shockwave-flash" data="//vjs.zencdn.net/3.2/video-js.swf"><param name="allowfullscreen" value="true">' + | ||
1150 | + ' <param name="allowscriptaccess" value="always"><param name="movie" value="//vjs.zencdn.net/3.2/video-js.swf">' + | ||
1151 | + ' <param name="flashvars" ng-value="controls=true&file=' + clickedCAVideo + '"><img ng-src="content/images/common/player/frameaccuracy_logo.jpg" style="height:80%;" alt="Here we are" title="No video playback capabilities"></object></video><div class="col-sm-12 well video-subtitle"><div id="sid_' + windowviewid + '" align="left" style="height:60px;overflow-y:scroll !important;-webkit-overflow-scrolling:touch !important;"><p>' + clickedCASummary + '</p></div><button id="btnTxtOnOff_' + windowviewid + '" class="btn btn-primary pull-right" style="position:relative;top:0px">Text Off</button></div></div></div>', | ||
1152 | + | ||
1153 | + title: tittle, | ||
1154 | + position: { | ||
1155 | + top: $scope.jsPanelTop, | ||
1156 | + left: $scope.jsPanelLeft | ||
1157 | + }, | ||
1158 | + | ||
1159 | + size: { | ||
1160 | + width: $scope.jsPanelWidth, | ||
1161 | + height: $scope.jsPanelHeight | ||
1162 | + }, | ||
1163 | + onminimized:function (panel) { | ||
1164 | + var pnlName=panel[0].id; | ||
1165 | + var len = (pnlName).split("_").length; | ||
1166 | + var windowviewid = (pnlName).split("_")[len - 1]; | ||
1167 | + var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); | ||
1168 | + if(!isAutoCalled) | ||
1126 | { | 1169 | { |
1127 | - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); | ||
1128 | - } | ||
1129 | - } | ||
1130 | - }, | ||
1131 | - onnormalized:function (panel) { | ||
1132 | - var pnlName=panel[0].id; | ||
1133 | - var len = (pnlName).split("_").length; | ||
1134 | - var windowviewid = (pnlName).split("_")[len - 1]; | ||
1135 | - var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); | ||
1136 | - if(!isAutoCalled) | ||
1137 | - { | ||
1138 | - $rootScope.UnsaveCurriculum = true; | ||
1139 | - } | ||
1140 | - $scope.SetCAwindowStoreData(windowviewid, 'minimised',false); | ||
1141 | - $scope.SetCAwindowStoreData(windowviewid, 'maximised',false); | ||
1142 | - var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); | ||
1143 | - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); | ||
1144 | - $rootScope.resetMenuOptionOnClick(pnlName); | ||
1145 | - }, | ||
1146 | - resizable: { | ||
1147 | - stop: function (event, ui) { | ||
1148 | - var pnlName=event.currentTarget.id; | 1170 | + $rootScope.UnsaveCurriculum = true; |
1171 | + } | ||
1172 | + $scope.SetCAwindowStoreData(windowviewid, 'minimised',true); | ||
1173 | + $scope.SetCAwindowStoreData(windowviewid, 'maximised',false); | ||
1174 | + }, | ||
1175 | + onmaximized:function (panel) { | ||
1176 | + var pnlName=panel[0].id; | ||
1149 | var len = (pnlName).split("_").length; | 1177 | var len = (pnlName).split("_").length; |
1150 | var windowviewid = (pnlName).split("_")[len - 1]; | 1178 | var windowviewid = (pnlName).split("_")[len - 1]; |
1151 | - $scope.SetCAwindowStoreData(windowviewid, 'width', ui.size.width); | ||
1152 | - $scope.SetCAwindowStoreData(windowviewid, 'height', ui.size.height); | ||
1153 | - $scope.SetCAwindowStoreData(windowviewid, 'y', ui.position.top); | ||
1154 | - $scope.SetCAwindowStoreData(windowviewid, 'x', ui.position.left); | ||
1155 | - $rootScope.UnsaveCurriculum = true; | 1179 | + var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); |
1180 | + if(!isAutoCalled) | ||
1181 | + { | ||
1182 | + $rootScope.UnsaveCurriculum = true; | ||
1183 | + } | ||
1184 | + $scope.SetCAwindowStoreData(windowviewid, 'maximised',true); | ||
1185 | + $scope.SetCAwindowStoreData(windowviewid, 'minimised',false); | ||
1156 | var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); | 1186 | var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); |
1157 | - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); | ||
1158 | - $rootScope.resetMenuOptionOnClick(pnlName); | ||
1159 | - } | ||
1160 | - | ||
1161 | - }, | ||
1162 | - draggable: { | ||
1163 | - stop: function( event, ui ) { | ||
1164 | - var pnlName=event.currentTarget.id; | 1187 | + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); |
1188 | + $rootScope.resetMenuOptionOnClick(pnlName); | ||
1189 | + var $ua = navigator.userAgent; | ||
1190 | + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { | ||
1191 | + var aodheight = screen.height; | ||
1192 | + if(aodheight>=1024) | ||
1193 | + { | ||
1194 | + $("#caImagePanel_"+windowviewid).css('height',canvasDIvHeight+30-150); | ||
1195 | + $('#caImagePanel_' + windowviewid+ " .jsPanel-content").css('height',canvasDIvHeight-150); | ||
1196 | + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-150-120 ); | ||
1197 | + } | ||
1198 | + else if(aodheight<1024) | ||
1199 | + { | ||
1200 | + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); | ||
1201 | + } | ||
1202 | + } | ||
1203 | + }, | ||
1204 | + onnormalized:function (panel) { | ||
1205 | + var pnlName=panel[0].id; | ||
1165 | var len = (pnlName).split("_").length; | 1206 | var len = (pnlName).split("_").length; |
1166 | var windowviewid = (pnlName).split("_")[len - 1]; | 1207 | var windowviewid = (pnlName).split("_")[len - 1]; |
1167 | - $scope.SetCAwindowStoreData(windowviewid, 'y', ui.position.top); | ||
1168 | - $scope.SetCAwindowStoreData(windowviewid, 'x', ui.position.left); | ||
1169 | - $rootScope.UnsaveCurriculum = true; | 1208 | + var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); |
1209 | + if(!isAutoCalled) | ||
1210 | + { | ||
1211 | + $rootScope.UnsaveCurriculum = true; | ||
1212 | + } | ||
1213 | + $scope.SetCAwindowStoreData(windowviewid, 'minimised',false); | ||
1214 | + $scope.SetCAwindowStoreData(windowviewid, 'maximised',false); | ||
1215 | + var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); | ||
1216 | + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); | ||
1170 | $rootScope.resetMenuOptionOnClick(pnlName); | 1217 | $rootScope.resetMenuOptionOnClick(pnlName); |
1218 | + }, | ||
1219 | + resizable: { | ||
1220 | + stop: function (event, ui) { | ||
1221 | + var pnlName=event.currentTarget.id; | ||
1222 | + var len = (pnlName).split("_").length; | ||
1223 | + var windowviewid = (pnlName).split("_")[len - 1]; | ||
1224 | + $scope.SetCAwindowStoreData(windowviewid, 'width', ui.size.width); | ||
1225 | + $scope.SetCAwindowStoreData(windowviewid, 'height', ui.size.height); | ||
1226 | + $scope.SetCAwindowStoreData(windowviewid, 'y', ui.position.top); | ||
1227 | + $scope.SetCAwindowStoreData(windowviewid, 'x', ui.position.left); | ||
1228 | + $rootScope.UnsaveCurriculum = true; | ||
1229 | + var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); | ||
1230 | + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); | ||
1231 | + $rootScope.resetMenuOptionOnClick(pnlName); | ||
1232 | + } | ||
1233 | + | ||
1234 | + }, | ||
1235 | + draggable: { | ||
1236 | + stop: function( event, ui ) { | ||
1237 | + var pnlName=event.currentTarget.id; | ||
1238 | + var len = (pnlName).split("_").length; | ||
1239 | + var windowviewid = (pnlName).split("_")[len - 1]; | ||
1240 | + $scope.SetCAwindowStoreData(windowviewid, 'y', ui.position.top); | ||
1241 | + $scope.SetCAwindowStoreData(windowviewid, 'x', ui.position.left); | ||
1242 | + $rootScope.UnsaveCurriculum = true; | ||
1243 | + $rootScope.resetMenuOptionOnClick(pnlName); | ||
1244 | + } | ||
1171 | } | 1245 | } |
1172 | - }, | ||
1173 | - | ||
1174 | - | ||
1175 | - }); | 1246 | + }); |
1247 | + } | ||
1248 | + | ||
1176 | 1249 | ||
1177 | var isMaximize = $scope.GetCAwindowStoreData(windowviewid, 'maximised'); | 1250 | var isMaximize = $scope.GetCAwindowStoreData(windowviewid, 'maximised'); |
1178 | var isMinimize = $scope.GetCAwindowStoreData(windowviewid, 'minimised'); | 1251 | var isMinimize = $scope.GetCAwindowStoreData(windowviewid, 'minimised'); |
@@ -1186,6 +1259,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -1186,6 +1259,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
1186 | $scope.jsPanelCA.normalize(); | 1259 | $scope.jsPanelCA.normalize(); |
1187 | } | 1260 | } |
1188 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelCA); | 1261 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelCA); |
1262 | + | ||
1263 | + $("#caImagePanel_"+windowviewid).css('overflow','hidden'); | ||
1189 | // set false after initial call of min,max or normal | 1264 | // set false after initial call of min,max or normal |
1190 | $scope.SetCAwindowStoreData(windowviewid, 'minmaxAutoEvent', false); | 1265 | $scope.SetCAwindowStoreData(windowviewid, 'minmaxAutoEvent', false); |
1191 | $scope.SetCAwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); | 1266 | $scope.SetCAwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -1083,6 +1083,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -1083,6 +1083,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
1083 | } | 1083 | } |
1084 | 1084 | ||
1085 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelCI); | 1085 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelCI); |
1086 | + | ||
1087 | + $("#ciImagePanel_"+windowviewid).css('overflow','hidden'); | ||
1086 | // set false after initial call of min,max or normal | 1088 | // set false after initial call of min,max or normal |
1087 | $scope.SetCIwindowStoreData(windowviewid, 'minmaxAutoEvent', false); | 1089 | $scope.SetCIwindowStoreData(windowviewid, 'minmaxAutoEvent', false); |
1088 | $scope.SetCIwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); | 1090 | $scope.SetCIwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1092,6 +1092,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -1092,6 +1092,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
1092 | } | 1092 | } |
1093 | 1093 | ||
1094 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelDA); | 1094 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelDA); |
1095 | + $("#daImagePanel_"+windowviewid).css('overflow','hidden'); | ||
1095 | // set false after initial call of min,max or normal | 1096 | // set false after initial call of min,max or normal |
1096 | $scope.SetwindowStoreData(windowviewid, 'minmaxAutoEvent', false); | 1097 | $scope.SetwindowStoreData(windowviewid, 'minmaxAutoEvent', false); |
1097 | $scope.SetwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); | 1098 | $scope.SetwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -498,6 +498,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | @@ -498,6 +498,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, | ||
498 | $scope.jsPanelLab.normalize(); | 498 | $scope.jsPanelLab.normalize(); |
499 | } | 499 | } |
500 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelLab); | 500 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelLab); |
501 | + | ||
502 | + $("#labImagePanel_"+windowviewid).css('overflow','hidden'); | ||
501 | // set false after initial call of min,max or normal | 503 | // set false after initial call of min,max or normal |
502 | $scope.SetLEwindowStoreData(windowviewid, 'minmaxAutoEvent', false); | 504 | $scope.SetLEwindowStoreData(windowviewid, 'minmaxAutoEvent', false); |
503 | $scope.SetLEwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); | 505 | $scope.SetLEwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
@@ -415,6 +415,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -415,6 +415,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
415 | } | 415 | } |
416 | 416 | ||
417 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelVideo); | 417 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelVideo); |
418 | + | ||
419 | + $("#vidImagePanel_"+windowviewid).css('overflow','hidden'); | ||
418 | 420 | ||
419 | // set false after initial call of min,max or normal | 421 | // set false after initial call of min,max or normal |
420 | $scope.SetVideowindowStoreData(windowviewid, 'minmaxAutoEvent', false); | 422 | $scope.SetVideowindowStoreData(windowviewid, 'minmaxAutoEvent', false); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
@@ -383,6 +383,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -383,6 +383,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
383 | } | 383 | } |
384 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelPIC); | 384 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelPIC); |
385 | 385 | ||
386 | + $("#picImagePanel_"+windowviewid).css('overflow','hidden'); | ||
386 | // set false after initial call of min,max or normal | 387 | // set false after initial call of min,max or normal |
387 | $scope.SetPICwindowStoreData(windowviewid, 'minmaxAutoEvent', false); | 388 | $scope.SetPICwindowStoreData(windowviewid, 'minmaxAutoEvent', false); |
388 | $scope.SetPICwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); | 389 | $scope.SetPICwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -740,6 +740,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -740,6 +740,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
740 | 740 | ||
741 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelAA); | 741 | $rootScope.AllPanelObject(windowviewid,$scope.jsPanelAA); |
742 | 742 | ||
743 | + $("#AAImagePanel_"+windowviewid).css('overflow','hidden'); | ||
744 | + | ||
743 | // set false after initial call of min,max or normal | 745 | // set false after initial call of min,max or normal |
744 | $scope.SetAAwindowStoreData(windowviewid, 'minmaxAutoEvent', false); | 746 | $scope.SetAAwindowStoreData(windowviewid, 'minmaxAutoEvent', false); |
745 | $scope.SetAAwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); | 747 | $scope.SetAAwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); |
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
@@ -874,6 +874,7 @@ var jsPanel = { | @@ -874,6 +874,7 @@ var jsPanel = { | ||
874 | { | 874 | { |
875 | var pnltop=55; | 875 | var pnltop=55; |
876 | var ht=$(window).outerHeight()-10 - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom) - 43; | 876 | var ht=$(window).outerHeight()-10 - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom) - 43; |
877 | + var wt=$(window).outerWidth()+8 - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right); | ||
877 | if($('.navbar-fixed-top').css('display') == 'none') | 878 | if($('.navbar-fixed-top').css('display') == 'none') |
878 | { | 879 | { |
879 | //Change for CA link | 880 | //Change for CA link |
@@ -881,7 +882,7 @@ var jsPanel = { | @@ -881,7 +882,7 @@ var jsPanel = { | ||
881 | var ht=$(window).outerHeight() - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom); | 882 | var ht=$(window).outerHeight() - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom); |
882 | } | 883 | } |
883 | 884 | ||
884 | - var wt=$(window).outerWidth() - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right)+1; | 885 | + |
885 | panel.css({ | 886 | panel.css({ |
886 | top: pnltop,//panel.option.maximizedMargin.top), | 887 | top: pnltop,//panel.option.maximizedMargin.top), |
887 | left:parseInt(1),//panel.option.maximizedMargin.left | 888 | left:parseInt(1),//panel.option.maximizedMargin.left |