flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-12-21 02:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed the last bug in filtering in a more general manner...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2015-07-29 18:49:31 +03:00
parent 66f665be9b
commit 428c59e0ac
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui (gen4)/experiments/browse-dialog.js
View File

@ -662,6 +662,7 @@ var BrowserPrototype = {
// disabled elements. If <ignore_disabled> is false then disabled // disabled elements. If <ignore_disabled> is false then disabled
// elements will be searched too. // elements will be searched too.
// //
// NOTE: this will filter every item loaded regardless of visibility.
// //
// //
// Extended string patterns: // Extended string patterns:
@ -680,7 +681,6 @@ var BrowserPrototype = {
// NOTE: currently there is no way to search for whitespace explicitly, // NOTE: currently there is no way to search for whitespace explicitly,
// at this point this is "by-design" as an experiment on how // at this point this is "by-design" as an experiment on how
// vital this feature is. // vital this feature is.
// NOTE: this will ignore items that are not visible.
// //
// TODO need to support glob / nested patterns... // TODO need to support glob / nested patterns...
// ..things like /**/a*/*moo/ should list all matching items in // ..things like /**/a*/*moo/ should list all matching items in
@ -694,7 +694,7 @@ var BrowserPrototype = {
var that = this var that = this
var browser = this.dom var browser = this.dom
var elems = browser.find('.list>div:visible' + (ignore_disabled ? ':not(.disabled)' : '')) var elems = browser.find('.list>div' + (ignore_disabled ? ':not(.disabled)' : ''))
if(pattern == '*'){ if(pattern == '*'){
return elems return elems
@ -775,11 +775,9 @@ var BrowserPrototype = {
var browser = this.dom var browser = this.dom
// show all... // show all...
browser.find('.filtered-out')
.removeClass('filtered-out')
// clear match highlighting...
if(pattern == null || pattern.trim() == '*'){ if(pattern == null || pattern.trim() == '*'){
browser.find('.filtered-out')
.removeClass('filtered-out')
// clear the highlighting... // clear the highlighting...
browser.find('.list b') browser.find('.list b')
.replaceWith(function() { return this.innerHTML }) .replaceWith(function() { return this.innerHTML })
@ -796,15 +794,12 @@ var BrowserPrototype = {
}, },
// NOTE: setting this to true will not remove disabled // NOTE: setting this to true will not remove disabled
// elements from view as they will neither get // elements from view as they will neither get
// included in the filter not in the filtered out // included in the filter nor in the filtered out
// thus it will require manual setting of the // thus it will require manual setting of the
// .filtered-out class // .filtered-out class
false) false)
// NOTE: as .filter(..) ignores non visible elements including // passed...
// filtered out stuff, we remove the class unconditionally .removeClass('filtered-out')
// above and do not need to do it here...
//// passed...
//.removeClass('filtered-out')
// NOTE: this will mess up (clear) any highlighting that was // NOTE: this will mess up (clear) any highlighting that was
// present before... // present before...
.each(function(_, e){ .each(function(_, e){