Merge remote-tracking branch 'upstream/master'

2 files changed, 39 insertions, 2 deletions

diff --git a/view/js/main.js b/view/js/main.js
index b5b77d473..8c4fcdc13 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -285,7 +285,7 @@
 					scroll_next = true;
 					loadingPage = true;
 
-					if($('.directory-end').length == 0)
+					if(($('.directory-end').length == 0) && ($('.photos-end').length == 0))
 						liveUpdate();
 					else
 						pageUpdate();
@@ -689,7 +689,7 @@ function updateConvItems(mode,data) {
 			bParam_page = 1;
 		}
 
-		update_url = baseurl + '/directory/?f=&aj=1&page=' + bParam_page;
+		update_url = baseurl + '/' + page_query + '/?f=&aj=1&page=' + bParam_page + extra_args ;
 
 		$("#page-spinner").spin('small');
 		update_mode = 'append';
diff --git a/view/js/mod_events.js b/view/js/mod_events.js
new file mode 100644
index 000000000..0ce128fcc
--- /dev/null
+++ b/view/js/mod_events.js
@@ -0,0 +1,37 @@
+
+$(document).ready( function() { showHideFinishDate(); });
+
+function showHideFinishDate() {
+	if( $('#event-nofinish-checkbox').is(':checked'))
+		$('#event-finish-wrapper').hide();
+	else
+		$('#event-finish-wrapper').show();
+}
+
+
+
+	function eventGetStart() {
+		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+		$('#startModal').modal();
+		$('#start-modal-OKButton').on('click', function() {
+    	reply=$('#start-date').val();
+    	if(reply && reply.length) {
+			$('#start-text').val(reply);
+			$('#startModal').modal('hide');
+		}
+		})
+		
+		
+	}
+	function eventGetFinish() {
+		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+		$('#finishModal').modal();
+		$('#finish-modal-OKButton').on('click', function() {
+    	reply=$('#finish-date').val();
+    	if(reply && reply.length) {
+			$('#finish-text').val(reply);
+			$('#finishModal').modal('hide');
+		}
+		})
+				
+	}