Commit 4ffad4e9bd0e416ba9bf0c1c6aab627f89311084

Authored by Nikita Kulshreshtha
1 parent 45541527

thcik scrollbar issue fix.

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... ... @@ -76,7 +76,10 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
76 76  
77 77  
78 78 $compile($el)($scope);
79   -
  79 + $(".sidebar").mCustomScrollbar({
  80 + autoHideScrollbar: true,
  81 + //theme:"rounded"
  82 + });
80 83  
81 84 });
82 85  
... ... @@ -102,6 +105,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
102 105 //load json data for body view
103 106 $scope.loadDissectibleAnatomyData = function () {
104 107  
  108 + $rootScope.ClearIframe();
105 109 //load bodyView data
106 110 $http({ method: 'GET', url: '~/../content/data/json/da_dat_contentlist.json' }).success(function (data) {
107 111  
... ... @@ -148,7 +152,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
148 152  
149 153 var openViews;
150 154 var currentBodyViewId = localStorage.getItem("currentBodyViewId");
151   - debugger;
  155 + // debugger;
152 156 if ($rootScope.openViews.length>0) {
153 157 openViews = new jinqJs()
154 158 .from($rootScope.openViews)
... ... @@ -203,8 +207,9 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
203 207 // $rootScope.openViewsDA.push({ "ViewId": 1 });
204 208 $rootScope.currentSlug = 'da-body-view';
205 209  
  210 + //hide scrollbar
  211 +
206 212  
207   -
208 213 $rootScope.openViews.push(
209 214 {
210 215 "module": $rootScope.currentActiveModuleTitle, "BodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
... ... @@ -249,7 +254,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Module
249 254 .error(function (data, status, headers, config) {
250 255 console.log(data);
251 256 });
252   - debugger;
  257 + // debugger;
253 258  
254 259 $scope.voId = localStorage.getItem("currentBodyViewId");;
255 260 $scope.layerNo = 0;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... ... @@ -19,7 +19,16 @@ AIA.controller("HomeController", ["$rootScope","Modules", "$log", "$location", "
19 19  
20 20 $rootScope.ClearIframe = function () {
21 21 if ($('#daImagePanel')!=null)
22   - $('#daImagePanel').remove();
  22 + $('#daImagePanel').remove();
  23 +
  24 + $rootScope.hideScrollbar();
  25 + }
  26 +
  27 + $rootScope.hideScrollbar = function () {
  28 + $(".sidebar").mCustomScrollbar({
  29 + autoHideScrollbar: true,
  30 + //theme:"rounded"
  31 + });
23 32 }
24 33 }]
25 34 );
26 35 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
... ... @@ -32,7 +32,7 @@
32 32  
33 33 </head>
34 34 <body class="no-scroll" ng-controller="HomeController">
35   - <div class="container-fluid ">
  35 + <div class="container-fluid " >
36 36 <!--Header-->
37 37  
38 38 <nav class="navbar navbar-inverse navbar-fixed-top">
... ... @@ -47,7 +47,7 @@
47 47 <div ng-include="'app/widget/TopMenu.html'"></div>
48 48 </div>
49 49 </nav>
50   - <div class="bodyWrap row container-fluid">
  50 + <div class="bodyWrap row container-fluid" >
51 51  
52 52  
53 53 <div ng-view></div>
... ...
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
... ... @@ -79,8 +79,8 @@ var jsPanel = {
79 79 '<div class="jsPanel-btn-max"><span class="jsglyph jsglyph-maximize"></span></div>' +
80 80 '<div class="jsPanel-btn-norm"><span class="jsglyph jsglyph-normalize"></span></div>' +
81 81 '<div class="jsPanel-btn-min"><span class="jsglyph jsglyph-minimize"></span></div>' +
82   - '<div class="jsPanel-btn-small"><span class="jsglyph jsglyph-chevron-up"></span></div>' +
83   - '<div class="jsPanel-btn-smallrev"><span class="jsglyph jsglyph-chevron-down"></span></div>' +
  82 + //'<div class="jsPanel-btn-small"><span class="jsglyph jsglyph-chevron-up"></span></div>' +
  83 + //'<div class="jsPanel-btn-smallrev"><span class="jsglyph jsglyph-chevron-down"></span></div>' +
84 84 '</div>' +
85 85 '<div class="jsPanel-hdr-toolbar jsPanel-clearfix"></div>' +
86 86 '</div>' +
... ... @@ -1030,7 +1030,8 @@ var jsPanel = {
1030 1030 },
1031 1031  
1032 1032 // repositions a panel and optionally moves it to another container
1033   - reposition: function(panel, position, selector) {
  1033 + reposition: function (panel, position, selector) {
  1034 + alert('reposition')
1034 1035 if (selector && typeof selector === "string") {
1035 1036 panel.option.selector = selector;
1036 1037 panel.appendTo(selector);
... ... @@ -1603,6 +1604,7 @@ console.log(&quot;jsPanel version: &quot; + jsPanel.version);
1603 1604  
1604 1605 // handler to move panel to foreground on click
1605 1606 jsP.on('click', function (e) {
  1607 + alert('1')
1606 1608 // use of e.preventDefault(); would prevent events from inside a panel from firing properly
1607 1609 if (!$(e.target).is("a[href], button, .jsPanel-nofront, .jsPanel-nofront *")) {
1608 1610 if (!jsP.hasClass("jsPanel-modal")) {
... ... @@ -1632,7 +1634,7 @@ console.log(&quot;jsPanel version: &quot; + jsPanel.version);
1632 1634  
1633 1635 // jsPanel minimize
1634 1636 $('.jsPanel-btn-min', jsP).on('click', function (e) {
1635   - alert('minimized')
  1637 + // alert('minimized')
1636 1638  
1637 1639 e.preventDefault();
1638 1640 jsPanel.minimize(jsP);
... ... @@ -2089,14 +2091,18 @@ console.log(&quot;jsPanel version: &quot; + jsPanel.version);
2089 2091 });
2090 2092  
2091 2093 $(jsP).on("dragstart", function () {
  2094 + // alert("dragstart")
  2095 + // debugger;
2092 2096 // remove window.scroll handler, is added again on dragstop
2093 2097 $(window).off('scroll', jsP.jsPanelfixPos);
2094 2098 if (jsP.option.paneltype.mode === 'extended') {
2095   - jsP.css('z-index', '10000');
  2099 + jsP.css('z-index', '1');
2096 2100 }
2097 2101 });
2098 2102  
2099 2103 $(jsP).on("dragstop", function () {
  2104 + // alert("dragstop")
  2105 + // debugger;
2100 2106 jsP.option.position = {
2101 2107 top: jsP.css('top'),
2102 2108 left: jsP.css('left')
... ...