Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[TwigBundle][WebProfilerBundle] Fix JS collision #26119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2018
Merged

[TwigBundle][WebProfilerBundle] Fix JS collision #26119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[TwigBundle][WebProfilerBundle] Fix JS collision
  • Loading branch information
@ro0NL
ro0NL committed Feb 9, 2018
commit da39e01eb9ce3bcc083006c1baf8eadc4cf146a7
22 changes: 13 additions & 9 deletions src/Symfony/Bundle/TwigBundle/Resources/views/base_js.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
addEventListener: addEventListener,

createTabs: function() {
var tabGroups = document.querySelectorAll('.sf-tabs');
var tabGroups = document.querySelectorAll('.sf-tabs:not([data-processed=true])');

/* create the tab navigation for each group of tabs */
for (var i = 0; i < tabGroups.length; i++) {
Expand Down Expand Up @@ -99,11 +99,13 @@
document.getElementById(activeTabId).className = 'block';
});
}

tabGroups[i].setAttribute('data-processed', 'true');
}
},

createToggles: function() {
var toggles = document.querySelectorAll('.sf-toggle');
var toggles = document.querySelectorAll('.sf-toggle:not([data-processed=true])');

for (var i = 0; i < toggles.length; i++) {
var elementSelector = toggles[i].getAttribute('data-toggle-selector');
Expand Down Expand Up @@ -156,14 +158,16 @@
var altContent = toggle.getAttribute('data-toggle-alt-content');
toggle.innerHTML = currentContent !== altContent ? altContent : originalContent;
});
}

/* Prevents from disallowing clicks on links inside toggles */
var toggleLinks = document.querySelectorAll('.sf-toggle a');
for (var i = 0; i < toggleLinks.length; i++) {
addEventListener(toggleLinks[i], 'click', function(e) {
e.stopPropagation();
});
/* Prevents from disallowing clicks on links inside toggles */
var toggleLinks = toggles[i].querySelectorAll('a');
for (var j = 0; j < toggleLinks.length; j++) {
addEventListener(toggleLinks[j], 'click', function(e) {
e.stopPropagation();
});
}

toggles[i].setAttribute('data-processed', 'true');
}
}
};
Expand Down
22 changes: 13 additions & 9 deletions src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
},

createTabs: function() {
var tabGroups = document.querySelectorAll('.sf-tabs');
var tabGroups = document.querySelectorAll('.sf-tabs:not([data-processed=true])');

/* create the tab navigation for each group of tabs */
for (var i = 0; i < tabGroups.length; i++) {
Expand Down Expand Up @@ -455,11 +455,13 @@
document.getElementById(activeTabId).className = 'block';
});
}

tabGroups[i].setAttribute('data-processed', 'true');
}
},

createToggles: function() {
var toggles = document.querySelectorAll('.sf-toggle');
var toggles = document.querySelectorAll('.sf-toggle:not([data-processed=true])');

for (var i = 0; i < toggles.length; i++) {
var elementSelector = toggles[i].getAttribute('data-toggle-selector');
Expand Down Expand Up @@ -512,14 +514,16 @@
var altContent = toggle.getAttribute('data-toggle-alt-content');
toggle.innerHTML = currentContent !== altContent ? altContent : originalContent;
});
}

/* Prevents from disallowing clicks on links inside toggles */
var toggleLinks = document.querySelectorAll('.sf-toggle a');
for (var i = 0; i < toggleLinks.length; i++) {
addEventListener(toggleLinks[i], 'click', function(e) {
e.stopPropagation();
});
/* Prevents from disallowing clicks on links inside toggles */
var toggleLinks = toggles[i].querySelectorAll('a');
for (var j = 0; j < toggleLinks.length; j++) {
addEventListener(toggleLinks[j], 'click', function(e) {
e.stopPropagation();
});
}

toggles[i].setAttribute('data-processed', 'true');
}
}
};
Expand Down