Fix missing inline authorship colors

The hex2rgb function seems to previously have been available globally.
It probably got lost in the great Webpack refactoring and nobody noticed
 that.

 This copies the function into its own file (to make importing it easy)
 and adds an import in index.js.

 Fixes https://github.com/hedgedoc/hedgedoc/issues/2248

Signed-off-by: David Mehren <git@herrmehren.de>
This commit is contained in:
David Mehren 2022-04-08 12:13:37 +02:00
parent 61e092e8af
commit e0021036ae
No known key found for this signature in database
GPG key ID: 185982BA4C42B7C3
4 changed files with 20 additions and 2 deletions

View file

@ -20,7 +20,6 @@ module.exports = {
FilePicker: false, FilePicker: false,
ot: false, ot: false,
MediaUploader: false, MediaUploader: false,
hex2rgb: false,
num_loaded: false, num_loaded: false,
Visibility: false, Visibility: false,
inlineAttachment: false inlineAttachment: false

View file

@ -6,6 +6,7 @@
- Fix error that Libravatar user avatars were not shown when using OAuth2 login - Fix error that Libravatar user avatars were not shown when using OAuth2 login
- Fix `bin/manage_users` not accepting numeric passwords (thanks to [@carr0t2](https://github.com/carr0t2) for reporting) - Fix `bin/manage_users` not accepting numeric passwords (thanks to [@carr0t2](https://github.com/carr0t2) for reporting)
- Fix visibility of modals for screen readers - Fix visibility of modals for screen readers
- Fix missing inline authorship colors (thanks to [@EBendinelli](https://github.com/EBendinelli) for reporting)
### Enhancements ### Enhancements
- Libravatar avatars render as ident-icons when no avatar image was uploaded to Libravatar or Gravatar - Libravatar avatars render as ident-icons when no avatar image was uploaded to Libravatar or Gravatar

View file

@ -1,7 +1,7 @@
/* eslint-env browser, jquery */ /* eslint-env browser, jquery */
/* eslint no-console: ["error", { allow: ["warn", "error", "debug"] }] */ /* eslint no-console: ["error", { allow: ["warn", "error", "debug"] }] */
/* global Cookies, moment, serverurl, /* global Cookies, moment, serverurl,
key, Dropbox, hex2rgb, Visibility */ key, Dropbox, Visibility */
import TurndownService from 'turndown' import TurndownService from 'turndown'
import CodeMirror from 'codemirror/lib/codemirror.js' import CodeMirror from 'codemirror/lib/codemirror.js'
@ -14,6 +14,7 @@ import Idle from 'Idle.Js'
import '../vendor/jquery-textcomplete/jquery.textcomplete' import '../vendor/jquery-textcomplete/jquery.textcomplete'
import { ot } from '../vendor/ot/ot.min.js' import { ot } from '../vendor/ot/ot.min.js'
import hex2rgb from '../vendor/ot/hex2rgb'
import { saveAs } from 'file-saver' import { saveAs } from 'file-saver'
import randomColor from 'randomcolor' import randomColor from 'randomcolor'

17
public/vendor/ot/hex2rgb.js vendored Normal file
View file

@ -0,0 +1,17 @@
function hex2rgb (hex) {
if (hex[0] == '#') hex = hex.substr(1)
if (hex.length == 3) {
var temp = hex
hex = ''
temp = /^([a-f0-9])([a-f0-9])([a-f0-9])$/i.exec(temp).slice(1)
for (var i = 0; i < 3; i++) hex += temp[i] + temp[i]
}
var triplets = /^([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i.exec(hex).slice(1)
return {
red: parseInt(triplets[0], 16),
green: parseInt(triplets[1], 16),
blue: parseInt(triplets[2], 16)
}
}
module.exports = hex2rgb