ADAM / AIAHTML5

Commit 0fe75d86e9c6f189284298521d5891450d316a6b

Authored by Amrita Vishnoi
1 parent 66751d2d

There was an issue of holding previously extracted data in next without ctrl click, now it is fixed.

Inline Side-by-side
Showing 3 changed files with 11 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/Web.config
  View file @0fe75d8
... ... @@ -37,9 +37,8 @@
37 37 <remove fileExtension=".woff" />
38 38 <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
39 39 <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
40   - <!--<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />-->
41   - <mimeMap fileExtension=".json" mimeType="application/json" />
42   -
  40 +
  41 +
43 42 </staticContent>
44 43 <defaultDocument enabled="true">
45 44 <files>
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @0fe75d8
... ... @@ -1167,6 +1167,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1167 1167 $rootScope.multiAnnotationIsON = true;
1168 1168 }
1169 1169 else {
  1170 + if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
  1171 + $rootScope.previousHighlightList = [];
  1172 + }
  1173 +
1170 1174 $rootScope.multiAnnotationIsON = false;
1171 1175 }
1172 1176  
... ... @@ -1495,6 +1499,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1495 1499 $rootScope.multiAnnotationIsON = true;
1496 1500 }
1497 1501 else {
  1502 + if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0))
  1503 + {
  1504 + $rootScope.previousHighlightList = [];
  1505 + }
1498 1506 $rootScope.multiAnnotationIsON = false;
1499 1507 }
1500 1508  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @0fe75d8
1 1 <!DOCTYPE html>
2 2 <html lang="en" ng-cloak ng-app="AIA">
3 3 <head>
4   - <base href="/AIAHTML5/" />
  4 + <base href="/AIA/" />
5 5 <meta charset="utf-8">
6 6 <meta http-equiv="X-UA-Compatible" content="IE=edge">
7 7 <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">-->
... ...