mirror of
				https://github.com/flynx/pWiki.git
				synced 2025-10-30 18:40:08 +00:00 
			
		
		
		
	Merge branch 'master' of github.com:flynx/pWiki
This commit is contained in:
		
						commit
						3c9b06b5df
					
				
							
								
								
									
										23
									
								
								pwiki2.js
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								pwiki2.js
									
									
									
									
									
								
							| @ -22,7 +22,7 @@ | |||||||
| * 	- .load(..) / .json(..) -- for most stores... | * 	- .load(..) / .json(..) -- for most stores... | ||||||
| * 		might be a good idea to keep a unified format... | * 		might be a good idea to keep a unified format... | ||||||
| * 	- <page>.then() -- resolve when all pending write operations done ??? | * 	- <page>.then() -- resolve when all pending write operations done ??? | ||||||
| * 	- an async REPL... | * 	- an async REPL??? | ||||||
| * | * | ||||||
| * | * | ||||||
| * | * | ||||||
| @ -42,13 +42,7 @@ | |||||||
| * 		- in this view a user in the system is simply a set of keys and  | * 		- in this view a user in the system is simply a set of keys and  | ||||||
| * 			a signature (a page =)) | * 			a signature (a page =)) | ||||||
| * | * | ||||||
| * XXX split this into modules... | * XXX split this into modules (???) | ||||||
| * 		pwiki.js |  | ||||||
| * 		pwiki/page.js |  | ||||||
| * 		pwiki/store.js |  | ||||||
| * 		plugin/markdown.js |  | ||||||
| * 		plugin/pouchdb.js |  | ||||||
| * 		... |  | ||||||
| * | * | ||||||
| * XXX add action to reset overloaded (bootstrap) pages... | * XXX add action to reset overloaded (bootstrap) pages... | ||||||
| * 		- per page | * 		- per page | ||||||
| @ -1441,6 +1435,7 @@ module.BaseParser = { | |||||||
| 					: (res[order.shift()] = e) }) | 					: (res[order.shift()] = e) }) | ||||||
| 		return res }, | 		return res }, | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
| 	// Strip comments...
 | 	// Strip comments...
 | ||||||
| 	//
 | 	//
 | ||||||
| 	stripComments: function(str){ | 	stripComments: function(str){ | ||||||
| @ -1708,15 +1703,9 @@ module.BaseParser = { | |||||||
| 			await this.expand(page, ast, state) | 			await this.expand(page, ast, state) | ||||||
| 			: ast | 			: ast | ||||||
| 
 | 
 | ||||||
| 		//* XXX this is quite ugly...
 | 		//return [...ast]
 | ||||||
| 		var blocks = [] | 		return await ast | ||||||
| 		for await (var a of ast){ | 			.iter() | ||||||
| 			blocks.push(a) } |  | ||||||
| 
 |  | ||||||
| 		return blocks |  | ||||||
| 		/*/ |  | ||||||
| 		return [...ast] |  | ||||||
| 		//*/
 |  | ||||||
| 			// post handlers...
 | 			// post handlers...
 | ||||||
| 			.map(function(section){ | 			.map(function(section){ | ||||||
| 				return typeof(section) == 'function' ?  | 				return typeof(section) == 'function' ?  | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user