Add loading message

Add dev revision for manifest

Author: SamyPesse

src/addons/cb.panel.files/addon-built.js

@@ -66,8 +66,11 @@ box, session, addons, box, files, commands, menu, tabs, panels, operations, loca
             });
 
             // Application manifest
-            $(window.applicationCache).bind('checking downloading', function(e) {
-                loading.show();
+            $(window.applicationCache).bind('downloading', function(e) {
+                loading.show("Downloading new application cache");
+            });
+            $(window.applicationCache).bind('checking', function(e) {
+                loading.show("Checking new application cache version");
             });
             $(window.applicationCache).bind('noupdate cached obsolete error', function(e) {
                 loading.stop();
@@ -141,7 +144,7 @@ box, session, addons, box, files, commands, menu, tabs, panels, operations, loca
 
                     // Check update
                     hr.Offline.checkUpdate();
-                }));
+                }), "Loading add-ons");
             }
             return Application.__super__.finish.apply(this, arguments);
         },

src/client/core/app.js

@@ -77,5 +77,19 @@ body {
             top: 50%;
             left: 50%;
         }
+
+        .cb-loading-message {
+            position: absolute;
+            width: 200px;
+            height: 60px;
+            line-height: 60px;
+            font-size: 26px;
+            margin-left: -100px;
+            margin-top: -30px;
+            top: 50%;
+            left: 50%;
+            text-align: center;
+            color: rgb(94, 158, 243);
+        }
     }
 }

src/client/resources/stylesheets/main.less

@@ -18,7 +18,7 @@
 	<!-- Body -->
 	<div class="cb-body"></div>
 	<div class="cb-alerts"></div>
-	<div class="cb-loading-alert"><div class="cb-loadings-spinner"></div></div>
+	<div class="cb-loading-alert"><div class="cb-loadings-spinner"></div><div class="cb-loading-message"></div></div>
 </div>
 <% } else { %>
 <div id="codebox">

src/client/resources/templates/main.html

@@ -1,20 +1,32 @@
 define([
-    'jQuery'
-], function ($) {
+    'jQuery',
+    'underscore'
+], function ($, _) {
     return {
-        show: function(p) {
+        show: function(p, message) {
             $(".cb-loading-alert").show();
 
+            if (_.isString(p)) {
+                message = p;
+                p = null;
+            }
+
+            if (message) {
+                $(".cb-loading-alert .cb-loading-message").html(message);
+            }
+
             if (p) {
                 p.fin(function() {
                     $(".cb-loading-alert").hide();
+                    $(".cb-loading-alert .cb-loading-message").html("");
                 });
             }
 
             return p;
         },
         stop: function() {
             $(".cb-loading-alert").hide();
+            $(".cb-loading-alert .cb-loading-message").html("");
         }
     };
 });

src/client/utils/loading.js

@@ -12,6 +12,7 @@ function setup(options, imports, register) {
     var logger = imports.logger.namespace("offline");
 
     var manifest = new Manifest();
+    var startTime = Date.now();
 
     // Disable auth for the manifest file
     server.disableAuth("/manifest.appcache");
@@ -25,6 +26,8 @@ function setup(options, imports, register) {
                 return addonName+":"+addon.infos.version;
             }).sort().join("-")).toString();
 
+            if (options.dev) revision = revision+"-"+startTime;
+
             // Clear manifest
             return manifest.clear(revision);
         }).then(function() {

src/core/cb.offline/main.js

@@ -170,7 +170,11 @@ var start = function(config) {
         "./cb.export",
 
         // Offline manifest
-        "./cb.offline",
+        {
+            packagePath: "./cb.offline",
+            
+            dev: config.dev
+        },
 
         // Search
         "./cb.search",