Merge branch 'grafana-loading-page'

2018-08-31 07:38:42 -07:00 · 2018-08-31 07:38:42 -07:00 · eef41cbccd
parent d668a922e6 2996c54b72
commit eef41cbccd
2 changed files with 152 additions and 5 deletions
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@ -105,6 +105,8 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
      // see https://github.com/zenorocha/clipboard.js/issues/155
      $.fn.modal.Constructor.prototype.enforceFocus = function() {};

+      $('.preloader').remove();
+
      sidemenuOpen = scope.contextSrv.sidemenu;
      body.toggleClass('sidemenu-open', sidemenuOpen);

--- a/public/views/index.template.html
+++ b/public/views/index.template.html