jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							2e4b53c3f4 
							
						 
					 
					
						
						
							
							Merge branch 'code_removal' of github.com:jgen/shimmie2 into develop  
						
						
						
						
					 
					
						2014-04-26 16:55:11 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							1ecf33e39d 
							
						 
					 
					
						
						
							
							Merge branch 'video_thumb' of git://github.com/shish/shimmie2 into develop  
						
						
						
						
					 
					
						2014-04-26 16:54:28 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							86b6d12819 
							
						 
					 
					
						
						
							
							Merge branch 'linting' of github.com:jgen/shimmie2 into code_removal  
						
						
						
						
					 
					
						2014-04-26 16:50:14 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							95ba85ee43 
							
						 
					 
					
						
						
							
							This js file relies on functions defined in 'shimmie.js' which is all globed together when rendering a page. Adding an ignore line to scrutinizer to prevent false-positives.  
						
						
						
						
					 
					
						2014-04-26 05:32:15 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							a8dd045586 
							
						 
					 
					
						
						
							
							Combine these if statements into one to reduce the cyclomatic complexity.  
						
						
						
						
					 
					
						2014-04-26 03:56:06 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							42407116a8 
							
						 
					 
					
						
						
							
							Removing this file.  
						
						
						
						
					 
					
						2014-04-26 03:33:20 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							013222e4ee 
							
						 
					 
					
						
						
							
							Code Removal: PHP has had JSON support directly baked into the language since 5.2.0 - there is no need to rely on an external library from 2006 for json support.  
						
						
						
						
					 
					
						2014-04-26 03:31:02 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							298344048c 
							
						 
					 
					
						
						
							
							Make these functions public to prevent scrutinizer from complaining.  
						
						
						
						
					 
					
						2014-04-26 00:27:16 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							1ca3865a1c 
							
						 
					 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines. (Also see:  https://stackoverflow.com/questions/4410704/why-would-one-omit-the-close-tag  )  
						
						
						
						
					 
					
						2014-04-25 22:54:51 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							3e899710d7 
							
						 
					 
					
						
						
							
							Stop scrutinizer from complaining here.  
						
						
						
						
					 
					
						2014-04-25 17:40:42 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							c85630198f 
							
						 
					 
					
						
						
							
							These variables where never defined depending on the execution path.  
						
						
						
						
					 
					
						2014-04-25 17:40:14 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							6f685ca227 
							
						 
					 
					
						
						
							
							Use the method from core/util to parse the bool from the DB instead.  
						
						
						
						
					 
					
						2014-04-25 17:39:46 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							3a1197256a 
							
						 
					 
					
						
						
							
							Need to pull in the global $page variable for this method.  
						
						
						
						
					 
					
						2014-04-25 17:39:06 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							1e15c5e47a 
							
						 
					 
					
						
						
							
							Explicitly declare this class variable  
						
						
						
						
					 
					
						2014-04-25 17:38:25 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							bcd3f991de 
							
						 
					 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.  
						
						
						
						
					 
					
						2014-04-25 17:34:20 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							b4e6c0b743 
							
						 
					 
					
						
						
							
							Explicitly check if we can actually find the image by Id.  
						
						
						
						
					 
					
						2014-04-25 16:08:00 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							478eb3a4cc 
							
						 
					 
					
						
						
							
							Linting: Check for null return value, and throw an exception if null.  
						
						
						
						
					 
					
						2014-04-25 15:39:00 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							7ef68b15f9 
							
						 
					 
					
						
						
							
							Fix indentation.  
						
						
						
						
					 
					
						2014-04-25 15:38:15 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							b241390fa4 
							
						 
					 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.  
						
						
						
						
					 
					
						2014-04-24 22:34:45 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							50686ac61e 
							
						 
					 
					
						
						
							
							More linting, fix PHPDoc style.  
						
						
						
						
					 
					
						2014-04-24 22:29:29 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							daee99c1bc 
							
						 
					 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.  
						
						
						
						
					 
					
						2014-04-24 22:28:53 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							860af25550 
							
						 
					 
					
						
						
							
							Need to pull in the global $user variable.  
						
						
						
						
					 
					
						2014-04-24 22:22:45 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							4ec5a7ce52 
							
						 
					 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.  
						
						
						
						
					 
					
						2014-04-24 22:22:16 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							780d5f8709 
							
						 
					 
					
						
						
							
							More linting. Explicitly declare these class variables, as well as comment out dead code.  
						
						
						
						
					 
					
						2014-04-24 22:13:00 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							6e4ae229ef 
							
						 
					 
					
						
						
							
							Explicitly declare this class variable  
						
						
						
						
					 
					
						2014-04-24 19:13:41 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							4cc31df737 
							
						 
					 
					
						
						
							
							Update the comments to PHPDoc style guidelines.  
						
						
						
						
					 
					
						2014-04-24 19:02:43 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							ab3f9850e4 
							
						 
					 
					
						
						
							
							Removing the closing PHP "?>" tag as per style guidelines.  
						
						
						
						
					 
					
						2014-04-24 19:01:47 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							709366b70c 
							
						 
					 
					
						
						
							
							Explicitly declare these class variables.  
						
						
						
						
					 
					
						2014-04-24 18:44:46 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							7b90331f02 
							
						 
					 
					
						
						
							
							Add missing semi-colon.  
						
						
						
						
					 
					
						2014-04-24 16:56:04 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							e2f5c7a6ec 
							
						 
					 
					
						
						
							
							Check for null, just in case.  
						
						
						
						
					 
					
						2014-04-24 05:09:38 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							332c8538b7 
							
						 
					 
					
						
						
							
							Change the function syntax to quiet JSHint.  
						
						
						
						
					 
					
						2014-04-24 04:46:23 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							506e699f8a 
							
						 
					 
					
						
						
							
							Not sure if we really need the triple equals.  
						
						
						
						
					 
					
						2014-04-24 01:15:30 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							866d39a68e 
							
						 
					 
					
						
						
							
							The 'tags' box actually has a different ID.  
						
						
						
						
					 
					
						2014-04-24 01:15:03 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							51c145d5c9 
							
						 
					 
					
						
						
							
							Some more linting on the bookmarklet.js file.  
						
						
						
						
					 
					
						2014-04-24 01:08:47 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							4b90faf89d 
							
						 
					 
					
						
						
							
							Even more linting of JS files.  
						
						
						
						
					 
					
						2014-04-24 00:55:14 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							a105090039 
							
						 
					 
					
						
						
							
							Some more JS linting.  
						
						
						
						
					 
					
						2014-04-23 23:39:09 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							887f963e17 
							
						 
					 
					
						
						
							
							Add the jshint comment to alter how scrutinzer-ci deals with the js.  
						
						
						
						
					 
					
						2014-04-23 23:38:53 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							b775c007cd 
							
						 
					 
					
						
						
							
							Give these HTML headers some slight priority over the default value of 50.  
						
						
						
						
					 
					
						2014-04-23 23:07:10 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							a0ab3864c0 
							
						 
					 
					
						
						
							
							Push the headers for the chatbox even further down to make sure that jQuery is already loaded.  
						
						
						
						
					 
					
						2014-04-23 23:01:51 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							8cdf919827 
							
						 
					 
					
						
						
							
							More linting. This time of the JavaScript for the chat-box extension.  
						
						
						
						
					 
					
						2014-04-23 22:43:42 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							0bd031a269 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:jgen/shimmie2 into linting  
						
						... 
						
						
						
						Manually resolved conflicts:
	ext/chatbox/js/yshout.js 
						
						
					 
					
						2014-04-23 22:42:30 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							21e1359b86 
							
						 
					 
					
						
						
							
							Avoid short open tag for PHP.  
						
						
						
						
					 
					
						2014-04-20 05:07:26 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							60980c8839 
							
						 
					 
					
						
						
							
							One more jQuery reference.  
						
						
						
						
					 
					
						2014-04-20 05:04:45 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							a7ba0f887b 
							
						 
					 
					
						
						
							
							Again, the chatbox needs help from the jQuery migrate plugin.  
						
						
						
						
					 
					
						2014-04-20 05:00:59 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							2df54b911a 
							
						 
					 
					
						
						
							
							Don't use short open tags for PHP as they are not turned on by default in production environments.  
						
						
						
						
					 
					
						2014-04-20 05:00:34 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							e2516fa5cf 
							
						 
					 
					
						
						
							
							Chatbox should be fixed now.  
						
						... 
						
						
						
						The chatbox extension actually needs some functionality that was removed from jQuery versions 1.9 and up. When Shimmie's version of jQuery was bumped up to 1.11 this actually broke the chatbox. 
						
						
					 
					
						2014-04-20 04:51:19 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							880840623a 
							
						 
					 
					
						
						
							
							Need to ensure that this html header is added last.  
						
						
						
						
					 
					
						2014-04-20 04:36:25 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							717401ccab 
							
						 
					 
					
						
						
							
							Removing this as jQuery is already included in Shimmie now.  
						
						
						
						
					 
					
						2014-04-20 04:35:33 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							8b698e1b6f 
							
						 
					 
					
						
						
							
							Revert this commit.  
						
						
						
						
					 
					
						2014-04-20 04:29:11 -04:00 
						 
				 
			
				
					
						
							
							
								jgen 
							
						 
					 
					
						
						
						
						
							
						
						
							54362a49c6 
							
						 
					 
					
						
						
							
							Fix the broken chatbox issue.  
						
						
						
						
					 
					
						2014-04-20 04:25:08 -04:00