ADAM / AIAHTML5

Commit a7b447204a36eb9a042ddc7c6bd7c1aa3745892d

Authored by Nikita Kulshreshtha
2 parents c81a594f a1cf11ca

Merge branch 'SettingHighlighted' into Develop

Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @a7b4472
... ... @@ -1034,7 +1034,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1034 1034 }
1035 1035 });
1036 1036 // Annotation: Edit Text option is missing.
1037   - // alert($rootScope.CurrentWidth);
  1037 + // alert($rootScope.CurrentWidth);
1038 1038 // alert($rootScope.CurrentHeight);
1039 1039 $("#annotationTextModal").css("padding-right", "0px");
1040 1040 if (($rootScope.CurrentWidth > 0 && $rootScope.CurrentHeight > 0) || ($rootScope.CurrentWidth > 0 && $rootScope.CurrentHeight <= 0) || ($rootScope.CurrentWidth <= 0 && $rootScope.CurrentHeight > 0)) {
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @a7b4472
... ... @@ -440,9 +440,10 @@
440 440 <div class="col-sm-6">
441 441 <h5 class="font13 bolder">Annotation</h5>
442 442 <div class="checkbox no-margin">
443   - <label>
  443 + <!--Settings > The entire highlighted part should be active-->
  444 + <label class="font11 no-margin-btm">
444 445 <input type="checkbox" value="" checked>
445   - <label class="font11 padd-left0 no-margin-btm">Erase Annotations when changing layers</label>
  446 + Erase Annotations when changing layers
446 447 </label>
447 448 </div>
448 449 </div>
... ...