ADAM / AIAHTML5

Commit b5a93dbb734183d94a72cc33de5ebf1868fef6aa

Authored by Nikita Kulshreshtha
2 parents 4e9e6fd9 a4b74383

Merge branch 'NewBug78Merge' into Develop

Inline Side-by-side
Showing 2 changed files with 11 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @b5a93db
... ... @@ -131,7 +131,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
131 131  
132 132 $rootScope.CloseAnnotationTool = function () {
133 133 console.log('close');
134   - //7904
  134 + $('.btnCursor').removeClass('activebtncolor');
135 135 $("#annotationButton").removeClass("active");
136 136 $("#annotationToolBarOptions").removeClass("active");
137 137  
... ... @@ -367,7 +367,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
367 367 document.getElementById('modelbackground').style.display = "block";
368 368 //$("#editshapestyle").modal('show');
369 369 document.getElementById('modeleditstyle').style.display = "block";
370   -
  370 + if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing
  371 + var previewOpacity = $('#imgOpacity').css("opacity");
  372 + $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity*100) + "%");
  373 + $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");
  374 +
  375 + };
371 376 }
372 377  
373 378  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @b5a93db
... ... @@ -13,6 +13,7 @@
13 13  
14 14  
15 15  
  16 +
16 17 <link href="themes/default/css/bootstrap/3.3.6/main.css" rel="stylesheet" />
17 18  
18 19 <link href="themes/default/css/bootstrap/3.3.6/secondeffect.css" rel="stylesheet" />
... ... @@ -421,7 +422,7 @@
421 422 </div>
422 423  
423 424 <!--Annotation Modal-->
424   - <div class="annotationTollbar" style="position:fixed;top:80px;right:20px;display:none;z-index:1200000;">
  425 + <div class="annotationTollbar" style="width: 300px;position: fixed; top: 80px; right: 20px; display: none; z-index: 1200000;">
425 426 <div class="annotationbar">
426 427 <div class="modal-content">
427 428 <div class="modal-header annotation-modal-header">
... ... @@ -1340,8 +1341,7 @@
1340 1341  
1341 1342 });
1342 1343 </script>
1343   -
1344   -
  1344 +
1345 1345 <script>
1346 1346 $(function () {
1347 1347 $("#slider-range-min-3").slider({
... ... @@ -1373,7 +1373,7 @@
1373 1373 max: 1,
1374 1374 step: .1,
1375 1375 slide: function (event, ui) {
1376   -
  1376 +
1377 1377 $(".marginTopBtm10 img.imgopacity").css("opacity", ui.value);
1378 1378 // $("#slider-value").html(ui.value);
1379 1379  
... ...