mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-30 19:00:09 +00:00 
			
		
		
		
	now slideshow dialog accepts different time units (ms/s/m)...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									045a83ad96
								
							
						
					
					
						commit
						7739ce4add
					
				
							
								
								
									
										26
									
								
								ui/modes.js
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								ui/modes.js
									
									
									
									
									
								
							| @ -212,17 +212,35 @@ var toggleSlideShowMode = createCSSClassToggler( | |||||||
| 						'Reverse direction': SLIDESHOW_DIRECTION == 'prev' ? true : false | 						'Reverse direction': SLIDESHOW_DIRECTION == 'prev' ? true : false | ||||||
| 				}, 'Start') | 				}, 'Start') | ||||||
| 					.done(function(data){ | 					.done(function(data){ | ||||||
| 						var interval = parseFloat(data['Interval']) |  | ||||||
| 						var looping = data['Looping'] | 						var looping = data['Looping'] | ||||||
| 						var reverse = data['Reverse direction'] | 						var reverse = data['Reverse direction'] | ||||||
| 
 | 
 | ||||||
| 						SLIDESHOW_INTERVAL = isNaN(interval) ? 3000 : interval*1000 |  | ||||||
| 						SLIDESHOW_LOOP = looping | 						SLIDESHOW_LOOP = looping | ||||||
| 						SLIDESHOW_DIRECTION = reverse == true ? 'prev' : 'next' | 						SLIDESHOW_DIRECTION = reverse == true ? 'prev' : 'next' | ||||||
| 
 | 
 | ||||||
| 						console.log('>>>', data) | 						// parse interval...
 | ||||||
|  | 						var interval_raw = data['Interval'] | ||||||
|  | 						// units...
 | ||||||
|  | 						var M = 1000 | ||||||
|  | 						if(/ms|msec|milsec|millisecond[s]/i.test(interval_raw)){ | ||||||
|  | 							M = 1 | ||||||
|  | 						} else if(/(s|sec|second[s])/i.test(interval_raw)){ | ||||||
|  | 							M = 1000 | ||||||
|  | 						} else if(/m|min|minute[s]/i.test(interval_raw)){ | ||||||
|  | 							M = 1000*60 | ||||||
|  | 						} | ||||||
|  | 						// fractions...
 | ||||||
|  | 						if(/[0-9]+\/[0-9]+/.test(interval_raw)){ | ||||||
|  | 							var parts = interval_raw.split('/') | ||||||
|  | 							var interval = parseFloat(parts[0]) / parseFloat(parts[1]) | ||||||
|  | 						} else { | ||||||
|  | 							var interval = parseFloat(interval_raw) | ||||||
|  | 						} | ||||||
|  | 						SLIDESHOW_INTERVAL = isNaN(interval) ? 3000 : interval*M | ||||||
| 
 | 
 | ||||||
| 						showStatus('Slideshow: starting', SLIDESHOW_LOOP ? 'looped...' : 'unlooped...') | 						console.log('>>>', data, interval) | ||||||
|  | 
 | ||||||
|  | 						showStatus('Slideshow: starting:', SLIDESHOW_INTERVAL/1000 +'sec,', SLIDESHOW_LOOP ? 'looped...' : 'unlooped...') | ||||||
| 					 | 					 | ||||||
| 						// XXX is this the correct way to go???
 | 						// XXX is this the correct way to go???
 | ||||||
| 						hideOverlay($('.viewer')) | 						hideOverlay($('.viewer')) | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user