IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053

Browse Source
This commit is contained in:
Daniel Lee
2018-04-04 18:32:18 +02:00
parent eea2369987 175937a679
commit eef3120aed
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
-1
View File
@@ -152,7 +152,6 @@
"moment": "^2.18.1", "moment": "^2.18.1",
"mousetrap": "^1.6.0", "mousetrap": "^1.6.0",
"mousetrap-global-bind": "^1.1.0", "mousetrap-global-bind": "^1.1.0",
"perfect-scrollbar": "^1.2.0",
"prop-types": "^15.6.0", "prop-types": "^15.6.0",
"react": "^16.2.0", "react": "^16.2.0",
"react-dom": "^16.2.0", "react-dom": "^16.2.0",
public/app/core/components/scroll/scroll.ts
+10 -2
View File
@@ -27,14 +27,17 @@ export function geminiScrollbar() {
$(scrollBarHTML).appendTo(scrollRoot); $(scrollBarHTML).appendTo(scrollRoot);
elem.addClass(scrollerClass); elem.addClass(scrollerClass);
let scrollbar = baron({ let scrollParams = {
root: scrollRoot[0], root: scrollRoot[0],
scroller: scroller[0], scroller: scroller[0],
bar: '.baron__bar', bar: '.baron__bar',
barOnCls: '_scrollbar', barOnCls: '_scrollbar',
scrollingCls: '_scrolling', scrollingCls: '_scrolling',
track: '.baron__track', track: '.baron__track',
}); direction: 'v',
};
let scrollbar = baron(scrollParams);
let lastPos = 0; let lastPos = 0;
@@ -57,6 +60,11 @@ export function geminiScrollbar() {
scope scope
); );
appEvents.on('toggle-sidemenu', evt => {
// force updating dashboard width
scrollbar.scroll();
});
scope.$on('$routeChangeSuccess', () => { scope.$on('$routeChangeSuccess', () => {
lastPos = 0; lastPos = 0;
elem[0].scrollTop = 0; elem[0].scrollTop = 0;
public/app/plugins/panel/graph/legend.ts
+1 -1
View File
@@ -19,7 +19,7 @@ module.directive('graphLegend', function(popoverSrv, $timeout) {
scope.$on('$destroy', function() { scope.$on('$destroy', function() {
if (legendScrollbar) { if (legendScrollbar) {
legendScrollbar.destroy(); legendScrollbar.dispose();
} }
}); });
public/sass/components/_scrollbar.scss
+1 -6
View File
@@ -196,13 +196,8 @@
} }
// Fix for side menu on mobile devices // Fix for side menu on mobile devices
.sidemenu-open.sidemenu-open--xs {
.main-view.baron {
min-width: 0%;
}
}
.main-view.baron { .main-view.baron {
min-width: 99%; min-width: unset;
} }
.baron__clipper { .baron__clipper {
yarn.lock
+4 -4
View File
@@ -1162,6 +1162,10 @@ balanced-match@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
baron@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/baron/-/baron-3.0.3.tgz#0f0a08a567062882e130a0ecfd41a46d52103f4a"
base64-arraybuffer@0.1.5: base64-arraybuffer@0.1.5:
version "0.1.5" version "0.1.5"
resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
@@ -7503,10 +7507,6 @@ pend@~1.2.0:
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
perfect-scrollbar@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.2.0.tgz#ad23a2529c17f4535f21d1486f8bc3046e31a9d2"
performance-now@^0.2.0: performance-now@^0.2.0:
version "0.2.0" version "0.2.0"
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"