Merge remote-tracking branch 'upstream/dev' into wiki

2016-06-09 20:07:09 -04:00
parent 9410b63bbc ee5372784e
commit 7a242f829f
5 changed files with 21 additions and 21 deletions
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -321,22 +321,6 @@ $(function() {
 				return false;
 			}
 		}
-		if(event.keyCode == '34') {
-			if((pageHasMoreContent) && (! loadingPage)) {
-				$('#more').hide();
-				$('#no-more').hide();
-
-				next_page++;
-				scroll_next = true;
-				loadingPage = true;
-
-				if(($('.directory-end').length == 0) && ($('.photos-end').length == 0))
-					liveUpdate();
-				else
-					pageUpdate();
-				return true;
-			}
-		}

 		if(event.keyCode == '19' || (event.ctrlKey && event.which == '32')) {
 			event.preventDefault();