Merge branch 'master' into eqeqeq

Author: matthiask

debug_toolbar/static/debug_toolbar/js/toolbar.js

@@ -22,7 +22,7 @@
             }
         },
         visible: function(element) {
-            style = getComputedStyle(element);
+            var style = getComputedStyle(element);
             return style.display !== 'none';
         },
         executeScripts: function(root) {
@@ -56,10 +56,6 @@
 
     var djdt = {
         handleDragged: false,
-        events: {
-            ready: []
-        },
-        isReady: false,
         init: function() {
             var djDebug = document.querySelector('#djDebug');
             $$.show(djDebug);
@@ -138,9 +134,6 @@
                 var self = this;
                 var id = this.dataset.toggleId;
                 var open_me = this.textContent === this.dataset.toggleOpen;
-                if (id === '' || !id) {
-                    return;
-                }
                 var name = this.dataset.toggleName;
                 var container = this.closest('.djDebugPanelContent').querySelector('#' + name + '_' + id);
                 container.querySelectorAll('.djDebugCollapsed').forEach(function(e) {
@@ -217,10 +210,6 @@
             } else {
                 djdt.show_toolbar();
             }
-            djdt.isReady = true;
-            djdt.events.ready.forEach(function(callback) {
-                callback(djdt);
-            });
         },
         hide_panels: function() {
             var djDebug = document.getElementBy('djDebug');
@@ -276,13 +265,6 @@
                 expires: 10
             });
         },
-        ready: function(callback){
-            if (djdt.isReady) {
-                callback(djdt);
-            } else {
-                djdt.events.ready.push(callback);
-            }
-        },
         cookie: {
             get: function(key){
                 if (document.cookie.indexOf(key) === -1) return null;

debug_toolbar/static/debug_toolbar/js/toolbar.timer.js

@@ -1,18 +1,12 @@
 (function () {
-    // Browser timing remains hidden unless we can successfully access the performance object
-    var perf = window.performance || window.msPerformance ||
-               window.webkitPerformance || window.mozPerformance;
-    if (!perf)
-        return;
-
-    var timingOffset = perf.timing.navigationStart,
-        timingEnd = perf.timing.loadEventEnd,
+    var timingOffset = performance.timing.navigationStart,
+        timingEnd = performance.timing.loadEventEnd,
         totalTime = timingEnd - timingOffset;
     function getLeft(stat) {
-        return ((perf.timing[stat] - timingOffset) / (totalTime)) * 100.0;
+        return ((performance.timing[stat] - timingOffset) / (totalTime)) * 100.0;
     }
     function getCSSWidth(stat, endStat) {
-        var width = ((perf.timing[endStat] - perf.timing[stat]) / (totalTime)) * 100.0;
+        var width = ((performance.timing[endStat] - performance.timing[stat]) / (totalTime)) * 100.0;
         // Calculate relative percent (same as sql panel logic)
         width = 100.0 * width / (100.0 - getLeft(stat));
         return (width < 1) ? "2px" : width + "%";
@@ -23,13 +17,13 @@
             // Render a start through end bar
             row.innerHTML = '<td>' + stat.replace('Start', '') + '</td>' +
                             '<td class="djdt-timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
-                            '<td>' + (perf.timing[stat] - timingOffset) + ' (+' + (perf.timing[endStat] - perf.timing[stat]) + ')</td>';
+                            '<td>' + (performance.timing[stat] - timingOffset) + ' (+' + (performance.timing[endStat] - performance.timing[stat]) + ')</td>';
             row.querySelector('strong').style.width = getCSSWidth(stat, endStat);
         } else {
             // Render a point in time
             row.innerHTML = '<td>' + stat + '</td>' +
                             '<td class="djdt-timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
-                            '<td>' + (perf.timing[stat] - timingOffset) + '</td>';
+                            '<td>' + (performance.timing[stat] - timingOffset) + '</td>';
             row.querySelector('strong').style.width = '2px';
         }
         row.querySelector('.djDebugLineChart').style.left = getLeft(stat) + '%';