Merge branch 'bugfix5' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-IPAD-MAC

Nikita Kulshreshtha
2 parents 3f7510bb 1d7653c6
Showing 4 changed files with 106 additions and 63 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -1344,8 +1344,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             //set scrollbars on canvas and hide loading label
  
             // var isiOSSafari = (navigator.userAgent.match(/like Mac OS X/i)) ? true : false;
-            var isiOSSafari = (navigator.userAgent.match(/iPad/i)) ? true : false;
-
+            var isiOSSafari = (navigator.userAgent.match(/(iPod|iPhone|iPad|android)/i)) ? true : false;
+            
             //set scrollbars on canvas and hide loading label
             $('#daLoaderLabel').css('visibility', 'hidden')
  
@@ -9434,6 +9434,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         }
  
         $rootScope.refreshTermListOnSystemSelection = function (bodysystemId) {
+            $rootScope.isLoading = true;
+            $('#spinner').css('visibility', 'visible');
             $rootScope.selectedBodySystemId = bodysystemId;
             $rootScope.selectedBodySystemName = $('#bodySystems option[id="' + bodysystemId + '"]').val();
             $("#bodySystems").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
@@ -9457,7 +9459,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                                            .where('_SystemNumber == ' + bodysystemId)
                                            .select();
                     if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
-
+                        $rootScope.isLoading = false;
+                        $('#spinner').css('visibility', 'hidden');
                         $scope.refreshTerms(systemMatchedTermList);
                     }
                 },
-'use strict';
-
-AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams",
-function ($scope, $rootScope, log, $location, pages, $routeParams) {
-
-     //$rootScope.currentActiveModuleTitle = Modules[10].Name;
-    //$rootScope.currentActiveModuleTitle = $routeParams.modname;
-    $scope.links = [
-        new link("encyclopedia", "Encyclopedia", 'https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=117', "100%", "750px"),
-        new link("IP-10", "IP 10", "http://interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"),
-        new link("indepth-reports", "InDepth Reports", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=10", "100%", "4000px"),
-        new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=107", "100%", "750px"),
-        new link("bodyguide", "Body Guide", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=25 ", "100%", "1050px"),
-        new link("health-navigator", "Health Navigator", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=65 ", "100%", "1000px"),
-        new link("wellness-tools", "The Wellness Tools", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=20 ", "100%", "1500px"),
-        new link("aod", "A.D.A.M OnDemand", "http://uat.adamondemand.com/Home/AIACatalog?categoriesID=2", "100%", "1500px")
-    ];
-
-    $scope.$on('$viewContentLoaded', function (event) {
-       
-
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
-        // code that will be executed ... 
-        // every time this view is loaded
-
-
-             for (var i = 0; i < $scope.links.length; i++) {
-            if ($scope.links[i].modname == $routeParams.modname) {
-                $rootScope.currentActiveModuleTitle = $scope.links[i].title;
-                if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand")
-                {
-                   // document.getElementById('externalLink').style.height = "1024px";
-                    document.getElementById('externalLink').style.height = $(window).outerHeight() - 128+"px";
-
-                }
-                $scope.objdata = $scope.links[i].objurl;
-                $scope.myObj = $scope.links[i].objstyle;  
-            }       
-        }
-    });
-
-    $scope.showTabButton = false;
-    $scope.IsVisible = function () {
-    $scope.scroll();
-
-   }
-
-    $scope.scroll = function () {
-        // $window.scrollTo(0, 0);
-        $("html,body").scrollTop(0);
-        //alert("scroll");
-    }
-}]
-
-
-);
-
-
+'use strict';
+
+AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams",
+function ($scope, $rootScope, log, $location, pages, $routeParams) {
+
+     //$rootScope.currentActiveModuleTitle = Modules[10].Name;
+    //$rootScope.currentActiveModuleTitle = $routeParams.modname;
+    $scope.links = [
+        new link("encyclopedia", "Encyclopedia", 'https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=117', "100%", "750px"),
+        new link("IP-10", "IP 10", "http://interactiveanatomy.com/IPWeb10/index.aspx", "100%", "750px"),
+        new link("indepth-reports", "InDepth Reports", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=10", "100%", "4000px"),
+        new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=107", "100%", "750px"),
+        new link("bodyguide", "Body Guide", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=25 ", "100%", "1050px"),
+        new link("health-navigator", "Health Navigator", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=65 ", "100%", "1000px"),
+        new link("wellness-tools", "The Wellness Tools", "https://ssl.adam.com/content.aspx?site=aia5se3.adam.com&login=AIA41842&productId=20 ", "100%", "1500px"),
+        new link("aod", "A.D.A.M OnDemand", "http://uat.adamondemand.com/Home/AIACatalog?categoriesID=2", "100%", "1500px")
+    ];
+
+    $scope.$on('$viewContentLoaded', function (event) {
+       
+
+        if ($rootScope.refreshcheck == null) {
+            $location.path('/');
+        }
+        // code that will be executed ... 
+        // every time this view is loaded
+
+        var $uaAOD = navigator.userAgent;
+             for (var i = 0; i < $scope.links.length; i++) {
+            if ($scope.links[i].modname == $routeParams.modname) {
+                $rootScope.currentActiveModuleTitle = $scope.links[i].title;
+                if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand")
+                {
+                   // document.getElementById('externalLink').style.height = "1024px";
+                    if ($uaAOD.match(/(iPod|iPhone|iPad|android)/i)) {
+                        document.getElementById('externalLink').style.height = 2048 + "px";
+                    }
+                    else {
+                        document.getElementById('externalLink').style.height = $(window).outerHeight() - 128 + "px";
+                    }
+
+
+
+                }
+                $scope.objdata = $scope.links[i].objurl;
+                $scope.myObj = $scope.links[i].objstyle;  
+            }       
+        }
+    });
+
+    $scope.showTabButton = false;
+    $scope.IsVisible = function () {
+    $scope.scroll();
+
+   }
+
+    $scope.scroll = function () {
+        // $window.scrollTo(0, 0);
+        $("html,body").scrollTop(0);
+        //alert("scroll");
+    }
+}]
+
+
+);
+
+
@@ -1395,6 +1395,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
  
     $rootScope.refreshTermListOnAASystemSelection = function (bodySystemId) {
         $rootScope.bodySystemSeletedId = bodySystemId;
+        $("#AABodySystems").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+        $("#AABodySystems").find("option[id=" + bodySystemId + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
         $('#termList').empty();
         var bodySystemName = $("#AABodySystems #" + bodySystemId).val();
         if (bodySystemName == "All") {
@@ -1943,6 +1943,37 @@
         }
     </script>
     <script>
+        if (navigator.userAgent.match(/Android/i)) {
+            
+                    $("#bodySystems").click(function () {
+            
+                       $("#listManager").draggable('disable');
+            
+                   }).blur(function () {
+            
+                        $("#listManager").draggable('enable');
+            
+                    });
+            
+        
+            
+                   $("#termList").click(function () {
+            
+                        $("#listManager").draggable('disable');
+            
+                   }).blur(function () {
+            
+                       $("#listManager").draggable('enable');
+            
+                   });
+            
+                   $("#borderWidthCanvasElement").click(function () {
+            
+                      $("#modeleditstyle").draggable('disable');
+                   }).blur(function () {
+                            $("#modeleditstyle").draggable('enable');
+                      });
+                }
         function ResizeImage(sizePercent) {
             var autoWidth = 427;
             var autoHeight = 547;