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

started work on unifying .tags(..) and .removeTag(..)

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-12-29 03:57:57 +03:00
parent 642b3d3113
commit f5f62ccf77
1 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,8 @@ var BaseTagsClassPrototype = {
// //
isQuoted: function(tag){ isQuoted: function(tag){
return /^\s*(['"]).*\1\s*$/.test(tag) }, return /^\s*(['"]).*\1\s*$/.test(tag) },
isStarred: function(tag){
return /^\s*(\*).*\1\s*$/.test(tag) },
// //
// .splitSet(tag) // .splitSet(tag)
// .splitSet(tag, ..) // .splitSet(tag, ..)
@ -379,6 +381,7 @@ var BaseTagsPrototype = {
// making it possible to use it as a mix-in (copy methods) // making it possible to use it as a mix-in (copy methods)
// and other approaches... // and other approaches...
isQuoted: BaseTagsClassPrototype.isQuoted, isQuoted: BaseTagsClassPrototype.isQuoted,
isStarred: BaseTagsClassPrototype.isStarred,
splitSet: BaseTagsClassPrototype.splitSet, splitSet: BaseTagsClassPrototype.splitSet,
splitPath: BaseTagsClassPrototype.splitPath, splitPath: BaseTagsClassPrototype.splitPath,
splitTag: BaseTagsClassPrototype.splitTag, splitTag: BaseTagsClassPrototype.splitTag,
@ -976,8 +979,9 @@ var BaseTagsPrototype = {
// Shorthands to: // Shorthands to:
// ts.directMatch(tag).map(func.bind(ts)) // and friends... // ts.directMatch(tag).map(func.bind(ts)) // and friends...
//
// XXX not sure if we need these... // XXX not sure if we need these...
// XXX do we need a .values(..) variant of each???
// mapValues: makeIter('map', 'values'),
map: makeIter('map'), map: makeIter('map'),
filter: makeIter('filter'), filter: makeIter('filter'),
forEach: makeIter('forEach'), forEach: makeIter('forEach'),
@ -1016,6 +1020,10 @@ var BaseTagsPrototype = {
// with "a"... // with "a"...
// .untag('a', 'x') -- like the current '*a*' // .untag('a', 'x') -- like the current '*a*'
// what should the default be???? // what should the default be????
// ...logic would say that making this query compatible with
// .match(..) is the right way to go from the uniformity point
// of view, but, this would also make this potentially more
// destructive by default...
untag: function(tags, value){ untag: function(tags, value){
var that = this var that = this
var index = this.__index = this.__index || {} var index = this.__index = this.__index || {}
@ -1283,6 +1291,57 @@ var BaseTagsPrototype = {
removeTag: function(tag, ...tags){ removeTag: function(tag, ...tags){
return this.rename(tag, '', ...tags) }, return this.rename(tag, '', ...tags) },
//
// .untag(tags)
// .untag(tags, '*')
// -> this
//
// .untag(tags, values)
// -> this
//
// .untag(tags, values, tag, ..)
// -> this
//
// Pattern syntax:
// a - remove a from any matching tag
// "a" - untag only explicit a
// *a* - remove all tags containing a
//
untag2: function(tag, value, ...tags){
var that = this
value = value || '*'
;(tag instanceof Array ? tag : [tag])
.forEach(function(tag){
var quoted = that.isQuoted(tag)
var starred = that.isStarred(tag)
var root = /^\s*['"]?[\\\/]/.test(tag)
var base = /[\\\/]['"]?\s*$/.test(tag)
tag = that.normalize(starred ? tag.trim().slice(1, -1) : tag)
return that
.replace(tag, function(t){
// special case: literal match...
if(quoted){
// XXX need to account for values...
return tag == t ? '' : t
// special case: remove contained...
} else if(starred){
// XXX need to account for values...
return that.directMatch(tag, t) ? '' : t
// replace occurrence...
} else {
}
}, ...tags)
})
return this
},
// Replace values... // Replace values...
// //
// .replaceValue(from, to) // .replaceValue(from, to)