nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove auto detection of languages with highlightjs

Browse source 
Fixes #7476

closes #7591
This commit is contained in:
Steffen van Bergerem 2017-08-27 20:59:02 +02:00 committed by Benjamin Neff
parent 2bb7d4e067
commit 98cccda6ea
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -7,6 +7,7 @@
* Remove tiff support from photos [#7576](https://github.com/diaspora/diaspora/pull/7576) * 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) * 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) * 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 ## Bug fixes
* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579) * Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)

4
app/assets/javascripts/app/helpers/text_formatter.js
View file

@ -71,10 +71,6 @@
} catch (__) {} } catch (__) {}
} }
try {
return hljs.highlightAuto(str).value;
} catch (__) {}
return ""; return "";
} }
}); });