Nicer initial page load, add support to the plugin loader for a callb…

…ack as URLs and scripts are loading
hawtio · Oct 14, 2013 · ad906ce · ad906ce
1 parent a1ee23b
commit ad906ce
Show file tree

Hide file tree

Showing 4 changed files with 334 additions and 303 deletions.
diff --git a/hawtio-web/src/main/d.ts/hawtio-plugin-loader.ts b/hawtio-web/src/main/d.ts/hawtio-plugin-loader.ts
@@ -11,6 +11,8 @@ module Hawtio {
 
     getModules():String[];
 
+    setLoaderCallback(callback:any);
+
     loadPlugins(callback: () => void);
     debug();
 

diff --git a/hawtio-web/src/main/webapp/app/core/js/corePlugin.ts b/hawtio-web/src/main/webapp/app/core/js/corePlugin.ts
@@ -364,6 +364,10 @@ angular.module('hawtioCore', ['bootstrap', 'ngResource', 'ui', 'ui.bootstrap.dia
             CodeEditor.GlobalCodeMirrorOptions = angular.extend(CodeEditor.GlobalCodeMirrorOptions, opts);
           }
 
+          setTimeout(() => {
+            $("#main-body").fadeIn(2000);
+          }, 500);
+
         }).
         directive('compile', ['$compile', function ($compile) {
           return function(scope, element, attrs) {
@@ -406,8 +410,8 @@ $(function () {
 });
 
 var adjustHeight = function () {
-  var windowHeight = $(window).height()
-  var headerHeight = $("#main-nav").height()
+  var windowHeight = $(window).height();
+  var headerHeight = $("#main-nav").height();
   var containerHeight = windowHeight - headerHeight;
   $("#main").css("min-height", "" + containerHeight + "px");
 }
@@ -420,10 +424,6 @@ $(function () {
     $(document.documentElement).attr('ng-app', 'hawtioCore');
     adjustHeight();
     $(window).resize(adjustHeight);
-
-    // var tmp:any = window;
-    // tmp.less.watch();
-
   });
 });
 

diff --git a/hawtio-web/src/main/webapp/app/core/js/hawtio-plugin-loader.js b/hawtio-web/src/main/webapp/app/core/js/hawtio-plugin-loader.js
@@ -74,11 +74,23 @@
     return [];
   };
 
+
+  hawtioPluginLoader.loaderCallback = null;
+
+  hawtioPluginLoader.setLoaderCallback = function(cb) {
+    hawtioPluginLoader.loaderCallback = cb;
+    console.log("Setting callback to : ", hawtioPluginLoader.loaderCallback);
+  };
+
+
   hawtioPluginLoader.loadPlugins = function(callback) {
 
+    var lcb = hawtioPluginLoader.loaderCallback;
+
     var plugins = {};
 
     var urlsToLoad = hawtioPluginLoader.urls.length;
+    var totalUrls = urlsToLoad;
 
     var loadScripts = function() {
 
@@ -88,9 +100,14 @@
         loaded = loaded + data.Scripts.length;
       });
 
+      var totalScripts = loaded;
+
       var scriptLoaded = function() {
         $.ajaxSetup({async:true});
         loaded = loaded - 1;
+        if (lcb) {
+          lcb.scriptLoaderCallback(lcb, totalScripts, loaded + 1);
+        }
         if (loaded == 0) {
           callback();
         }
@@ -129,6 +146,9 @@
 
       var urlLoaded = function () {
         urlsToLoad = urlsToLoad - 1;
+        if (lcb) {
+          lcb.urlLoaderCallback(lcb, totalUrls, urlsToLoad + 1);
+        }
         if (urlsToLoad == 0) {
           loadScripts();
         }