Fix issue with jumpy context grid

2 files changed, 11 insertions, 9 deletions

diff --git a/sugar_network_webui/app.py b/sugar_network_webui/app.py
index 3e8acc1..7b742bd 100644
--- a/sugar_network_webui/app.py
+++ b/sugar_network_webui/app.py
@@ -185,7 +185,6 @@ _pull_listener = Client.connect(incoming)
 
 @app.route('/my_event_source')
 def sse_request():
-
     return Response(
             event_stream(),
             mimetype='text/event-stream')
@@ -505,16 +504,19 @@ def context_grid(query=None, page=None):
     """
     try:
         page = int(request.args['page'])
-        session['page'] = page
+        preload = request.args.get('_preload')
+        if not ('_preload' in request.args):
+            session['page'] = page
+        else:
+            session['page'] = int(request.args['_preload'])
         session.modified = True
+        logging.debug("page " + str(page) + " preload " + str(preload))
+        logging.debug("session-page " + str(session['page']))
     except KeyError:
         return redirect(url_for('context_grid',
-                type=request.args.get('type'),
-                query=query, page=session.get('page', 1)))
+            type=request.args.get('type'),
+            query=query, page=session.get('page', 1)))
 
-    #try:
-    #    terms = session['tags'][:]
-    #except KeyError:
     terms = []
 
     cur_type = request.args.get('type') or session.get('current_type')
diff --git a/sugar_network_webui/templates/browser-view.html b/sugar_network_webui/templates/browser-view.html
index 51ee188..0a75268 100644
--- a/sugar_network_webui/templates/browser-view.html
+++ b/sugar_network_webui/templates/browser-view.html
@@ -28,14 +28,14 @@
             
             function load_adyacent_pages(page) {
                 if (page-1 > 0) {
-                    $.get( '?page='+(page-1)+'&_pjax', { },
+                    $.get( '?page='+(page-1)+'&_preload='+page+'&_pjax', { },
                       function( data ) {
                         $( '#resource-page-'+(page-1)).empty().append( data );
                         init_styles('#fff');
                       });
                     }
                 if (page+1 <= {{total_pages}}) {
-                    $.get( '?page='+(page+1)+'&_pjax', { },
+                    $.get( '?page='+(page+1)+'&_preload='+page+'&_pjax', { },
                       function( data ) {
                         $( '#resource-page-'+(page+1) ).empty().append( data );
                         init_styles('#fff');