replaced js files from Develop-IPAD-MAC and replaced assests path in index.html

Nikita Kulshreshtha
1 parent d88fb2b4
Showing 3 changed files with 4 additions and 58 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
400-SOURCECODE/Admin/dist/index.html
@@ -501,11 +501,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.openView = function ($event) {
-<<<<<<< HEAD
-
-=======
->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
         $rootScope.MenuModuleName = "CI";
         $rootScope.disableAnnotationTB = false;
         $rootScope.CIAnotationIdentifyModeOff = true;
@@ -527,10 +523,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         }
-<<<<<<< HEAD
-
-=======
->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
         localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
         localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
@@ -546,10 +538,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.openBodyView = function () {
-<<<<<<< HEAD
-
-=======
->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
         if ($rootScope.refreshcheck == null) {
             $location.path('/');
         }
@@ -558,38 +546,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $('#spinner').css('visibility', 'visible');
         $scope.voId = $rootScope.getLocalStorageValue("currentBodyViewId");
-<<<<<<< HEAD
-        // alert($scope.voId);
-
-
-        //once you get id in scope push detail in jspanel content
-
-        var openViews;
-        if ($rootScope.openViews.length > 0) {
-            openViews = new jinqJs()
-               .from($rootScope.openViews)
-               .where("BodyViewId==" + $scope.voId)
-               .select();
-        }
-        var counter = 1;
-        var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson");
-
-        if (openViews != null && openViews.length > 0) {
-            angular.forEach(openViews, function (value, key) {
-
-                if (value.body - views == tittle) {
-                    tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++;
-                    $rootScope.currentActiveViewTitle = tittle;
-                    localStorage.setItem("currentViewTitle", tittle);
-                }
-
-            });
-        }
-        else {
-            localStorage.setItem("currentViewTitle", tittle);
-
-        }
-=======
         //once you get id in scope push detail in jspanel content
@@ -632,7 +588,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         //    localStorage.setItem("currentViewTitle", tittle);
         //}
->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
         //alert($rootScope.getLocalStorageValue("currentViewTitle"));
@@ -804,8 +759,4 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
 }]
-);
-
-
-
-
+);
 \ No newline at end of file
@@ -4,12 +4,9 @@
         <div id="siteloader" class="col-sm-12">
             <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>-->
             <object id="externalLink" ng-style="myObj" type="text/html" data={{objdata}}></object>
-<<<<<<< HEAD
-=======
            <iframe style="width:100%;display:none" id="externalLinkiframe" ng-style="myObj" src=""></iframe>
->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
         </div>
     </div>
 </div>
@@ -35,6 +32,4 @@
         }, false);
     });
-</script>
-
-
+</script>
 \ No newline at end of file
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"><title>A.D.A.M. Interactive Anatomy</title><link href="../assets/styles/bootstrap.css" rel="stylesheet"><link href="../assets/styles/main.css" rel="stylesheet"><link href="../assets/styles/admin-custom.css" rel="stylesheet"><link href="../assets/styles/angular-custom.css" rel="stylesheet"><link href="../assets/styles/bootstrap-datetimepicker.min.css" rel="stylesheet"><link rel="stylesheet" href="https://unpkg.com/ngx-bootstrap/datepicker/bs-datepicker.css"/><link href="assets/styles/fixed_table_rc.css" type="text/css" rel="stylesheet" media="all"/><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,800,700,600,400italic"><!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --><!-- WARNING: Respond.js doesn't work if you view the page via file:// --><!--[if lt IE 9]>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"><title>A.D.A.M. Interactive Anatomy</title><link href="assets/styles/bootstrap.css" rel="stylesheet"><link href="assets/styles/main.css" rel="stylesheet"><link href="assets/styles/admin-custom.css" rel="stylesheet"><link href="assets/styles/angular-custom.css" rel="stylesheet"><link href="assets/styles/bootstrap-datetimepicker.min.css" rel="stylesheet"><link rel="stylesheet" href="https://unpkg.com/ngx-bootstrap/datepicker/bs-datepicker.css"/><link href="assets/styles/fixed_table_rc.css" type="text/css" rel="stylesheet" media="all"/><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,800,700,600,400italic"><!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --><!-- WARNING: Respond.js doesn't work if you view the page via file:// --><!--[if lt IE 9]>
         <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
         <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-      <![endif]--><link href="styles.d41d8cd98f00b204e980.bundle.css" rel="stylesheet"/></head><body><div class="container-fluid"><app-component></app-component></div><script src="../assets/scripts/jquery-1.11.3.min.js"></script><script src="../assets/scripts/bootstrap.js"></script><script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script><script src="https://meetselva.github.io/fixed-table-rows-cols/js/sortable_table.js" type="text/javascript"></script><script src="../assets/scripts/fixed_table_rc.js" type="text/javascript"></script><!--Nav--><script>$(function () {
+      <![endif]--><link href="styles.d41d8cd98f00b204e980.bundle.css" rel="stylesheet"/></head><body><div class="container-fluid"><app-component></app-component></div><script src="assets/scripts/jquery-1.11.3.min.js"></script><script src="assets/scripts/bootstrap.js"></script><script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script><script src="https://meetselva.github.io/fixed-table-rows-cols/js/sortable_table.js" type="text/javascript"></script><script src="assets/scripts/fixed_table_rc.js" type="text/javascript"></script><!--Nav--><script>$(function () {
       $("#slider-range-min-2").slider({
         range: "min",
         min: 1,