Merge branch '2.8'

nicolas-grekas · nicolas-grekas · commit 75b6c310dac3 · 2015-09-22T16:11:08.000+02:00
* 2.8: Added the right revision date for status code registry [Config] Fix enum default value in Yaml dumper fixed typo. [Translation][File dumper] allow get file content without writing in file. Finnish translation fix [CssSelector] Optimize regexs matching simple selectors Fix the phpdoc in the CssSelector TranslatorInterface [Console] Add clock mock to fix transient test on HHVM [DomCrawler] Optimize the regex used to find namespace prefixes [VarDumper] Add EnumStub for dumping virtual collections with casters [Finder] Deprecate adapters and related classes [EventDispatcher] skip one lazy loading call [EventDispatcher] fix memory leak in a getListeners [WebProfilerBundle] added btn-link. Remove duplication of the handling of regex filters in the Finder Default to stderr for console helpers (only merge if symfony#15794 gets merged) Conflicts: src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php src/Symfony/Component/EventDispatcher/EventDispatcher.php src/Symfony/Component/VarDumper/Tests/CliDumperTest.php src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
diff --git a/Resources/views/Collector/logger.html.twig b/Resources/views/Collector/logger.html.twig
@@ -162,7 +162,7 @@
         {% endif %}
 
         {% if stack %}
-            <a class="text-small sf-toggle" data-toggle-selector="#{{ id }}" data-toggle-alt-content="Hide stack trace">Show strack trace</a>
+            <button class="btn-link text-small sf-toggle" data-toggle-selector="#{{ id }}" data-toggle-alt-content="Hide stack trace">Show strack trace</button>
         {% endif %}
 
         {% for index, call in stack if index > 1 %}
diff --git a/Resources/views/Collector/translation.html.twig b/Resources/views/Collector/translation.html.twig
@@ -179,7 +179,7 @@
                     {% endif %}
 
                     {% if message.parameters|length > 0 %}
-                        <a class="newline text-small sf-toggle" data-toggle-selector="#parameters-{{ loop.index }}" data-toggle-alt-content="Hide parameters">Show parameters</a>
+                        <button class="btn-link newline text-small sf-toggle" data-toggle-selector="#parameters-{{ loop.index }}" data-toggle-alt-content="Hide parameters">Show parameters</button>
 
                         <div id="parameters-{{ loop.index }}" class="hidden">
                             {% for parameters in message.parameters %}
diff --git a/Resources/views/Profiler/base_js.html.twig b/Resources/views/Profiler/base_js.html.twig
@@ -387,6 +387,8 @@
                     }
 
                     Sfjs.addEventListener(toggles[i], 'click', function(e) {
+                        e.preventDefault();
+
                         var toggle = e.target || e.srcElement;
                         var element = document.querySelector(toggle.getAttribute('data-toggle-selector'));
 
@@ -406,8 +408,6 @@
                         var originalContent = toggle.getAttribute('data-toggle-original-content');
                         var altContent = toggle.getAttribute('data-toggle-alt-content');
                         toggle.innerHTML = currentContent !== altContent ? altContent : originalContent;
-
-                        e.preventDefault();
                     });
                 }
             }
diff --git a/Resources/views/Profiler/profiler.css.twig b/Resources/views/Profiler/profiler.css.twig
@@ -115,7 +115,18 @@ button {
     height: 16px;
     vertical-align: middle;
 }
-
+.btn-link {
+    border-color: transparent;
+    color: #218BC3;
+    text-decoration: none;
+    background-color: transparent;
+    outline: none;
+    border: 0;
+    padding: 0;
+}
+.btn-link:hover {
+    text-decoration: underline;
+}
 {# Tables
    ------------------------------------------------------------------------- #}
 table, tr, th, td {

Original file line number	Diff line number	Diff line change
`@@ -387,6 +387,8 @@`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`Sfjs.addEventListener(toggles[i], 'click', function(e) {`
	`390`	`+ e.preventDefault();`
	`391`	`+`
`390`	`392`	`var toggle = e.target \|\| e.srcElement;`
`391`	`393`	`var element = document.querySelector(toggle.getAttribute('data-toggle-selector'));`
`392`	`394`
`@@ -406,8 +408,6 @@`
`406`	`408`	`var originalContent = toggle.getAttribute('data-toggle-original-content');`
`407`	`409`	`var altContent = toggle.getAttribute('data-toggle-alt-content');`
`408`	`410`	`toggle.innerHTML = currentContent !== altContent ? altContent : originalContent;`
`409`		`-`
`410`		`- e.preventDefault();`
`411`	`411`	`});`
`412`	`412`	`}`
`413`	`413`	`}`