Fix indentation & JS Cleanup
This commit is contained in:
Patrick McDougle
Patrick McDougle
parent
a5d134b136
commit
da621c9697
@ -20,9 +20,9 @@
|
||||
var toggleClass = function(el, cssClass) { hasClass(el, cssClass) ? removeClass(el, cssClass) : addClass(el, cssClass); };
|
||||
}
|
||||
|
||||
var noop = function() {},
|
||||
var noop = function() {};
|
||||
|
||||
collectionToArray = function (collection) {
|
||||
var collectionToArray = function (collection) {
|
||||
var length = collection.length || 0,
|
||||
results = new Array(length);
|
||||
|
||||
@ -31,11 +31,11 @@
|
||||
}
|
||||
|
||||
return results;
|
||||
},
|
||||
};
|
||||
|
||||
profilerStorageKey = 'sf2/profiler/',
|
||||
var profilerStorageKey = 'sf2/profiler/';
|
||||
|
||||
request = function(url, onSuccess, onError, payload, options) {
|
||||
var request = function(url, onSuccess, onError, payload, options) {
|
||||
var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
|
||||
options = options || {};
|
||||
options.maxTries = options.maxTries || 0;
|
||||
@ -62,27 +62,27 @@
|
||||
}
|
||||
};
|
||||
xhr.send(payload || '');
|
||||
},
|
||||
};
|
||||
|
||||
getPreference = function(name) {
|
||||
var getPreference = function(name) {
|
||||
if (!window.localStorage) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return localStorage.getItem(profilerStorageKey + name);
|
||||
},
|
||||
};
|
||||
|
||||
setPreference = function(name, value) {
|
||||
var setPreference = function(name, value) {
|
||||
if (!window.localStorage) {
|
||||
return null;
|
||||
}
|
||||
|
||||
localStorage.setItem(profilerStorageKey + name, value);
|
||||
},
|
||||
};
|
||||
|
||||
requestStack = [],
|
||||
var requestStack = [];
|
||||
|
||||
extractHeaders = function(xhr, stackElement) {
|
||||
var extractHeaders = function(xhr, stackElement) {
|
||||
/* Here we avoid to call xhr.getResponseHeader in order to */
|
||||
/* prevent polluting the console with CORS security errors */
|
||||
var allHeaders = xhr.getAllResponseHeaders();
|
||||
@ -94,9 +94,9 @@
|
||||
if (ret = allHeaders.match(/^x-debug-token-link:\s+(.*)$/im)) {
|
||||
stackElement.profilerUrl = ret[1];
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
renderAjaxRequests = function() {
|
||||
var renderAjaxRequests = function() {
|
||||
var requestCounter = document.querySelectorAll('.sf-toolbar-ajax-requests');
|
||||
if (!requestCounter.length) {
|
||||
return;
|
||||
@ -199,8 +199,7 @@
|
||||
tbody.appendChild(rows);
|
||||
|
||||
if (infoSpan) {
|
||||
var text = requestStack.length + ' AJAX request' + (requestStack.length > 1 ? 's' : '');
|
||||
infoSpan.textContent = text;
|
||||
infoSpan.textContent = requestStack.length + ' AJAX request' + (requestStack.length > 1 ? 's' : '');
|
||||
}
|
||||
|
||||
ajaxToolbarPanel.style.display = 'block';
|
||||
@ -211,8 +210,7 @@
|
||||
|
||||
requestCounter[0].textContent = requestStack.length;
|
||||
|
||||
var className = 'sf-toolbar-ajax-requests sf-toolbar-value';
|
||||
requestCounter[0].className = className;
|
||||
requestCounter[0].className = 'sf-toolbar-ajax-requests sf-toolbar-value';
|
||||
|
||||
if (state == 'ok') {
|
||||
Sfjs.removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading');
|
||||
@ -266,12 +264,12 @@
|
||||
stackElement.statusCode = r.status;
|
||||
stackElement.profile = r.headers.get('x-debug-token');
|
||||
stackElement.profilerUrl = r.headers.get('x-debug-token-link');
|
||||
Sfjs.renderAjaxRequests();
|
||||
renderAjaxRequests();
|
||||
}, function (e){
|
||||
stackElement.loading = false;
|
||||
stackElement.error = true;
|
||||
});
|
||||
Sfjs.renderAjaxRequests();
|
||||
renderAjaxRequests();
|
||||
}
|
||||
|
||||
return promise;
|
||||
@ -314,11 +312,11 @@
|
||||
stackElement.statusCode = self.status;
|
||||
extractHeaders(self, stackElement);
|
||||
|
||||
Sfjs.renderAjaxRequests();
|
||||
renderAjaxRequests();
|
||||
}
|
||||
}, false);
|
||||
|
||||
Sfjs.renderAjaxRequests();
|
||||
renderAjaxRequests();
|
||||
}
|
||||
|
||||
proxied.apply(this, Array.prototype.slice.call(arguments));
|
||||
@ -395,8 +393,8 @@
|
||||
|
||||
var tabNavigationItem = document.createElement('li');
|
||||
tabNavigationItem.setAttribute('data-tab-id', tabId);
|
||||
if (j == 0) { Sfjs.addClass(tabNavigationItem, 'active'); }
|
||||
if (Sfjs.hasClass(tabs[j], 'disabled')) { Sfjs.addClass(tabNavigationItem, 'disabled'); }
|
||||
if (j == 0) { addClass(tabNavigationItem, 'active'); }
|
||||
if (hasClass(tabs[j], 'disabled')) { addClass(tabNavigationItem, 'disabled'); }
|
||||
tabNavigationItem.innerHTML = tabTitle;
|
||||
tabNavigation.appendChild(tabNavigationItem);
|
||||
|
||||
@ -415,7 +413,7 @@
|
||||
tabId = tabNavigation[j].getAttribute('data-tab-id');
|
||||
document.getElementById(tabId).querySelector('.tab-title').className = 'hidden';
|
||||
|
||||
if (Sfjs.hasClass(tabNavigation[j], 'active')) {
|
||||
if (hasClass(tabNavigation[j], 'active')) {
|
||||
document.getElementById(tabId).className = 'block';
|
||||
} else {
|
||||
document.getElementById(tabId).className = 'hidden';
|
||||
@ -435,10 +433,10 @@
|
||||
for (var k = 0; k < tabNavigation.length; k++) {
|
||||
var tabId = tabNavigation[k].getAttribute('data-tab-id');
|
||||
document.getElementById(tabId).className = 'hidden';
|
||||
Sfjs.removeClass(tabNavigation[k], 'active');
|
||||
removeClass(tabNavigation[k], 'active');
|
||||
}
|
||||
|
||||
Sfjs.addClass(activeTab, 'active');
|
||||
addClass(activeTab, 'active');
|
||||
var activeTabId = activeTab.getAttribute('data-tab-id');
|
||||
document.getElementById(activeTabId).className = 'block';
|
||||
});
|
||||
@ -453,29 +451,29 @@
|
||||
var elementSelector = toggles[i].getAttribute('data-toggle-selector');
|
||||
var element = document.querySelector(elementSelector);
|
||||
|
||||
Sfjs.addClass(element, 'sf-toggle-content');
|
||||
addClass(element, 'sf-toggle-content');
|
||||
|
||||
if (toggles[i].hasAttribute('data-toggle-initial') && toggles[i].getAttribute('data-toggle-initial') == 'display') {
|
||||
Sfjs.addClass(element, 'sf-toggle-visible');
|
||||
addClass(element, 'sf-toggle-visible');
|
||||
} else {
|
||||
Sfjs.addClass(element, 'sf-toggle-hidden');
|
||||
addClass(element, 'sf-toggle-hidden');
|
||||
}
|
||||
|
||||
Sfjs.addEventListener(toggles[i], 'click', function(e) {
|
||||
addEventListener(toggles[i], 'click', function(e) {
|
||||
e.preventDefault();
|
||||
|
||||
var toggle = e.target || e.srcElement;
|
||||
|
||||
/* needed because when the toggle contains HTML contents, user can click */
|
||||
/* on any of those elements instead of their parent '.sf-toggle' element */
|
||||
while (!Sfjs.hasClass(toggle, 'sf-toggle')) {
|
||||
while (!hasClass(toggle, 'sf-toggle')) {
|
||||
toggle = toggle.parentNode;
|
||||
}
|
||||
|
||||
var element = document.querySelector(toggle.getAttribute('data-toggle-selector'));
|
||||
|
||||
Sfjs.toggleClass(element, 'sf-toggle-hidden');
|
||||
Sfjs.toggleClass(element, 'sf-toggle-visible');
|
||||
toggleClass(element, 'sf-toggle-hidden');
|
||||
toggleClass(element, 'sf-toggle-visible');
|
||||
|
||||
/* the toggle doesn't change its contents when clicking on it */
|
||||
if (!toggle.hasAttribute('data-toggle-alt-content')) {
|
||||
|
||||
Reference in New Issue
Block a user