flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 10:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up the alias code...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-11-25 17:13:34 +03:00
parent 9728c97ad2
commit a0767d3c11
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ui (gen4)/imagegrid/tags.js
View File

@ -99,11 +99,11 @@ var TagsPrototype = {
// Format:
// {
// <alias>: <tag>,
// <alias>: <normalized-tag>,
// }
//
// XXX Q: should we use these as a dict for normalized user input???
// ...i.e. 'A B C': 'abc'
// XXX need introspection for this...
// ...should this be .aliases ???
__aliases: {},
@ -145,7 +145,7 @@ var TagsPrototype = {
return this
},
//
// Resolve alias...
// Resolve alias (recursive)...
// .alias(tag)
// -> value
// -> undefined
@ -159,22 +159,28 @@ var TagsPrototype = {
// -> this
//
alias: function(tag, value){
// XXX this seems a bit ugly...
var resolve = function(tag, seen){
seen = seen || []
// check for loops...
if(seen.indexOf(tag) >= 0){
throw new Error(`Recursive alias chain: "${
seen
.concat([seen[0]])
.join('" -> "') }"`) }
var next = this.__aliases[tag]
|| this.__aliases[this.normalize(tag)]
seen.push(tag)
return next != null ?
resolve(next, seen)
: seen.length > 1 ?
tag
: undefined
}.bind(this)
// resolve...
if(arguments.length == 1){
var seen = []
var next
do {
tag = next || tag.trim()
seen.push(tag)
next = this.__aliases[tag]
|| this.__aliases[this.normalize(tag)]
// check for loops...
if(seen.indexOf(next) >= 0){
throw new Error(`Recursive alias chain: "${ seen.join('", "') }"`)
}
} while(!next)
return seen.length > 1 ? tag : undefined
return resolve(tag.trim())
// remove...
} else if(value == null){
@ -187,17 +193,13 @@ var TagsPrototype = {
value = this.normalize(value)
// check for recursion...
var chain = [value]
var cur = value
var t = this.normalize(tag)
do {
cur = this.__aliases[cur]
|| this.__aliases[this.normalize(cur)]
chain.push(cur)
if(cur == t){
throw new Error(`Creating a recursive alias chain: "${ chain.join('", "') }"`)
}
} while(cur)
var chain = []
var target = resolve(value, chain)
if(target == tag || target == this.normalize(tag)){
throw new Error(`Creating a recursive alias chain: "${
chain
.concat([chain[0]])
.join('" -> "') }"`) }
this.__aliases[tag] = value
}