@@ -53,8 +53,6 @@ angular.module('platformWebApp')
53
53
element . removeAttr ( "va-blade" ) ;
54
54
$compile ( element ) ( scope ) ;
55
55
56
- var speed = ( window . navigator . platform == 'MacIntel' ? .5 : 40 ) ;
57
-
58
56
var mainContent = $ ( '.cnt' ) ;
59
57
var blade = $ ( element ) . parent ( '.blade' ) ;
60
58
var offset = parseInt ( blade . offset ( ) . left + mainContent . scrollLeft ( ) + blade . width ( ) + 125 - mainContent [ 0 ] . clientWidth ) ;
@@ -70,69 +68,11 @@ angular.module('platformWebApp')
70
68
}
71
69
72
70
$timeout ( function ( ) {
73
-
74
71
if ( offset > mainContent . scrollLeft ( ) ) {
75
72
mainContent . animate ( { scrollLeft : offset + 'px' } , 500 ) ;
76
73
}
77
-
78
-
79
74
} , 0 , false ) ;
80
75
81
-
82
- //Somehow vertical scrollbar does not work initially so need to turn it on
83
- // $(element).find('.blade-content').off('mousewheel').on('mousewheel', function (event, delta)
84
- // {
85
- // this.scrollTop -= (delta * speed);
86
- // event.preventDefault();
87
- // });
88
-
89
- $ ( element ) . find ( '.blade-container' ) . on ( 'mouseenter' , function ( e ) {
90
- var blade = $ ( this ) ,
91
- bladeI = blade . find ( '.blade-inner' ) ,
92
- bladeH = bladeI . height ( ) ,
93
- bladeIh = blade . find ( '.inner-block' ) . height ( ) + 5 ;
94
-
95
- if ( blade . length ) {
96
- if ( bladeH <= bladeIh ) {
97
- horizontalScroll ( 'off' ) ;
98
- }
99
- else {
100
- horizontalScroll ( 'on' ) ;
101
- }
102
- }
103
- } ) . on ( 'mouseleave' , function ( ) {
104
- horizontalScroll ( 'on' ) ;
105
- } ) ;
106
-
107
- $ ( '.dashboard-area' ) . on ( 'mouseenter' , function ( event ) {
108
- var dashboardA = $ ( this ) ,
109
- dashboardH = dashboardA . height ( ) ,
110
- dashboardIh = dashboardA . find ( '.dashboard-inner' ) . height ( ) ;
111
-
112
- if ( dashboardA . length ) {
113
- if ( dashboardH <= dashboardIh ) {
114
- horizontalScroll ( 'off' ) ;
115
- }
116
- else {
117
- horizontalScroll ( 'on' ) ;
118
- }
119
- }
120
- } ) . on ( 'mouseleave' , function ( ) {
121
- horizontalScroll ( 'on' ) ;
122
- } ) ;
123
-
124
- function horizontalScroll ( flag ) {
125
- if ( flag != 'off' ) {
126
- $ ( '.cnt' ) . off ( 'mousewheel' ) . on ( 'mousewheel' , function ( event , delta ) {
127
- this . scrollLeft -= ( delta * speed ) ;
128
- event . preventDefault ( ) ;
129
- } ) ;
130
- }
131
- else {
132
- $ ( '.cnt' ) . unmousewheel ( ) ;
133
- }
134
- }
135
-
136
76
scope . bladeMaximize = function ( ) {
137
77
scope . maximized = true ;
138
78
@@ -262,7 +202,7 @@ angular.module('platformWebApp')
262
202
//Show blade as last one by default
263
203
blade . xindex = service . stateBlades ( ) . length ;
264
204
}
265
-
205
+
266
206
var showBlade = function ( ) {
267
207
if ( angular . isDefined ( parentBlade ) ) {
268
208
blade . xindex = service . stateBlades ( ) . indexOf ( parentBlade ) + 1 ;
0 commit comments