Merge pull request #11708 from alivedise/bugzilla/904470_v1-train/fix…

…-class0-message

Bug 904470 - Use loadend event instead of paint event. r=timdream, a=leo+

apps/system/js/window_manager.js

@@ -327,7 +327,7 @@ var WindowManager = (function() {
 
       // If this is a cold launch let's wait for the app to load first
       var iframe = openFrame.firstChild;
-      if ('unpainted' in iframe.dataset) {
+      if ('unpainted' in iframe.dataset && 'unloaded' in iframe.dataset) {
 
         if ('wrapper' in frame.dataset)
           wrapperFooter.classList.add('visible');
@@ -479,6 +479,8 @@ var WindowManager = (function() {
     var iframe = evt.target;
     var frame = iframe.parentNode;
 
+    delete iframe.dataset.unloaded;
+
     if (iframe.dataset.unpainted) {
       iframe.addEventListener('mozbrowserfirstpaint', function painted() {
         iframe.removeEventListener('mozbrowserfirstpaint', painted);
@@ -1191,6 +1193,8 @@ var WindowManager = (function() {
     // frames are began unpainted.
     iframe.dataset.unpainted = true;
 
+    iframe.dataset.unloaded = true;
+
     if (!manifestURL) {
       frame.setAttribute('data-wrapper', 'true');
       return frame;