summaryrefslogtreecommitdiffstats
path: root/application/controllers/file.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2016-07-13 23:05:01 +0200
committerFlorian Pritz <bluewind@xinu.at>2016-07-13 23:47:27 +0200
commita3c396a1d059e139492ff25d2aee798626e35b2e (patch)
tree687ba7a6ebea4ffad7b72e3abb2496ca9c22fdd8 /application/controllers/file.php
parent315e520d1ddee8da6390d6bd6f6cb5f5e7df389d (diff)
Fix double linebreaks when copying code in firefox
Apparently firefox doesn't like html code in <pre> and adds incorrect linebreaks when copying the code. This does not happen with chromium. Fix it by switching to <code> instead of <pre>. Also change the CSS to refer to the element by class instead of by type so future changes are simpler. Not sure why, but in chroium changing the container element type breaks the ordering of the lines. Adding display: table to the .code-container fixes this. References: http://stackoverflow.com/questions/24851173/why-does-text-copied-from-a-set-of-pre-tags-have-double-line-breaks#comment41552816_26408656 Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers/file.php')
-rw-r--r--application/controllers/file.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index e1f37e0e8..e1196940c 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -256,7 +256,7 @@ class File extends MY_Controller {
$lines_to_remove = 0;
$output .= '<div class="code content table">'."\n";
- $output .= '<div class="highlight"><pre>'."\n";
+ $output .= '<div class="highlight"><code class="code-container">'."\n";
if ($lexer == "ascii") {
// TODO: use exec safe and catch exception
@@ -293,7 +293,7 @@ class File extends MY_Controller {
$anchor = "n-$anchor_id-$line_number";
}
- // Be careful not to add superflous whitespace here (we are in a <pre>)
+ // Be careful not to add superflous whitespace here (we are in a <code>)
$output .= "<div class=\"table-row\">"
."<a href=\"#$anchor\" class=\"linenumber table-cell\">"
."<span class=\"anchor\" id=\"$anchor\"> </span>"
@@ -302,7 +302,7 @@ class File extends MY_Controller {
$output .= "</div>";
}
- $output .= "</pre></div>";
+ $output .= "</code></div>";
$output .= "</div>";
return array(