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

Skip to content

Commit 68b232a

Browse files
nicolas-grekasnicolas-grekas
committed
[VarDumper] Sfdump instead of Sfjs.dump JS namespace
1 parent a7d52fd commit 68b232a

File tree

4 files changed

+23
-24
lines changed

4 files changed

+23
-24
lines changed

‎src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,20 @@ public function getDumpArgs()
8686
{
8787
return array(
8888
array(array(), array(), '', false),
89-
array(array(), array(), "<pre id=sf-dump><span class=sf-dump-0>[]\n</span></pre><script>Sfjs.dump.instrument()</script>\n"),
89+
array(array(), array(), "<pre id=sf-dump><span class=sf-dump-0>[]\n</span></pre><script>Sfdump.instrument()</script>\n"),
9090
array(
9191
array(),
9292
array(123, 456),
93-
"<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-num>123</span>\n</span></pre><script>Sfjs.dump.instrument()</script>\n"
94-
."<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-num>456</span>\n</span></pre><script>Sfjs.dump.instrument()</script>\n",
93+
"<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-num>123</span>\n</span></pre><script>Sfdump.instrument()</script>\n"
94+
."<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-num>456</span>\n</span></pre><script>Sfdump.instrument()</script>\n",
9595
),
9696
array(
9797
array('foo' => 'bar'),
9898
array(),
9999
"<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-note>array:1</span> [<span name=sf-dump-child>\n"
100100
." <span class=sf-dump-1>\"<span class=sf-dump-meta>foo</span>\" => \"<span class=sf-dump-str>bar</span>\"\n"
101101
."</span></span>]\n"
102-
."</span></pre><script>Sfjs.dump.instrument()</script>\n",
102+
."</span></pre><script>Sfdump.instrument()</script>\n",
103103
),
104104
);
105105
}

‎src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
{{ dump.name }}
8585
{% endif %}
8686
line {{ dump.line }}:
87-
<a onclick="Sfjs.dump.toggle(this)">▶</a>
87+
<a onclick="Sfdump.toggle(this)">▶</a>
8888
<span class="sf-dump-compact">
8989
{% if dump.fileExcerpt %}{{ dump.fileExcerpt|raw }}{% else %}{{ dump.file|file_excerpt(dump.line) }}{% endif %}
9090
</span>

‎src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testDump()
3838

3939
$xDump = array(
4040
array(
41-
'data' => "<pre class=sf-dump><span class=sf-dump-num>123</span>\n</pre><script>Sfjs.dump.instrument()</script>\n",
41+
'data' => "<pre class=sf-dump><span class=sf-dump-num>123</span>\n</pre><script>Sfdump.instrument()</script>\n",
4242
'name' => 'DumpDataCollectorTest.php',
4343
'file' => __FILE__,
4444
'line' => $line,

‎src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class HtmlDumper extends CliDumper
2525

2626
protected $dumpHeader;
2727
protected $dumpPrefix = '<pre class=sf-dump>';
28-
protected $dumpSuffix = '</pre><script>Sfjs.dump.instrument()</script>';
28+
protected $dumpSuffix = '</pre><script>Sfdump.instrument()</script>';
2929
protected $dumpId = 'sf-dump';
3030
protected $colors = true;
3131
protected $headerIsDumped = false;
@@ -106,17 +106,16 @@ protected function getDumpHeader()
106106

107107
$line = <<<'EOHTML'
108108
<script>
109-
Sfjs = window.Sfjs || {};
110-
Sfjs.dump = Sfjs.dump || {};
111-
Sfjs.dump.childElts = Sfjs.dump.childElts || document.getElementsByName('sf-dump-child');
112-
Sfjs.dump.childLen = Sfjs.dump.childLen || 0;
113-
Sfjs.dump.refElts = Sfjs.dump.refElts || document.getElementsByName('sf-dump-ref');
114-
Sfjs.dump.refLen = Sfjs.dump.refLen || 0;
115-
if (!Sfjs.dump.refStyle) {
116-
Sfjs.dump.refStyle = document.createElement('style');
117-
document.documentElement.firstChild.appendChild(Sfjs.dump.refStyle);
109+
Sfdump = window.Sfdump || {};
110+
Sfdump.childElts = Sfdump.childElts || document.getElementsByName('sf-dump-child');
111+
Sfdump.childLen = Sfdump.childLen || 0;
112+
Sfdump.refElts = Sfdump.refElts || document.getElementsByName('sf-dump-ref');
113+
Sfdump.refLen = Sfdump.refLen || 0;
114+
if (!Sfdump.refStyle) {
115+
Sfdump.refStyle = document.createElement('style');
116+
document.documentElement.firstChild.appendChild(Sfdump.refStyle);
118117
}
119-
Sfjs.dump.instrument = Sfjs.dump.instrument || function () {
118+
Sfdump.instrument = Sfdump.instrument || function () {
120119
var elt, i, ref;
121120
122121
i = this.childLen;
@@ -126,13 +125,13 @@ protected function getDumpHeader()
126125
elt = this.childElts[i];
127126
if ("" == elt.className) {
128127
elt.className = "sf-dump-child";
129-
elt.innerHTML = '<a class=sf-dump-ref onclick="Sfjs.dump.toggle(this)"><span>▼</span></a><span class="sf-dump-expanded">'+elt.innerHTML+'</span>';
128+
elt.innerHTML = '<a class=sf-dump-ref onclick="Sfdump.toggle(this)"><span>▼</span></a><span class="sf-dump-expanded">'+elt.innerHTML+'</span>';
130129
if ('sf-dump-expanded' == elt.parentNode.className) {
131130
if (elt.children[1].firstChild.nextSibling.id) {
132131
elt.firstChild.appendChild(elt.children[1].firstChild);
133132
elt.firstChild.appendChild(elt.children[1].firstChild);
134133
}
135-
Sfjs.dump.toggle(elt.firstChild);
134+
Sfdump.toggle(elt.firstChild);
136135
}
137136
}
138137
++i;
@@ -157,11 +156,11 @@ function instrumentRef(elt) {
157156
try {
158157
t.replaceChild(r, elt);
159158
f.replaceChild(elt, c);
160-
Sfjs.dump.refStyle.innerHTML = '';
159+
Sfdump.refStyle.innerHTML = '';
161160
r = r.firstChild;
162161
c = r.nextSibling;
163162
if ('sf-dump-compact' == c.className) {
164-
Sfjs.dump.toggle(r);
163+
Sfdump.toggle(r);
165164
}
166165
167166
return false;
@@ -174,10 +173,10 @@ function instrumentRef(elt) {
174173
}
175174
elt.className += ' '+ref;
176175
elt.onmouseover = function() {
177-
Sfjs.dump.refStyle.innerHTML = 'pre.sf-dump .'+ref+'{background-color: yellow; border-radius: 2px}';
176+
Sfdump.refStyle.innerHTML = 'pre.sf-dump .'+ref+'{background-color: yellow; border-radius: 2px}';
178177
};
179178
elt.onmouseout = function() {
180-
Sfjs.dump.refStyle.innerHTML = '';
179+
Sfdump.refStyle.innerHTML = '';
181180
};
182181
}
183182
@@ -189,7 +188,7 @@ function instrumentRef(elt) {
189188
++i;
190189
}
191190
};
192-
Sfjs.dump.toggle = Sfjs.dump.toggle || function(a) {
191+
Sfdump.toggle = Sfdump.toggle || function(a) {
193192
var s = a.nextElementSibling;
194193
195194
if ('sf-dump-compact' == s.className) {

0 commit comments

Comments
 (0)