mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-30 19:00:09 +00:00 
			
		
		
		
	new version of tag block navigation now works...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									4b9e2cd65f
								
							
						
					
					
						commit
						3bb475de0c
					
				
							
								
								
									
										17
									
								
								ui/tags.js
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								ui/tags.js
									
									
									
									
									
								
							| @ -390,21 +390,26 @@ function listTagsAtGapsFrom(tags, gids){ | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| // XXX this is a bit buggy...
 |  | ||||||
| function getGapEdge(direction, tag, gids){ | function getGapEdge(direction, tag, gids){ | ||||||
| 	var get = direction == 'next' ? getGIDAfter : getGIDBefore | 	var get = direction == 'next' ? getGIDAfter : getGIDBefore | ||||||
| 
 | 
 | ||||||
| 	gids = gids == null ? getRibbonGIDs() : gids | 	gids = gids == null ? getRibbonGIDs() : gids | ||||||
| 	var cur = getImageGID() |  | ||||||
| 	var tagged = TAGS[tag] | 	var tagged = TAGS[tag] | ||||||
|  | 	var cur = getImageGID() | ||||||
|  | 	var step = direction == 'next' ? 1 : -1 | ||||||
| 
 | 
 | ||||||
|  | 	// get the next element...
 | ||||||
|  | 	cur = gids[gids.indexOf(cur) + step] | ||||||
| 
 | 
 | ||||||
| 	// current is tagged -- skip till first untagged (not inclusive)...
 | 	// current is tagged -- skip till first untagged (not inclusive)...
 | ||||||
| 	if(getTags(cur).indexOf(tag) >= 0){ | 	if(getTags(cur) != null && getTags(cur).indexOf(tag) >= 0){ | ||||||
|  | 		// skip the current...
 | ||||||
| 		var i = gids.indexOf(cur) | 		var i = gids.indexOf(cur) | ||||||
| 		// get last in tag block...
 | 		// get last in tag block...
 | ||||||
| 		while(gids[i] != null && tagged.indexOf(gids[i]) >= 0){  | 		while(i >= 0 && i < gids.length  | ||||||
| 			i += direction == 'next' ? 1 : -1 | 				// lookahead -- we...
 | ||||||
|  | 				&& tagged.indexOf(gids[i+step]) >= 0){  | ||||||
|  | 			i += step | ||||||
| 		} | 		} | ||||||
| 		var res = gids[i] | 		var res = gids[i] | ||||||
| 
 | 
 | ||||||
| @ -493,7 +498,7 @@ function setupTags(viewer){ | |||||||
| 			showStatusQ('Tags: Index: done ('+( t1 - t0 )+'ms).') | 			showStatusQ('Tags: Index: done ('+( t1 - t0 )+'ms).') | ||||||
| 		}) | 		}) | ||||||
| } | } | ||||||
| //SETUP_BINDINGS.push(setupTags)
 | SETUP_BINDINGS.push(setupTags) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| // Setup the unsorted image state managers...
 | // Setup the unsorted image state managers...
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user