ADAM / AIAHTML5

Commit 7d0b9fe07df9b3e40c78cf156f4d71e0429af7c3

Authored by unknown
1 parent 61138e67

Manually Merged code for Transparency

Inline Side-by-side
Showing 2 changed files with 58 additions and 36 deletions
.gitignore
  View file @7d0b9fe
1 -# git ignore file  
2 -[Bb]in/  
3 -[Dd]ebug*/  
4 -*.lib  
5 -Thumbs.db  
6 -obj/  
7 -*.obj  
8 -*.exe  
9 -*.pdb  
10 -*.user  
11 -*.aps  
12 -*.pch  
13 -*.vspscc  
14 -*_i.c  
15 -*_p.c  
16 -*.ncb  
17 -*.suo  
18 -*.sln.docstates  
19 -*.tlb  
20 -*.tlh  
21 -*.bak  
22 -*.cache  
23 -*.ilk  
24 -*.log  
25 -[Bb]in  
26 -[Dd]ebug*/  
27 -*.lib  
28 -*.sbr  
29 -obj/  
30 -[Rr]elease*/  
31 -_ReSharper*/  
32 -[Tt]est[Rr]esult*  
33 -*.vssscc  
34 -$tf*/  
35 -400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user 1 +# git ignore file
  2 +[Bb]in/
  3 +[Dd]ebug*/
  4 +*.lib
  5 +Thumbs.db
  6 +obj/
  7 +*.obj
  8 +*.exe
  9 +*.pdb
  10 +*.user
  11 +*.aps
  12 +*.pch
  13 +*.vspscc
  14 +*_i.c
  15 +*_p.c
  16 +*.ncb
  17 +*.suo
  18 +*.sln.docstates
  19 +*.tlb
  20 +*.tlh
  21 +*.bak
  22 +*.cache
  23 +*.ilk
  24 +*.log
  25 +[Bb]in
  26 +[Dd]ebug*/
  27 +*.lib
  28 +*.sbr
  29 +obj/
  30 +[Rr]elease*/
  31 +_ReSharper*/
  32 +[Tt]est[Rr]esult*
  33 +*.vssscc
  34 +$tf*/
  35 +400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user
36 300-PROTOTYPES/POC/AIAHTML5 36 300-PROTOTYPES/POC/AIAHTML5
37 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig 37 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig
38 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js.orig 38 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js.orig
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @7d0b9fe
@@ -4691,7 +4691,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4691,7 +4691,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4691 4691
4692 $scope.enableZoom = function () { 4692 $scope.enableZoom = function () {
4693 4693
4694 - 4694 + $("#btnExtract").removeClass("disabled");
  4695 + $("#btnTranparency").removeClass("disabled");
  4696 + $rootScope.isTransparencyBoxActivated = false;
  4697 + $rootScope.isNormalMode = false;
4695 //if listanager is visisble then close it 4698 //if listanager is visisble then close it
4696 4699
4697 $rootScope.CloseListManager(); 4700 $rootScope.CloseListManager();
@@ -4824,6 +4827,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4824,6 +4827,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4824 $scope.enableHighlight = function () { 4827 $scope.enableHighlight = function () {
4825 4828
4826 4829
  4830 + // $("#btnExtract").removeClass("disabled");
  4831 + // $("#btnTranparency").removeClass("disabled");
  4832 + // $rootScope.isTransparencyBoxActivated = false;
  4833 + // $rootScope.isNormalMode = false;
  4834 +
4827 //if listanager is visisble then close it 4835 //if listanager is visisble then close it
4828 4836
4829 // $rootScope.isListManagerSelected = false; 4837 // $rootScope.isListManagerSelected = false;
@@ -5513,6 +5521,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5513,6 +5521,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5513 5521
5514 $scope.OnGenderChange = function (event) { 5522 $scope.OnGenderChange = function (event) {
5515 5523
  5524 +
  5525 +
  5526 + $("#btnExtract").removeClass("disabled");
  5527 + $("#btnTranparency").removeClass("disabled");
  5528 + $rootScope.isTransparencyBoxActivated = false;
  5529 + $rootScope.isNormalMode = false;
  5530 +
5516 //if listanager is visisble then close it 5531 //if listanager is visisble then close it
5517 5532
5518 // $rootScope.isListManagerSelected = false; 5533 // $rootScope.isListManagerSelected = false;
@@ -5692,6 +5707,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5692,6 +5707,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5692 5707
5693 $scope.OnViewChange = function (event) { 5708 $scope.OnViewChange = function (event) {
5694 5709
  5710 +
  5711 + $("#btnExtract").removeClass("disabled");
  5712 + $("#btnTranparency").removeClass("disabled");
  5713 + $rootScope.isTransparencyBoxActivated = false;
  5714 + $rootScope.isNormalMode = false;
  5715 +
  5716 +
5695 //if listanager is visisble then close it 5717 //if listanager is visisble then close it
5696 5718
5697 //$rootScope.isListManagerSelected = false; 5719 //$rootScope.isListManagerSelected = false;