Skip to content

Commit aceebd5

Browse files
YapsBridgingYapsBridging
committed
update style & js
1 parent fd14d6a commit aceebd5

File tree

6 files changed

+60
-61
lines changed

6 files changed

+60
-61
lines changed

‎admin/css/debug-toolbar/toolbar.scss‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -475,8 +475,7 @@
475475
#ci-history.debug-bar-dblock,
476476
#ci-vars.debug-bar-dblock,
477477
#ci-config.debug-bar-dblock,
478-
#ci-timeline.debug-bar-dblock
479-
{
478+
#ci-timeline.debug-bar-dblock {
480479
display: block;
481480
}
482481

@@ -523,46 +522,46 @@
523522
overflow: hidden;
524523
}
525524

526-
.debug-bar-dtableRow{
525+
.debug-bar-dtableRow {
527526
display: table-row;
528-
}
527+
}
529528

530-
.debug-bar-dinlineBlock{
529+
.debug-bar-dinlineBlock {
531530
display: inline-block;
532531
}
533532

534-
.debug-bar-pointer{
533+
.debug-bar-pointer {
535534
cursor: pointer;
536535
}
537536

538-
.debug-bar-mleft4{
537+
.debug-bar-mleft4 {
539538
margin-left: 4px;
540539
}
541540

542-
.level-0{
541+
.debug-bar-level-0 {
543542
--level: 0;
544543
}
545544

546-
.level-1{
545+
.debug-bar-level-1 {
547546
--level: 1;
548547
}
549548

550-
.level-2{
549+
.debug-bar-level-2 {
551550
--level: 2;
552551
}
553552

554-
.level-3{
553+
.debug-bar-level-3 {
555554
--level: 3;
556555
}
557556

558-
.level-4{
557+
.debug-bar-level-4 {
559558
--level: 4;
560559
}
561560

562-
.level-5{
561+
.debug-bar-level-5 {
563562
--level: 5;
564563
}
565564

566-
.level-6{
565+
.debug-bar-level-6 {
567566
--level: 6;
568567
}

‎app/Views/welcome_message.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
<!-- SCRIPTS -->
333333

334334
<script {csp-script-nonce}>
335-
document.getElementById("menuToggle").addEventListener('click',toggleMenu);
335+
document.getElementById("menuToggle").addEventListener('click', toggleMenu);
336336
function toggleMenu() {
337337
var menuItems = document.getElementsByClassName('menu-item');
338338
for (var i = 0; i < menuItems.length; i++) {

‎system/Debug/Toolbar.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ protected function renderTimelineRecursive(array $rows, float $startTime, int $s
202202
$output .= '<tr>';
203203
}
204204

205-
$output .= '<td class="' . ($isChild ? 'debug-bar-width30' : '') . ' level-' . $level . '" >' . ($hasChildren || $isQuery ? '<nav></nav>' : '') . $row['name'] . '</td>';
205+
$output .= '<td class="' . ($isChild ? 'debug-bar-width30' : '') . ' debug-bar-level-' . $level . '" >' . ($hasChildren || $isQuery ? '<nav></nav>' : '') . $row['name'] . '</td>';
206206
$output .= '<td class="' . ($isChild ? 'debug-bar-width10' : '') . '">' . $row['component'] . '</td>';
207207
$output .= '<td class="' . ($isChild ? 'debug-bar-width10 ' : '') . 'debug-bar-alignRight">' . number_format($row['duration'] * 1000, 2) . ' ms</td>';
208208
$output .= "<td class='debug-bar-noverflow' colspan='{$segmentCount}'>";
@@ -228,7 +228,7 @@ protected function renderTimelineRecursive(array $rows, float $startTime, int $s
228228
if ($isQuery) {
229229
// Output query string if query
230230
$output .= '<tr>';
231-
$output .= '<td class="query-container level-' . ($level + 1) . '" >' . $row['query'] . '</td>';
231+
$output .= '<td class="query-container debug-bar-level-' . ($level + 1) . '" >' . $row['query'] . '</td>';
232232
$output .= '</tr>';
233233
} else {
234234
// Recursively render children

‎system/Debug/Toolbar/Views/toolbar.css‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -832,30 +832,30 @@
832832
margin-left: 4px;
833833
}
834834

835-
.level-0 {
835+
.debug-bar-level-0 {
836836
--level: 0;
837837
}
838838

839-
.level-1 {
839+
.debug-bar-level-1 {
840840
--level: 1;
841841
}
842842

843-
.level-2 {
843+
.debug-bar-level-2 {
844844
--level: 2;
845845
}
846846

847-
.level-3 {
847+
.debug-bar-level-3 {
848848
--level: 3;
849849
}
850850

851-
.level-4 {
851+
.debug-bar-level-4 {
852852
--level: 4;
853853
}
854854

855-
.level-5 {
855+
.debug-bar-level-5 {
856856
--level: 5;
857857
}
858858

859-
.level-6 {
859+
.debug-bar-level-6 {
860860
--level: 6;
861861
}

‎system/Debug/Toolbar/Views/toolbar.js‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var ciDebugBar = {
4949
var tab = ciDebugBar.readCookie("debug-bar-tab");
5050
if (document.getElementById(tab)) {
5151
var el = document.getElementById(tab);
52-
ciDebugBar.switchClass(el,"debug-bar-ndisplay","debug-bar-dblock");
52+
ciDebugBar.switchClass(el, "debug-bar-ndisplay", "debug-bar-dblock");
5353
ciDebugBar.addClass(el, "active");
5454
tab = document.querySelector("[data-tab=" + tab + "]");
5555
if (tab) {
@@ -71,21 +71,21 @@ var ciDebugBar = {
7171
var links = this.toolbar.querySelectorAll("[data-toggle]");
7272
for (var i = 0; i < links.length; i++) {
7373
let toggleData = links[i].getAttribute("data-toggle");
74-
if(toggleData=="datatable"){
74+
if (toggleData === "datatable") {
7575

7676
let datatable = links[i].getAttribute("data-table");
77-
links[i].addEventListener("click", function(){
77+
links[i].addEventListener("click", function() {
7878
ciDebugBar.toggleDataTable(datatable)
7979
}, true);
8080

81-
}else if(toggleData=="childrows"){
81+
} else if (toggleData === "childrows") {
8282

8383
let child = links[i].getAttribute("data-child");
84-
links[i].addEventListener("click", function(){
84+
links[i].addEventListener("click", function() {
8585
ciDebugBar.toggleChildRows(child)
8686
}, true);
8787

88-
}else{
88+
} else {
8989
links[i].addEventListener("click", ciDebugBar.toggleRows, true);
9090
}
9191
}
@@ -110,7 +110,7 @@ var ciDebugBar = {
110110
var tabs = document.querySelectorAll("#debug-bar .tab");
111111

112112
for (var i = 0; i < tabs.length; i++) {
113-
ciDebugBar.switchClass(tabs[i],"debug-bar-dblock","debug-bar-ndisplay");
113+
ciDebugBar.switchClass(tabs[i], "debug-bar-dblock", "debug-bar-ndisplay");
114114
}
115115

116116
// Mark all labels as inactive
@@ -122,7 +122,7 @@ var ciDebugBar = {
122122

123123
// Show/hide the selected tab
124124
if (! state) {
125-
ciDebugBar.switchClass(tab,"debug-bar-ndisplay","debug-bar-dblock");
125+
ciDebugBar.switchClass(tab, "debug-bar-ndisplay", "debug-bar-dblock");
126126
ciDebugBar.addClass(this.parentNode, "active");
127127
// Create debug-bar-tab cookie to persistent state
128128
ciDebugBar.createCookie(
@@ -155,9 +155,9 @@ var ciDebugBar = {
155155
}
156156
},
157157

158-
switchClass : function(el,classFrom,classTo){
159-
ciDebugBar.removeClass(el,classFrom);
160-
ciDebugBar.addClass(el,classTo);
158+
switchClass : function(el, classFrom, classTo) {
159+
ciDebugBar.removeClass(el, classFrom);
160+
ciDebugBar.addClass(el, classTo);
161161
},
162162

163163
/**
@@ -173,10 +173,10 @@ var ciDebugBar = {
173173
row.getAttribute("data-toggle")
174174
);
175175

176-
if(target.classList.contains("debug-bar-ndisplay")) {
177-
ciDebugBar.switchClass(target,"debug-bar-ndisplay","debug-bar-dtableRow");
178-
}else{
179-
ciDebugBar.switchClass(target,"debug-bar-dtableRow","debug-bar-ndisplay");
176+
if (target.classList.contains("debug-bar-ndisplay")) {
177+
ciDebugBar.switchClass(target, "debug-bar-ndisplay", "debug-bar-dtableRow");
178+
} else {
179+
ciDebugBar.switchClass(target, "debug-bar-dtableRow", "debug-bar-ndisplay");
180180
}
181181
}
182182
},
@@ -192,10 +192,10 @@ var ciDebugBar = {
192192
}
193193

194194
if (obj) {
195-
if(obj.classList.contains("debug-bar-ndisplay")){
196-
ciDebugBar.switchClass(obj,"debug-bar-ndisplay","debug-bar-dblock");
197-
}else{
198-
ciDebugBar.switchClass(obj,"debug-bar-dblock","debug-bar-ndisplay");
195+
if (obj.classList.contains("debug-bar-ndisplay")) {
196+
ciDebugBar.switchClass(obj, "debug-bar-ndisplay", "debug-bar-dblock");
197+
} else {
198+
ciDebugBar.switchClass(obj, "debug-bar-dblock", "debug-bar-ndisplay");
199199
}
200200
}
201201
},
@@ -213,10 +213,10 @@ var ciDebugBar = {
213213

214214
if (par && obj) {
215215

216-
if(obj.classList.contains("debug-bar-ndisplay")){
217-
ciDebugBar.removeClass(obj,"debug-bar-ndisplay");
218-
}else{
219-
ciDebugBar.addClass(obj,"debug-bar-ndisplay");
216+
if (obj.classList.contains("debug-bar-ndisplay")) {
217+
ciDebugBar.removeClass(obj, "debug-bar-ndisplay");
218+
} else {
219+
ciDebugBar.addClass(obj, "debug-bar-ndisplay");
220220
}
221221

222222
par.classList.toggle("timeline-parent-open");
@@ -231,12 +231,12 @@ var ciDebugBar = {
231231
toggleToolbar: function () {
232232
var open = ! ciDebugBar.toolbar.classList.contains("debug-bar-ndisplay");
233233

234-
if(open){
235-
ciDebugBar.switchClass(ciDebugBar.icon,"debug-bar-ndisplay","debug-bar-dinlineBlock");
236-
ciDebugBar.switchClass(ciDebugBar.toolbar,"debug-bar-dinlineBlock","debug-bar-ndisplay");
237-
}else{
238-
ciDebugBar.switchClass(ciDebugBar.icon,"debug-bar-dinlineBlock","debug-bar-ndisplay");
239-
ciDebugBar.switchClass(ciDebugBar.toolbar,"debug-bar-ndisplay","debug-bar-dinlineBlock");
234+
if (open) {
235+
ciDebugBar.switchClass(ciDebugBar.icon, "debug-bar-ndisplay", "debug-bar-dinlineBlock");
236+
ciDebugBar.switchClass(ciDebugBar.toolbar, "debug-bar-dinlineBlock", "debug-bar-ndisplay");
237+
} else {
238+
ciDebugBar.switchClass(ciDebugBar.icon, "debug-bar-dinlineBlock", "debug-bar-ndisplay");
239+
ciDebugBar.switchClass(ciDebugBar.toolbar, "debug-bar-ndisplay", "debug-bar-dinlineBlock");
240240
}
241241

242242
// Remember it for other page loads on this site
@@ -255,12 +255,12 @@ var ciDebugBar = {
255255
setToolbarState: function () {
256256
var open = ciDebugBar.readCookie("debug-bar-state");
257257

258-
if(open !="open"){
259-
ciDebugBar.switchClass(ciDebugBar.icon,"debug-bar-ndisplay","debug-bar-dinlineBlock");
260-
ciDebugBar.switchClass(ciDebugBar.toolbar,"debug-bar-dinlineBlock","debug-bar-ndisplay");
261-
}else{
262-
ciDebugBar.switchClass(ciDebugBar.icon,"debug-bar-dinlineBlock","debug-bar-ndisplay");
263-
ciDebugBar.switchClass(ciDebugBar.toolbar,"debug-bar-ndisplay","debug-bar-dinlineBlock");
258+
if (open != "open") {
259+
ciDebugBar.switchClass(ciDebugBar.icon, "debug-bar-ndisplay", "debug-bar-dinlineBlock");
260+
ciDebugBar.switchClass(ciDebugBar.toolbar, "debug-bar-dinlineBlock", "debug-bar-ndisplay");
261+
} else {
262+
ciDebugBar.switchClass(ciDebugBar.icon, "debug-bar-dinlineBlock", "debug-bar-ndisplay");
263+
ciDebugBar.switchClass(ciDebugBar.toolbar, "debug-bar-ndisplay", "debug-bar-dinlineBlock");
264264
}
265265
},
266266

‎system/Debug/Toolbar/Views/toolbarloader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ function newXHR() {
7676
if (h2) {
7777
h2.innerHTML = 'History <small>You have new debug data.</small> <button id="ci-history-update">Update</button>';
7878
document.querySelector('a[data-tab="ci-history"] > span > .badge').className += ' active';
79-
document.getElementById('ci-history-update').addEventListener('click',function(){
79+
document.getElementById('ci-history-update').addEventListener('click', function () {
8080
loadDoc(debugbarTime);
81-
},false)
81+
}, false)
8282
}
8383
}
8484
}

0 commit comments

Comments
 (0)