Merge pull request #14671 from alivedise/bugzilla/949209/publish

Bug 949209 - Publish custom detail with window, r=timdream
mozilla-b2g · Dec 16, 2013 · ecb7688 · ecb7688
2 parents 6c964e4 + c777c21
commit ecb7688
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/apps/system/js/app_transition_controller.js b/apps/system/js/app_transition_controller.js
@@ -201,9 +201,11 @@
         return;
 
       if (this.app.loaded) {
+        // Perf test needs.
         this.app.publish('loadtime', {
           time: parseInt(Date.now() - this.app.launchTime),
-          type: 'w'
+          type: 'w',
+          src: this.app.config.url
         });
       }
 

diff --git a/apps/system/js/app_window.js b/apps/system/js/app_window.js
@@ -552,9 +552,11 @@
   AppWindow.prototype._handle_mozbrowserloadend =
     function aw__handle_mozbrowserloadend(evt) {
       if (!this.loaded) {
+        // Perf test needs.
         this.publish('loadtime', {
           time: parseInt(Date.now() - this.launchTime),
-          type: 'c'
+          type: 'c',
+          src: this.config.url
         });
       }
       this.loading = false;

diff --git a/tests/performance/performance_helper.js b/tests/performance/performance_helper.js
@@ -59,7 +59,6 @@ function PerformanceHelper(opts) {
         '}' +
         'w.onapplicationloaded = function(e) {' +
         '  var data = e.detail;' +
-        '  data.src = e.target.src;' +
         '  w.loadTimes.push(data);' +
         '};' +
         'w.addEventListener("apploadtime", w.onapplicationloaded);';