diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-05-07 10:50:33 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-13 18:46:04 +0200 |
| commit | ed4309ce41557d39576108731631ac59aa6e3120 (patch) | |
| tree | 808111ff8e0e0f579273d2a266db5a1b24788d78 /core/js | |
| parent | eea6f74ca47e94f6b740dbd33d10e22faf4221a5 (diff) | |
| download | nextcloud-server-ed4309ce41557d39576108731631ac59aa6e3120.tar.gz nextcloud-server-ed4309ce41557d39576108731631ac59aa6e3120.zip | |
Unify colour algorithm output
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/placeholder.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/js/placeholder.js b/core/js/placeholder.js index a0dfe8491d4..81f0b12e61a 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -62,13 +62,16 @@ (function ($) { String.prototype.toRgb = function() { - var hash = this.toLowerCase().replace(/[^0-9a-f]+/g, ''); + // Normalize hash + var hash = this.toLowerCase(); // Already a md5 hash? - if( !hash.match(/^[0-9a-f]{32}$/g) ) { + if( hash.match(/^([0-9a-f]{4}-?){8}$/) === null ) { hash = md5(hash); } + hash = hash.replace(/[^0-9a-f]/g, ''); + function Color(r,g,b) { this.r = r; this.g = g; @@ -116,7 +119,7 @@ var result = Array(); // Splitting evenly the string - for (var i in hash) { + for (var i=0; i<hash.length; i++) { // chars in md5 goes up to f, hex:16 result.push(parseInt(hash.charAt(i), 16) % 16); } |