mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-30 19:00:09 +00:00 
			
		
		
		
	some more cleanup...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									979d8667e8
								
							
						
					
					
						commit
						aa73283a1d
					
				| @ -234,6 +234,8 @@ var CollectionActions = actions.Actions({ | |||||||
| 
 | 
 | ||||||
| 	// XXX should this queue already running calls or a specific collection????
 | 	// XXX should this queue already running calls or a specific collection????
 | ||||||
| 	// 		...I think yes!!
 | 	// 		...I think yes!!
 | ||||||
|  | 	// XXX should there be a force arg when we can't actually stop the 
 | ||||||
|  | 	// 		running promise and recover???
 | ||||||
| 	// XXX do we need timeouts here????
 | 	// XXX do we need timeouts here????
 | ||||||
| 	ensureCollection: ['- Collections/', | 	ensureCollection: ['- Collections/', | ||||||
| 		core.doc`Ensure a collection exists and is consistent...
 | 		core.doc`Ensure a collection exists and is consistent...
 | ||||||
| @ -244,19 +246,16 @@ var CollectionActions = actions.Actions({ | |||||||
| 				NOTE: this will not start a new check until the previous | 				NOTE: this will not start a new check until the previous | ||||||
| 					is done (i.e. the previous promise is resolved/rejected) | 					is done (i.e. the previous promise is resolved/rejected) | ||||||
| 
 | 
 | ||||||
| 			Ensure collection exists and is initialized, forcing call... |  | ||||||
| 			.ensureCollection(title, true) |  | ||||||
| 				-> promise(collection) |  | ||||||
| 
 |  | ||||||
| 		 | 		 | ||||||
| 		This will: | 		This will: | ||||||
| 			- create a collection if it does not exist | 			- create a collection if it does not exist | ||||||
| 			- initialize if needed | 			- initialize if needed | ||||||
| 
 | 
 | ||||||
| 		While the promise is not resolved this will return it and not  | 		While the promise for a specific action is not resolved this  | ||||||
| 		start a new promise. | 		will return it and not start a new promise. | ||||||
| 		`,
 | 		`,
 | ||||||
| 		function(collection, force){ | 		//function(collection, force){
 | ||||||
|  | 		function(collection){ | ||||||
| 			var that = this | 			var that = this | ||||||
| 
 | 
 | ||||||
| 			var running = this.__running_collection_ensure =  | 			var running = this.__running_collection_ensure =  | ||||||
| @ -273,7 +272,8 @@ var CollectionActions = actions.Actions({ | |||||||
| 			// if a promise has not yet resolved/rejected, return it 
 | 			// if a promise has not yet resolved/rejected, return it 
 | ||||||
| 			// and do not start a new one...
 | 			// and do not start a new one...
 | ||||||
| 			// XXX do we need timeouts here????
 | 			// XXX do we need timeouts here????
 | ||||||
| 			if(!force && running[collection]){ | 			//if(!force && running[collection]){
 | ||||||
|  | 			if(running[collection]){ | ||||||
| 				return running[collection] | 				return running[collection] | ||||||
| 			} | 			} | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user