Compare commits

..

No commits in common. "e1e4324f908b36b78606df3e8f7b47032c5c1a88" and "9425b3ccc13dd4fa5795ca46db1043b5c660dce6" have entirely different histories.

2 changed files with 5 additions and 16 deletions

View File

@ -239,8 +239,7 @@ var FileSystemLoaderActions = actions.Actions({
// NOTE: this will not match "dot filenames", this is done // NOTE: this will not match "dot filenames", this is done
// intentionally to avoid the previews MAC computers // intentionally to avoid the previews MAC computers
// generate all over the place... // generate all over the place...
// XXX make the pattern case-agnostic (see .imageFilePattern) 'image-file-pattern': '*.@(jpg|jpeg|png|svg|JPG|JPEG|PNG|SVG)',
'image-file-pattern': '*.@(jpg|jpeg|png|svg|gif)',
'image-file-read-stat': true, 'image-file-read-stat': true,
'image-file-skip-previews': false, 'image-file-skip-previews': false,
@ -248,16 +247,6 @@ var FileSystemLoaderActions = actions.Actions({
'default-load-method': 'loadIndex', 'default-load-method': 'loadIndex',
}, },
// NOTE: this is not called too often thus there is not need to cache...
get imageFilePattern(){
return this.config['image-file-pattern']
.replace(/([a-z]+)/g,
function(e){
return e +'|'+ e.toUpperCase() }) },
set imageFilePattern(value){
this.config['image-file-pattern'] = value },
// XXX is this a hack??? // XXX is this a hack???
// XXX need a more generic form... // XXX need a more generic form...
checkPath: ['- File/', checkPath: ['- File/',
@ -512,7 +501,7 @@ var FileSystemLoaderActions = actions.Actions({
// get the image list... // get the image list...
return new Promise(function(resolve, reject){ return new Promise(function(resolve, reject){
var files = {} var files = {}
glob.globStream(path +'/'+ that.imageFilePattern, { glob.globStream(path + '/'+ that.config['image-file-pattern'], {
stat: !!read_stat, stat: !!read_stat,
withFileTypes: true, withFileTypes: true,
strict: false, strict: false,
@ -1164,7 +1153,7 @@ var FileSystemLoaderUIActions = actions.Actions({
var o = browseWalk.makeWalk(null, var o = browseWalk.makeWalk(null,
base, base,
this.imageFilePattern, this.config['image-file-pattern'],
cfg) cfg)
// path selected... // path selected...
.open(function(evt, path){ .open(function(evt, path){

View File

@ -1,12 +1,12 @@
{ {
"name": "ImageGrid.Viewer.g4", "name": "ImageGrid.Viewer.g4",
"version": "4.0.11a", "version": "4.0.10a",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ImageGrid.Viewer.g4", "name": "ImageGrid.Viewer.g4",
"version": "4.0.11a", "version": "4.0.10a",
"dependencies": { "dependencies": {
"app-module-path": "*", "app-module-path": "*",
"async-json": "0.0.2", "async-json": "0.0.2",