github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- Fix (jgraduate->jpicker): Actually fix issue with color val check when no other proper results (equal to "all");

Browse Source 
prior fix had not covered original intention
- Docs: Clean-up and fixes in CHANGES
This commit is contained in:
Brett Zamir
2018-10-22 23:13:04 +08:00
parent 052a2c4571
commit 2cecbac24a
10 changed files with 271 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
editor/jgraduate/jQuery.jPicker.js
View File

@@ -591,39 +591,42 @@ const jPicker = function ($) {
case 'all': return {r, g, b, a, h, s, v, hex: val.call($this, 'hex'), ahex: val.call($this, 'ahex')};
default:
let ret = {};
for (let i = 0; i < name.length; i++) {
const nameLength = name.length;
for (let i = 0; i < nameLength; i++) {
switch (name.charAt(i)) {
case 'r':
if (name.length === 1) ret = r;
if (nameLength === 1) ret = r;
else ret.r = r;
break;
case 'g':
if (name.length === 1) ret = g;
if (nameLength === 1) ret = g;
else ret.g = g;
break;
case 'b':
if (name.length === 1) ret = b;
if (nameLength === 1) ret = b;
else ret.b = b;
break;
case 'a':
if (name.length === 1) ret = a;
if (nameLength === 1) ret = a;
else ret.a = a;
break;
case 'h':
if (name.length === 1) ret = h;
if (nameLength === 1) ret = h;
else ret.h = h;
break;
case 's':
if (name.length === 1) ret = s;
if (nameLength === 1) ret = s;
else ret.s = s;
break;
case 'v':
if (name.length === 1) ret = v;
if (nameLength === 1) ret = v;
else ret.v = v;
break;
}
}
return !name.length ? val.call($this, 'all') : ret;
return typeof ret === 'object' && !Object.keys(ret).length
? val.call($this, 'all')
: ret;
}
}
if (context != null && context === $this) return;