I may have corrected the bug
This commit is contained in:
		
							parent
							
								
									dabe05c39b
								
							
						
					
					
						commit
						776ccfcc4f
					
				
							
								
								
									
										4
									
								
								controllers/prototype/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								controllers/prototype/index.js
									
									
									
									
										vendored
									
									
								
							| @ -169,3 +169,7 @@ module.exports.userstudy = function(req, res) { | |||||||
|     }); |     }); | ||||||
| 
 | 
 | ||||||
| }; | }; | ||||||
|  | 
 | ||||||
|  | module.exports.next = function(req, res) { | ||||||
|  |     res.redirect('/prototype/game') | ||||||
|  | }; | ||||||
|  | |||||||
							
								
								
									
										3
									
								
								controllers/prototype/urls.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								controllers/prototype/urls.js
									
									
									
									
										vendored
									
									
								
							| @ -9,5 +9,6 @@ module.exports = { | |||||||
|     '/prototype/coin-creator/:scene': 'clicker', |     '/prototype/coin-creator/:scene': 'clicker', | ||||||
|     '/prototype/coin-viewer/:scene': 'viewer', |     '/prototype/coin-viewer/:scene': 'viewer', | ||||||
|     '/prototype/coin-checker/:scene': 'checker', |     '/prototype/coin-checker/:scene': 'checker', | ||||||
|     '/user-study': 'userstudy' |     '/user-study': 'userstudy', | ||||||
|  |     '/prototype/next': 'next' | ||||||
| }; | }; | ||||||
|  | |||||||
| @ -1,4 +1,8 @@ | |||||||
| module.exports.index = function(req, res) { | module.exports.index = function(req, res) { | ||||||
|  | 
 | ||||||
|  |     req.session = null; | ||||||
|  |     res.locals.session = null; | ||||||
|  | 
 | ||||||
|     res.setHeader('Content-Type', 'text/html'); |     res.setHeader('Content-Type', 'text/html'); | ||||||
| 
 | 
 | ||||||
|     res.render('index.jade', res.locals, function(err, result) { |     res.render('index.jade', res.locals, function(err, result) { | ||||||
|  | |||||||
							
								
								
									
										11
									
								
								js/l3d/apps/prototype/interactive/main.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								js/l3d/apps/prototype/interactive/main.js
									
									
									
									
										vendored
									
									
								
							| @ -32,13 +32,20 @@ Coin.onCoinGot = function(coin) { | |||||||
|         setTimeout(function() { |         setTimeout(function() { | ||||||
|             $('#next').show(); |             $('#next').show(); | ||||||
|             $('#next').click(function() { |             $('#next').click(function() { | ||||||
|                 window.location = '/prototype/game'; |                 window.location = '/prototype/next'; | ||||||
|                 $('#next').unbind('click'); |  | ||||||
|             }); |             }); | ||||||
|         }, 60*1000); |         }, 60*1000); | ||||||
|     } |     } | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
|  | Coin.onLastCoin = function() { | ||||||
|  |     $('#next').show(); | ||||||
|  |     $('#next').click(function() { | ||||||
|  |         window.location = '/prototype/next'; | ||||||
|  |     }); | ||||||
|  | 
 | ||||||
|  | } | ||||||
|  | 
 | ||||||
| function main() { | function main() { | ||||||
| 
 | 
 | ||||||
|     // Main container that holds everything
 |     // Main container that holds everything
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user