mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-31 19:30:07 +00:00 
			
		
		
		
	minor tweak...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									01d05e1a0e
								
							
						
					
					
						commit
						aac11de302
					
				| @ -209,10 +209,13 @@ function loadLatestJSONFile(path, dfl, pattern, diff_pattern, default_data){ | |||||||
| 		return tracker.reject('listDir unsupported.') | 		return tracker.reject('listDir unsupported.') | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | 	var file_list = null | ||||||
|  | 
 | ||||||
| 	// find the latest...
 | 	// find the latest...
 | ||||||
| 	if(pattern != null){ | 	if(pattern != null){ | ||||||
|  | 		file_list = listDir(path) | ||||||
| 		pattern = RegExp(pattern) | 		pattern = RegExp(pattern) | ||||||
| 		var file = $.map(listDir(path), function(e){  | 		var file = $.map(file_list, function(e){  | ||||||
| 			return pattern.test(e) ? e : null | 			return pattern.test(e) ? e : null | ||||||
| 		}).sort().reverse()[0] | 		}).sort().reverse()[0] | ||||||
| 	} | 	} | ||||||
| @ -225,9 +228,10 @@ function loadLatestJSONFile(path, dfl, pattern, diff_pattern, default_data){ | |||||||
| 
 | 
 | ||||||
| 	// collect and merge diffs...
 | 	// collect and merge diffs...
 | ||||||
| 	if(diff_pattern != null){ | 	if(diff_pattern != null){ | ||||||
|  | 		file_list = file_list == null ? listDir(path) : file_list | ||||||
| 		diff_pattern = RegExp(diff_pattern) | 		diff_pattern = RegExp(diff_pattern) | ||||||
| 		var diff_data = [diff_data] | 		var diff_data = [diff_data] | ||||||
| 		var diffs_names = $.map(listDir(path), function(e){  | 		var diffs_names = $.map(file_list, function(e){  | ||||||
| 			return diff_pattern.test(e) && e.split('-')[0] >= base_date ? e : null | 			return diff_pattern.test(e) && e.split('-')[0] >= base_date ? e : null | ||||||
| 		}).sort() | 		}).sort() | ||||||
| 		diff = $.when.apply(null, $.map(diffs_names, function(e, i){ | 		diff = $.when.apply(null, $.map(diffs_names, function(e, i){ | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user