ADAM / AIAHTML5

Commit 521228f33d27ccf6690e51c28774f188cecc3036

Authored by Amrita Vishnoi
2 parents 8e20363f e417a5fd

Merge branch 'LayerNoBug6593' into Develop

Inline Side-by-side
Showing 3 changed files with 6 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @521228f
@@ -340,8 +340,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B @@ -340,8 +340,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
340 parentSlug: 'clinical-animations', 340 parentSlug: 'clinical-animations',
341 content: '<div class="row"><div class="col-sm-12" align="center"><video style="height:80%;" controls>' + 341 content: '<div class="row"><div class="col-sm-12" align="center"><video style="height:80%;" controls>' +
342 '<source loop autoplay controls="true" src="' + $scope.clickedCAVideo + '" type="video/mp4" />Your browser does not support HTML5 video.</video><div class="col-sm-12 well">' + 342 '<source loop autoplay controls="true" src="' + $scope.clickedCAVideo + '" type="video/mp4" />Your browser does not support HTML5 video.</video><div class="col-sm-12 well">' +
343 - '<div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button class="btn btn-primary pull-right">Text Off</button>' +  
344 - '<script>$(document).ready(function(){$("button").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div></div>', 343 + '<div id="sid" align="left" style="height:40px;overflow-y:scroll !important"><p>' + $scope.clickedCASummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
  344 + '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div></div>',
345 345
346 //ajax: { 346 //ajax: {
347 // url: 'app/views/ca/ca-view-detail.html' 347 // url: 'app/views/ca/ca-view-detail.html'
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @521228f
@@ -404,8 +404,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -404,8 +404,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
404 parentSlug: 'clinical-illustrations', 404 parentSlug: 'clinical-illustrations',
405 content: '<div class="row"><div class="col-sm-12 img-thumbnail" align="center">' + 405 content: '<div class="row"><div class="col-sm-12 img-thumbnail" align="center">' +
406 '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well">' + 406 '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well">' +
407 - '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button class="btn btn-primary pull-right">Text Off</button>' +  
408 - '<script>$(document).ready(function(){$("button").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div>' + 407 + '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
  408 + '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div>' +
409 '</div></div>', 409 '</div></div>',
410 //ajax: { 410 //ajax: {
411 // url: 'app/views/ci/ci-view-detail.html' 411 // url: 'app/views/ci/ci-view-detail.html'
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @521228f
@@ -443,6 +443,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -443,6 +443,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
443 443
444 $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); 444 $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
445 445
  446 + $scope.layerNumber = 0;
  447 +
446 //2. 448 //2.
447 449
448 console.log('currentBodyViewId just before sending: ' + currentBodyViewId); 450 console.log('currentBodyViewId just before sending: ' + currentBodyViewId);