fix bug 759546 - IOS bug menu fix

mozilla · Jun 18, 2012 · 4f30207 · 4f30207
1 parent dd8e266
commit 4f30207
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/media/js/lib/stick.js b/media/js/lib/stick.js
@@ -11,7 +11,7 @@ var perf = window.performance || window.msPerformance ||
            window.webkitPerformance || window.mozPerformance;
 
 var send = function(data) {
-    if (perf) {
+    if (z.capabilities.performance) {
         var timings = $('body').attr('data-collect-timings');
         if (timings) {
             timings = timings.split(':', 2);
@@ -25,14 +25,16 @@ var send = function(data) {
 
 exports.basic = function() {
     /* Sends the timing data to the given URL */
-    send({
-        'window.performance.timing.navigationStart': perf.timing.navigationStart,
-        'window.performance.timing.domComplete': perf.timing.domComplete,
-        'window.performance.timing.domInteractive': perf.timing.domInteractive,
-        'window.performance.timing.domLoading': perf.timing.domLoading,
-        'window.performance.navigation.redirectCount': perf.navigation.redirectCount,
-        'window.performance.navigation.type': perf.navigation.type,
-    });
+    if (z.capabilities.performance) {
+        send({
+            'window.performance.timing.navigationStart': perf.timing.navigationStart,
+            'window.performance.timing.domComplete': perf.timing.domComplete,
+            'window.performance.timing.domInteractive': perf.timing.domInteractive,
+            'window.performance.timing.domLoading': perf.timing.domLoading,
+            'window.performance.navigation.redirectCount': perf.navigation.redirectCount,
+            'window.performance.navigation.type': perf.navigation.type,
+        });
+    }
 };
 
 exports.custom = function(data) {

diff --git a/media/js/mkt/capabilities.js b/media/js/mkt/capabilities.js
@@ -18,7 +18,8 @@ z.capabilities = {
     'touch': ('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch,
     'nativeScroll': (function() {
         return 'WebkitOverflowScrolling' in document.createElement('div').style;
-    })()
+    })(),
+    'performance': !!(window.performance || window.msPerformance || window.webkitPerformance || window.mozPerformance)
 };
 
 if (z.capabilities.tablet) {