mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-31 03:10:07 +00:00 
			
		
		
		
	minor fixes...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									ae3785731d
								
							
						
					
					
						commit
						770d662ec8
					
				| @ -267,13 +267,13 @@ function loadImages(json){ | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| /* | /* bulid a JSON object from current state... | ||||||
|  |  * | ||||||
|  * format: |  * format: | ||||||
|  * 	{ |  * 	{ | ||||||
|  * 		ribbons: [ |  * 		ribbons: [ | ||||||
|  * 			0: { |  * 			<image-id>: { | ||||||
|  * 				url: <image-URL>, |  * 				url: <image-URL>, | ||||||
|  * 				id: <image-id> |  | ||||||
|  * 			},				 |  * 			},				 | ||||||
|  * 			... |  * 			... | ||||||
|  * 		] |  * 		] | ||||||
| @ -286,7 +286,7 @@ function buildJSON(){ | |||||||
| 	} | 	} | ||||||
| 	for(var i=0; i < ribbons.length; i++){ | 	for(var i=0; i < ribbons.length; i++){ | ||||||
| 		var images = $(ribbons[i]).children('.image') | 		var images = $(ribbons[i]).children('.image') | ||||||
| 		var ribbon = [] | 		var ribbon = {} | ||||||
| 		res.ribbons[res.ribbons.length] = ribbon | 		res.ribbons[res.ribbons.length] = ribbon | ||||||
| 		for(var j=0; j < images.length; j++){ | 		for(var j=0; j < images.length; j++){ | ||||||
| 			var image = $(images[j]) | 			var image = $(images[j]) | ||||||
| @ -295,7 +295,6 @@ function buildJSON(){ | |||||||
| 				// unwrap the url...
 | 				// unwrap the url...
 | ||||||
| 				// XXX would be nice to make this a relative path...
 | 				// XXX would be nice to make this a relative path...
 | ||||||
| 				url: /url\((.*)\)/.exec(image.css('background-image'))[1], | 				url: /url\((.*)\)/.exec(image.css('background-image'))[1], | ||||||
| 				id: id, |  | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| @ -306,7 +305,7 @@ function buildJSON(){ | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| // XXX might be good to add images as packs here, not one by one...
 | // XXX might be good to add images in packs here, not one by one...
 | ||||||
| function loadJSON(data){ | function loadJSON(data){ | ||||||
| 	var ribbons = data.ribbons | 	var ribbons = data.ribbons | ||||||
| 	var field = $('.field') | 	var field = $('.field') | ||||||
| @ -319,13 +318,12 @@ function loadJSON(data){ | |||||||
| 		// create ribbon...
 | 		// create ribbon...
 | ||||||
| 		var ribbon = $('<div class="ribbon"></div>') | 		var ribbon = $('<div class="ribbon"></div>') | ||||||
| 			.appendTo(field) | 			.appendTo(field) | ||||||
| 		for(var j=0; j < images.length; j++){ | 		for(var j in images){ | ||||||
| 			var image = $(images[j]) | 			var image = $(images[j]) | ||||||
| 			// create image...
 | 			// create image...
 | ||||||
| 			$('<div class="image"></div>') | 			$('<div class="image"></div>') | ||||||
| 				.css({ 'background-image': 'url('+image.attr('url')+')' }) | 				.css({ 'background-image': 'url('+image.attr('url')+')' }) | ||||||
| 				// set a unique id for each image...
 | 				.attr({'id': j}) | ||||||
| 				.attr({'id': image.attr('id')}) |  | ||||||
| 				.click(setCurrentImage) | 				.click(setCurrentImage) | ||||||
| 				.appendTo(ribbon) | 				.appendTo(ribbon) | ||||||
| 		} | 		} | ||||||
| @ -334,6 +332,7 @@ function loadJSON(data){ | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
| /*************************************************** Event Handlers **/ | /*************************************************** Event Handlers **/ | ||||||
| 
 | 
 | ||||||
| function setCurrentImage(){ | function setCurrentImage(){ | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user