ADAM / AIAHTML5

Commit 744cfacfc1f428b221280997b46aeeef9eaea0a5

Authored by Birendra
1 parent 187f4aad

fix the issue of play clinical animation over https

Inline Side-by-side
Showing 3 changed files with 29 additions and 29 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @744cfac
... ... @@ -429,8 +429,8 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
429 429 theme: 'success',
430 430 currentController: '3dAController',
431 431 parentSlug: $scope.Get3DwindowStoreData(windowviewid, 'parentSlugName'),
432   - content: '<div class="col-sm-12" style="height: 560px;overflow: auto;" >' +
433   - '<object data="' + Selected3DImagePath + '" width="100%" height="800px" type="image/svg+xml" id="threedImage_' + windowviewid + '" onload="AnimationOnLoad(event)"></object>' +
  432 + content: '<div class="col-sm-12" style="height: 550px;overflow: auto;" >' +
  433 + '<object data="' + Selected3DImagePath + '" width="100%" height="600px" type="image/svg+xml" id="threedImage_' + windowviewid + '" onload="AnimationOnLoad(event)"></object>' +
434 434 '</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>',
435 435 title: tittle,
436 436 position: {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @744cfac
... ... @@ -11,7 +11,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
11 11 $scope.SelectedCAImage = [];
12 12 $scope.SelectedCASummary = [];
13 13 $scope.filterstring = false;
14   - $scope.hostedServer = "http://aia5.adam.com/graphics/Multimedia/en/";
  14 + $scope.hostedServer = "https://ssl.adam.com/graphics/Multimedia/en/";
15 15 $scope.hostedFolderId;
16 16 $scope.idSelected;
17 17 $scope.query = {
... ...
400-SOURCECODE/AIAHTML5.Web/content/data/json/ca/ca_dat_contentlist_mp4link.json
  View file @744cfac
... ... @@ -5,7 +5,7 @@
5 5 "_id": "1103",
6 6 "_ImageId": "3377",
7 7 "_Title": "Blood clotting",
8   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200077/200077.mp4",
  8 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200077/200077.mp4",
9 9 "_HostedFolderId": "200077",
10 10 "_ThumbnailImage": "ca_tni_3377.jpg",
11 11 "_BodySystem": "Cardiovascular",
... ... @@ -18,7 +18,7 @@
18 18 "_id": "1104",
19 19 "_ImageId": "3378",
20 20 "_Title": "Blood pressure",
21   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200079/200079.mp4",
  21 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200079/200079.mp4",
22 22 "_HostedFolderId": "200079",
23 23 "_ThumbnailImage": "ca_tni_3378.jpg",
24 24 "_BodySystem": "Cardiovascular",
... ... @@ -31,7 +31,7 @@
31 31 "_id": "1105",
32 32 "_ImageId": "3379",
33 33 "_Title": "Brain components",
34   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200008/200008.mp4",
  34 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200008/200008.mp4",
35 35 "_HostedFolderId": "200008",
36 36 "_ThumbnailImage": "ca_tni_3379.jpg",
37 37 "_BodySystem": "Nervous",
... ... @@ -44,7 +44,7 @@
44 44 "_id": "1106",
45 45 "_ImageId": "3380",
46 46 "_Title": "Cardiac conduction system",
47   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200080/200080.mp4",
  47 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200080/200080.mp4",
48 48 "_HostedFolderId": "200080",
49 49 "_ThumbnailImage": "ca_tni_3380.jpg",
50 50 "_BodySystem": "Cardiovascular",
... ... @@ -57,7 +57,7 @@
57 57 "_id": "1108",
58 58 "_ImageId": "3382",
59 59 "_Title": "Coronary artery bypass graft (CABG)",
60   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200138/200138.mp4",
  60 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200138/200138.mp4",
61 61 "_HostedFolderId": "200138",
62 62 "_ThumbnailImage": "ca_tni_3382.jpg",
63 63 "_BodySystem": "Cardiovascular",
... ... @@ -70,7 +70,7 @@
70 70 "_id": "1109",
71 71 "_ImageId": "3383",
72 72 "_Title": "Directional coronary atherectomy (DCA)",
73   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200139/200139.mp4",
  73 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200139/200139.mp4",
74 74 "_HostedFolderId": "200139",
75 75 "_ThumbnailImage": "ca_tni_3383.jpg",
76 76 "_BodySystem": "Cardiovascular",
... ... @@ -83,7 +83,7 @@
83 83 "_id": "1111",
84 84 "_ImageId": "3384",
85 85 "_Title": "Egg cell production",
86   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200115/200115.mp4",
  86 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200115/200115.mp4",
87 87 "_HostedFolderId": "200115",
88 88 "_ThumbnailImage": "ca_tni_3384.jpg",
89 89 "_BodySystem": "Endocrine, Reproductive",
... ... @@ -96,7 +96,7 @@
96 96 "_id": "1113",
97 97 "_ImageId": "3386",
98 98 "_Title": "Endocrine glands - general overview",
99   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200091/200091.mp4",
  99 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200091/200091.mp4",
100 100 "_HostedFolderId": "200091",
101 101 "_ThumbnailImage": "ca_tni_3386.jpg",
102 102 "_BodySystem": "Endocrine, Nervous",
... ... @@ -109,7 +109,7 @@
109 109 "_id": "1114",
110 110 "_ImageId": "3387",
111 111 "_Title": "Enlarged prostate gland (BPH)",
112   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200003/200003.mp4",
  112 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200003/200003.mp4",
113 113 "_HostedFolderId": "200003",
114 114 "_ThumbnailImage": "ca_tni_3387.jpg",
115 115 "_BodySystem": "Reproductive, Urinary",
... ... @@ -122,7 +122,7 @@
122 122 "_id": "1115",
123 123 "_ImageId": "3388",
124 124 "_Title": "Fetal development - interactive tool",
125   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200129/200129.mp4",
  125 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200129/200129.mp4",
126 126 "_HostedFolderId": "200129",
127 127 "_ThumbnailImage": "ca_tni_3388.jpg",
128 128 "_BodySystem": "Reproductive",
... ... @@ -135,7 +135,7 @@
135 135 "_id": "1116",
136 136 "_ImageId": "3389",
137 137 "_Title": "Formation of twins",
138   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200116/200116.mp4",
  138 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200116/200116.mp4",
139 139 "_HostedFolderId": "200116",
140 140 "_ThumbnailImage": "ca_tni_3389.jpg",
141 141 "_BodySystem": "Reproductive",
... ... @@ -148,7 +148,7 @@
148 148 "_id": "1117",
149 149 "_ImageId": "3390",
150 150 "_Title": "Gas exchange",
151   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200022/200022.mp4",
  151 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200022/200022.mp4",
152 152 "_HostedFolderId": "200022",
153 153 "_ThumbnailImage": "ca_tni_3390.jpg",
154 154 "_BodySystem": "Cardiovascular, Respiratory",
... ... @@ -161,7 +161,7 @@
161 161 "_id": "1118",
162 162 "_ImageId": "3391",
163 163 "_Title": "Heartbeat",
164   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200083/200083.mp4",
  164 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200083/200083.mp4",
165 165 "_HostedFolderId": "200083",
166 166 "_ThumbnailImage": "ca_tni_3391.jpg",
167 167 "_BodySystem": "Cardiovascular",
... ... @@ -174,7 +174,7 @@
174 174 "_id": "1120",
175 175 "_ImageId": "3393",
176 176 "_Title": "Lymphatics and the breast",
177   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200103/200103.mp4",
  177 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200103/200103.mp4",
178 178 "_HostedFolderId": "200103",
179 179 "_ThumbnailImage": "ca_tni_3393.jpg",
180 180 "_BodySystem": "Cardiovascular, Lymphatic",
... ... @@ -187,7 +187,7 @@
187 187 "_id": "1121",
188 188 "_ImageId": "3394",
189 189 "_Title": "Menstrual cycle - interactive tool",
190   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200132/200132.mp4",
  190 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200132/200132.mp4",
191 191 "_HostedFolderId": "200132",
192 192 "_ThumbnailImage": "ca_tni_3394.jpg",
193 193 "_BodySystem": "Endocrine, Reproductive",
... ... @@ -200,7 +200,7 @@
200 200 "_id": "1122",
201 201 "_ImageId": "3395",
202 202 "_Title": "Nerve conduction - general overview",
203   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200011/200011.mp4",
  203 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200011/200011.mp4",
204 204 "_HostedFolderId": "200011",
205 205 "_ThumbnailImage": "ca_tni_3395.jpg",
206 206 "_BodySystem": "Nervous",
... ... @@ -213,7 +213,7 @@
213 213 "_id": "1124",
214 214 "_ImageId": "3397",
215 215 "_Title": "Peristalsis",
216   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200088/200088.mp4",
  216 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200088/200088.mp4",
217 217 "_HostedFolderId": "200088",
218 218 "_ThumbnailImage": "ca_tni_3397.jpg",
219 219 "_BodySystem": "Digestive",
... ... @@ -226,7 +226,7 @@
226 226 "_id": "1126",
227 227 "_ImageId": "3399",
228 228 "_Title": "Sperm production and pathway of ejaculation",
229   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200019/200019.mp4",
  229 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200019/200019.mp4",
230 230 "_HostedFolderId": "200019",
231 231 "_ThumbnailImage": "ca_tni_3399.jpg",
232 232 "_BodySystem": "Reproductive",
... ... @@ -239,7 +239,7 @@
239 239 "_id": "1127",
240 240 "_ImageId": "3400",
241 241 "_Title": "Stroke",
242   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200071/200071.mp4",
  242 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200071/200071.mp4",
243 243 "_HostedFolderId": "200071",
244 244 "_ThumbnailImage": "ca_tni_3400.jpg",
245 245 "_BodySystem": "Cardiovascular",
... ... @@ -252,7 +252,7 @@
252 252 "_id": "1128",
253 253 "_ImageId": "3401",
254 254 "_Title": "Stroke - secondary to cardiogenic embolism",
255   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200072/200072.mp4",
  255 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200072/200072.mp4",
256 256 "_HostedFolderId": "200072",
257 257 "_ThumbnailImage": "ca_tni_3401.jpg",
258 258 "_BodySystem": "Cardiovascular",
... ... @@ -265,7 +265,7 @@
265 265 "_id": "1119",
266 266 "_ImageId": "3392",
267 267 "_Title": "Intracytoplasmic sperm injection (ICSI)",
268   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200061/200061.mp4",
  268 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200061/200061.mp4",
269 269 "_HostedFolderId": "200061",
270 270 "_ThumbnailImage": "ca_tni_3392.jpg",
271 271 "_BodySystem": "Reproductive",
... ... @@ -278,7 +278,7 @@
278 278 "_id": "1123",
279 279 "_ImageId": "3396",
280 280 "_Title": "Percutaneous transluminal coronary angioplasty (PTCA)",
281   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200140/200140.mp4",
  281 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200140/200140.mp4",
282 282 "_HostedFolderId": "200140",
283 283 "_ThumbnailImage": "ca_tni_3396.jpg",
284 284 "_BodySystem": "Cardiovascular",
... ... @@ -291,7 +291,7 @@
291 291 "_id": "1125",
292 292 "_ImageId": "3398",
293 293 "_Title": "Sexual differentiation",
294   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200124/200124.mp4",
  294 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200124/200124.mp4",
295 295 "_HostedFolderId": "200124",
296 296 "_ThumbnailImage": "ca_tni_3398.jpg",
297 297 "_BodySystem": "Reproductive",
... ... @@ -304,7 +304,7 @@
304 304 "_id": "1129",
305 305 "_ImageId": "3402",
306 306 "_Title": "Vasectomy",
307   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200076/200076.mp4",
  307 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200076/200076.mp4",
308 308 "_HostedFolderId": "200076",
309 309 "_ThumbnailImage": "ca_tni_3402.jpg",
310 310 "_BodySystem": "Reproductive",
... ... @@ -317,7 +317,7 @@
317 317 "_id": "1130",
318 318 "_ImageId": "3403",
319 319 "_Title": "Low back pain",
320   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200148/200148.mp4",
  320 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200148/200148.mp4",
321 321 "_HostedFolderId": "200148",
322 322 "_ThumbnailImage": "ca_tni_3403.jpg",
323 323 "_BodySystem": "Nervous, Skeletal",
... ... @@ -330,7 +330,7 @@
330 330 "_id": "1131",
331 331 "_ImageId": "3404",
332 332 "_Title": "Hearing and the cochlea",
333   - "_Video": "http://aia5.adam.com/graphics/Multimedia/en/200057/200057.mp4",
  333 + "_Video": "https://ssl.adam.com/graphics/Multimedia/en/200057/200057.mp4",
334 334 "_HostedFolderId": "200057",
335 335 "_ThumbnailImage": "ca_tni_3404.jpg",
336 336 "_BodySystem": "Nervous",
... ...