Remove auto detection of languages with highlightjs

Fixes #7476 closes #7591

Remove auto detection of languages with highlightjs
Fixes #7476 closes #7591
98cccda6 · Steffen van Bergerem · Benjamin Neff · 2bb7d4e0 · 98cccda6 · 98cccda6
Unverified Commit 98cccda6 authored Aug 27, 2017 by Steffen van Bergerem Committed by Benjamin Neff Aug 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

Changelog.md Changelog.md +1 -0

app/assets/javascripts/app/helpers/text_formatter.js app/assets/javascripts/app/helpers/text_formatter.js +0 -4

No files found.
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@
 * Remove tiff support from photos [#7576](https://github.com/diaspora/diaspora/pull/7576)
 * Remove reference from reshares when original post is deleted [#7578](https://github.com/diaspora/diaspora/pull/7578)
 * Merge migrations from before 0.6.0.0 to CreateSchema [#7580](https://github.com/diaspora/diaspora/pull/7580)
+* Remove auto detection of languages with highlightjs [#7591](https://github.com/diaspora/diaspora/pull/7591)

 ## Bug fixes
 * Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)

--- a/app/assets/javascripts/app/helpers/text_formatter.js
+++ b/app/assets/javascripts/app/helpers/text_formatter.js
@@ -71,10 +71,6 @@
          } catch (__) {}
        }

-        try {
-          return hljs.highlightAuto(str).value;
-        } catch (__) {}
-
        return "";
      }
    });