8000 Form Debugger JavaScript improvements by wouterj · Pull Request #9857 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Form Debugger JavaScript improvements #9857

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

Closed
wants to merge 16 commits into from
Closed

Form Debugger JavaScript improvements #9857

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0e03189
Expand tree
wouterj Dec 24, 2013
60b0764
Improved form tree
wouterj Dec 26, 2013
111a404
Made sections collapsable
wouterj Dec 26, 2013
f21dab2
Added error badge
wouterj Dec 29, 2013
52b1620
Fixed CS
wouterj Dec 29, 2013
11bfda6
[WebProfilerBundle] Vertically centered the icons in the form tree
webmozart Dec 29, 2013
07994d5
[WebProfilerBundle] Improved JavaScript of the form debugger
webmozart Dec 30, 2013
ebf13ed
[WebProfilerBundle] Inverted toggler images and improved button coloring
webmozart Dec 30, 2013
505c5be
[WebProfilerBundle] Added "use strict" statements
webmozart Dec 30, 2013
a0030b8
[WebProfilerBundle] Changed toggle color back to blue and made headli…
webmozart Dec 30, 2013
58559d3
[WebProfilerBundle] Moved toggle icon behind the headlines in the for…
webmozart Dec 30, 2013
5afbaeb
[WebProfilerBundle] Enlarged the clickable area of the toggle button …
webmozart Dec 30, 2013
c763d65
Merge pull request #1 from bschussek/issue9857
wouterj Dec 30, 2013
53f164f
Fixed asset function
wouterj Dec 30, 2013
226ac7c
Reverted new image
wouterj Dec 30, 2013
406756d
Reverted Sfjs.toggle change
wouterj Dec 30, 2013
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
Prev Previous commit
Next Next commit
Improved form tree
  • Loading branch information
@wouterj
wouterj committed Dec 29, 2013
commit 60b076495bbd966c8c5ee7c27e296559db6d2578
Binary file added src/Symfony/Bundle/FrameworkBundle/Resources/public/images/blue_picto_full.gif
View file 10000
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 15 additions & 7 deletions src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
.tree a {
text-decoration: none;
}
.tree button {
.tree .toggle-button {
width:10px;
height:10px;
background: none;
Expand Down Expand Up @@ -142,15 +142,20 @@
};

this.toggle = function (element) {
var r;

if (element.style.display !== 'none') {
this.collapse(element);
// this.collapse(element);

return 'collapse';
r = 'collapse';
} else {
// this.expand(element);
}

this.expand(element);
var imgs = element.parentElement.getElementsByTagName('img');
Sfjs.toggle(element, imgs[0], imgs[1]);

return 'expand';
return r || 'expand';
}
}

Expand All @@ -160,7 +165,7 @@
treeView.collapseAll();
treeView.expand(document.querySelector('.tree ul ul'));

var buttons = tree.querySelectorAll('button');
var buttons = tree.querySelectorAll('.toggle-button');
for (var j = 0, l = buttons.length; j < l; j++) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same question here

buttons[j].addEventListener('click', function (e) {
if ('collapse' === treeView.toggle(this.parentElement.parentElement.querySelector('ul'))) {
Expand Down Expand Up @@ -238,7 +243,10 @@
<li>
<div class="tree-inner" data-target-id="{{ data.id }}">
{% if data.children is not empty %}
<button>+</button>
<img class="toggle-button" style="display:inline;" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}">
<img class="toggle-button" style="display:none;" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}">
{% else %}
<img class="toggle-button" src="{{ asset('bundles/framework/images/blue_picto_full.gif') }}">
{% endif %}
{{ name }}
</div>
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -86,7 +86,7 @@
var i,
style,
tmp = elOn.style.display,
el = document.getElementById(selector);
el = selector.nodeName ? selector : document.getElementById(selector);

elOn.style.display = elOff.style.display;
elOff.style.display = tmp;
Expand Down
0