mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-31 03:10:07 +00:00 
			
		
		
		
	some cleanup...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									0fc2ebd064
								
							
						
					
					
						commit
						130dcc363a
					
				| @ -121,8 +121,6 @@ Roadmap | |||||||
| 		| 			prior sizing after recycling... | 		| 			prior sizing after recycling... | ||||||
| 		| 			...check if centerRibbon(...) and correctImageProportionsForRotation(...) | 		| 			...check if centerRibbon(...) and correctImageProportionsForRotation(...) | ||||||
| 		| 			are called in right sequence... | 		| 			are called in right sequence... | ||||||
| 		[_] BUG: jumping screen images does not load the adjacent ribbons... |  | ||||||
| 		| positioning is OK but ribbons are not fully visible... |  | ||||||
| 		[_] BUG: changing window size (F11) in single image modes messes things up... | 		[_] BUG: changing window size (F11) in single image modes messes things up... | ||||||
| 		| some images are of different sizes (newly loaded) and aligned in a wrong way... | 		| some images are of different sizes (newly loaded) and aligned in a wrong way... | ||||||
| 		| | 		| | ||||||
| @ -138,6 +136,8 @@ Roadmap | |||||||
| 		| appears to be a state leak, this affects: | 		| appears to be a state leak, this affects: | ||||||
| 		| 	- correctImageProportionsForRotation(image) -- mis-alignes images | 		| 	- correctImageProportionsForRotation(image) -- mis-alignes images | ||||||
| 		| 	  while after cycling single image mode, behaves correctly... | 		| 	  while after cycling single image mode, behaves correctly... | ||||||
|  | 		[_] BUG: jumping screen images does not load the adjacent ribbons... | ||||||
|  | 		| positioning is OK but ribbons are not fully visible... | ||||||
| 		[_] ASAP: test on Android... | 		[_] ASAP: test on Android... | ||||||
| 		[_] 0% Tablet UI | 		[_] 0% Tablet UI | ||||||
| 			[_] screen buttons | 			[_] screen buttons | ||||||
|  | |||||||
| @ -1482,5 +1482,6 @@ function shiftImageRight(image){ | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
| /********************************************************************** | /********************************************************************** | ||||||
| * vim:set ts=4 sw=4 spell :                                          */ | * vim:set ts=4 sw=4 spell :                                          */ | ||||||
|  | |||||||
| @ -482,6 +482,7 @@ var KEYBOARD_CONFIG = { | |||||||
| 					}) | 					}) | ||||||
| 			}, | 			}, | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
| 		E: doc('Open image in external software', openImage), | 		E: doc('Open image in external software', openImage), | ||||||
| 		F4: { | 		F4: { | ||||||
| 				default: 'E', | 				default: 'E', | ||||||
|  | |||||||
							
								
								
									
										52
									
								
								ui/modes.js
									
									
									
									
									
								
							
							
						
						
									
										52
									
								
								ui/modes.js
									
									
									
									
									
								
							| @ -251,58 +251,6 @@ var toggleInlineImageInfo = createCSSClassToggler('.viewer', | |||||||
| 		}) | 		}) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| // NOTE: this confirmsto the css toggler protocol, but is not implemented 
 |  | ||||||
| // 		via createCSSClassToggler as we do not need to set any classes,
 |  | ||||||
| // 		al least at this point...
 |  | ||||||
| // XXX should we use the createCSSClassToggler for this?
 |  | ||||||
| // XXX revise: does extra stuff...
 |  | ||||||
| /* |  | ||||||
| function toggleImageProportions(mode){ |  | ||||||
| 	// normal images...
 |  | ||||||
| 	var image = $('.image') |  | ||||||
| 	var h = image.outerHeight(true) |  | ||||||
| 	var w = image.outerWidth(true) |  | ||||||
| 
 |  | ||||||
| 	if(mode == '?'){ |  | ||||||
| 		return h != w ? 'viewer' : 'square' |  | ||||||
| 
 |  | ||||||
| 	// square...
 |  | ||||||
| 	} else if(h != w || mode == 'square'){ |  | ||||||
| 		mode = 'square' |  | ||||||
| 		var size = Math.min(w, h) |  | ||||||
| 		image.css({ |  | ||||||
| 			width: size, |  | ||||||
| 			height: size |  | ||||||
| 		}) |  | ||||||
| 
 |  | ||||||
| 		// account for rotation...
 |  | ||||||
| 		correctImageProportionsForRotation(image) |  | ||||||
| 
 |  | ||||||
| 		centerView(null, 'css') |  | ||||||
| 
 |  | ||||||
| 	// viewer size...
 |  | ||||||
| 	} else { |  | ||||||
| 		mode = 'viewer' |  | ||||||
| 		var viewer = $('.viewer') |  | ||||||
| 		var W = viewer.innerWidth() |  | ||||||
| 		var H = viewer.innerHeight() |  | ||||||
| 
 |  | ||||||
| 		if(W > H){ |  | ||||||
| 			image.css('width', W * h/H) |  | ||||||
| 		} else { |  | ||||||
| 			image.css('height', H * w/W) |  | ||||||
| 		} |  | ||||||
| 
 |  | ||||||
| 		// account for rotation...
 |  | ||||||
| 		correctImageProportionsForRotation(image) |  | ||||||
| 
 |  | ||||||
| 		centerView(null, 'css') |  | ||||||
| 	} |  | ||||||
| 
 |  | ||||||
| 	return mode |  | ||||||
| } |  | ||||||
| */ |  | ||||||
| 
 |  | ||||||
| var toggleImageProportions = createCSSClassToggler('.viewer', | var toggleImageProportions = createCSSClassToggler('.viewer', | ||||||
| 		[ | 		[ | ||||||
| 			'fit-square', | 			'fit-square', | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user