From 000dd3fdd065fde4e7422e7fb41e06580fe06cb7 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Sun, 9 Mar 2014 18:04:56 +0000
Subject: [PATCH] * VRFS-1253 - working in a basic sense with pagination

---
 web/app/assets/images/shared/spinner-32.gif   | Bin 0 -> 4410 bytes
 web/app/assets/javascripts/application.js     |   2 +
 web/app/assets/javascripts/findSession.js     | 852 ++++++++++--------
 web/app/assets/javascripts/jam_rest.js        |   8 +-
 web/app/assets/javascripts/sessionList.js     |   2 +-
 .../stylesheets/client/findSession.css.scss   |  77 +-
 .../stylesheets/client/jamkazam.css.scss      |   8 +
 web/app/controllers/clients_controller.rb     |   1 +
 web/app/views/clients/_findSession.html.erb   |  14 +-
 web/app/views/clients/index.html.erb          |   2 +
 web/config/application.rb                     |   7 +-
 web/config/environments/development.rb        |   7 +-
 web/config/environments/test.rb               |   2 +-
 web/config/initializers/dev_users.rb          |   3 -
 web/spec/features/find_sessions_spec.rb       |  50 +-
 .../javascripts/jquery.infinitescroll.js      | 814 +++++++++++++++++
 16 files changed, 1418 insertions(+), 431 deletions(-)
 create mode 100644 web/app/assets/images/shared/spinner-32.gif
 create mode 100644 web/vendor/assets/javascripts/jquery.infinitescroll.js

diff --git a/web/app/assets/images/shared/spinner-32.gif b/web/app/assets/images/shared/spinner-32.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bd39fb1a9a1f5d890faaa938388b371777d37438
GIT binary patch
literal 4410
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

literal 0
HcmV?d00001

diff --git a/web/app/assets/javascripts/application.js b/web/app/assets/javascripts/application.js
index e180fa24f..e96b3b6fe 100644
--- a/web/app/assets/javascripts/application.js
+++ b/web/app/assets/javascripts/application.js
@@ -24,6 +24,8 @@
 //= require jquery.clipboard
 //= require jquery.timeago
 //= require jquery.easydropdown
+//= require jquery.scrollTo
+//= require jquery.infinitescroll
 //= require globals
 //= require AAB_message_factory
 //= require AAC_underscore
diff --git a/web/app/assets/javascripts/findSession.js b/web/app/assets/javascripts/findSession.js
index 24868b217..31421dfcd 100644
--- a/web/app/assets/javascripts/findSession.js
+++ b/web/app/assets/javascripts/findSession.js
@@ -1,377 +1,483 @@
-(function(context,$) {
+(function (context, $) {
 
-    "use strict";
+  "use strict";
 
-    context.JK = context.JK || {};
-    context.JK.FindSessionScreen = function(app) {
-        var CATEGORY = {
-            INVITATION : {index: 0, id: "table#sessions-invitations"},
-            FRIEND : {index: 1, id: "table#sessions-friends"},
-            OTHER : {index: 2, id: "table#sessions-other"}
-        };
-
-        var logger = context.JK.logger;
-        var rest  = context.JK.Rest();
-        var sessionLatency;
-        var sessions = {};
-        var invitationSessionGroup = {};
-        var friendSessionGroup = {};
-        var otherSessionGroup = {};
-        var sessionCounts = [0, 0, 0];
-        var sessionList;
-
-        // for unit tests
-        function getCategoryEnum() {
-            return CATEGORY;
-        }
-
-        function removeSpinner() {
-            $('<div[layout-id=findSession] .content .spinner').remove();// remove any existing spinners
-
-        }
-
-        function addSpinner() {
-            removeSpinner();
-            $('<div[layout-id=findSession] .content').append('<div class="spinner spinner-large"></div>')
-
-        }
-
-        function loadSessions(queryString) {
-
-            addSpinner();
-
-            // squelch nulls and undefines
-            queryString = !!queryString ? queryString : "";
-
-            if(gon.use_cached_session_scores) {
-              rest.findScoredSessions(app.clientId, queryString)
-                .done(afterLoadScoredSessions)
-                .always(removeSpinner)
-                .fail(app.ajaxError)
-            }
-            else {
-              rest.findSessions(queryString)
-                .done(afterLoadSessions)
-                .fail(app.ajaxError)
-                .always(removeSpinner)
-            }
-
-        }
-
-        function search() {
-            logger.debug("Searching for sessions...");
-            clearResults();
-            var queryString = '';
-
-            // genre filter
-            var genres = context.JK.GenreSelectorHelper.getSelectedGenres('#find-session-genre');
-            if (genres !== null && genres.length > 0) {
-                queryString += "genres=" + genres.join(',');
-            }
-
-            // keyword filter
-            var keyword = $('#session-keyword-srch').val();
-            if (keyword !== null && keyword.length > 0 && keyword !== 'Search by Keyword') {
-                if (queryString.length > 0) {
-                    queryString += "&";
-                }
-
-                queryString += "keyword=" + $('#session-keyword-srch').val();
-            }
-
-            loadSessions(queryString);
-        }
-
-        function refreshDisplay() {
-            var priorVisible;
-
-            var INVITATION = 'div#sessions-invitations';
-            var FRIEND = 'div#sessions-friends';
-            var OTHER = 'div#sessions-other';
-
-            // INVITATION
-            //logger.debug("sessionCounts[CATEGORY.INVITATION.index]=" + sessionCounts[CATEGORY.INVITATION.index]);
-            if (sessionCounts[CATEGORY.INVITATION.index] === 0) {
-                priorVisible = false;
-                $(INVITATION).hide();
-            }
-            else {
-                priorVisible = true;
-                $(INVITATION).show();
-            }
-
-            // FRIEND
-            if (!priorVisible) {
-                $(FRIEND).removeClass('mt35');
-            }
-
-            //logger.debug("sessionCounts[CATEGORY.FRIEND.index]=" + sessionCounts[CATEGORY.FRIEND.index]);
-            if (sessionCounts[CATEGORY.FRIEND.index] === 0) {
-                priorVisible = false;
-                $(FRIEND).hide();
-            }
-            else {
-                priorVisible = true;
-                $(FRIEND).show();
-            }
-
-            // OTHER
-            if (!priorVisible) {
-                $(OTHER).removeClass('mt35');
-            }
-
-            //logger.debug("sessionCounts[CATEGORY.OTHER.index]=" + sessionCounts[CATEGORY.OTHER.index]);
-            if (sessionCounts[CATEGORY.OTHER.index] === 0) {
-                $(OTHER).hide();
-            }
-            else {
-                $(OTHER).show();
-            }
-        }
-
-        function afterLoadScoredSessions(sessionList) {
-
-          // display the 'no sessions' banner if appropriate
-          var $noSessionsFound = $('#sessions-none-found');
-          if(sessionList.length == 0) {
-            $noSessionsFound.show();
-          }
-          else {
-            $noSessionsFound.hide();
-          }
-
-          $.each(sessionList, function(i, session) {
-            sessions[session.id] = session;
-            session.latencyInfo
-          });
-
-          $.each(sessionList, function(i, session) {
-            renderSession(session.id);
-          })
-
-          context.JK.GA.trackFindSessions(sessionList.length);
-        }
-
-
-      function afterLoadSessions(sessionList) {
-
-            // display the 'no sessions' banner if appropriate
-            var $noSessionsFound = $('#sessions-none-found');
-            if(sessionList.length == 0) {
-                $noSessionsFound.show();
-            }
-            else {
-                $noSessionsFound.hide();
-            }
-
-            startSessionLatencyChecks(sessionList);
-
-            context.JK.GA.trackFindSessions(sessionList.length);
-        }
-
-        function startSessionLatencyChecks(sessionList) {
-            logger.debug("Starting latency checks on " + sessionList.length + " sessions");
-
-            sessionLatency.subscribe(app.clientId, latencyResponse);
-            $.each(sessionList, function(index, session) {
-                sessions[session.id] = session;
-                sessionLatency.sessionPings(session);
-            });
-        }
-
-        function containsInvitation(session) {
-            var i, invitation = null;
-
-            if (session !== undefined) {
-                if ("invitations" in session) {
-                    // user has invitations for this session
-                    for (i=0; i < session.invitations.length; i++) {
-                        invitation = session.invitations[i];
-                        // session contains an invitation for this user
-                        if (invitation.receiver_id == context.JK.currentUserId) {
-                            return true;
-                        }
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        function containsFriend(session) {
-            var i, participant = null;
-
-            if (session !== undefined) {
-                if ("participants" in session) {
-                    for (i=0; i < session.participants.length; i++) {
-                        participant = session.participants[i];
-                        // this session participant is a friend
-                        if (participant !== null && participant !== undefined && participant.user.is_friend) {
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-
-        function latencyResponse(sessionId) {
-            logger.debug("Received latency response for session " + sessionId);
-            renderSession(sessionId);
-        }
-
-        /**
-        * Not used normally. Allows modular unit testing
-        * of the renderSession method without having to do
-        * as much heavy setup.
-        */
-        function setSession(session) {
-            invitationSessionGroup[session.id] = session;
-        }
-
-        /**
-        * Render a single session line into the table.
-        * It will be inserted at the appropriate place according to the
-        * sortScore in sessionLatency.
-        */
-        function renderSession(sessionId) {
-            // store session in the appropriate bucket and increment category counts
-            var session = sessions[sessionId];
-            if (containsInvitation(session)) {
-                invitationSessionGroup[sessionId] = session;
-                sessionCounts[CATEGORY.INVITATION.index]++;
-            }
-            else if (containsFriend(session)) {
-                friendSessionGroup[sessionId] = session;
-                sessionCounts[CATEGORY.FRIEND.index]++;
-            }
-            else {
-                otherSessionGroup[sessionId] = session;
-                sessionCounts[CATEGORY.OTHER.index]++;
-            }
-
-            // hack to prevent duplicate rows from being rendered when filtering
-            var sessionAlreadyRendered = false;
-            var $tbGroup;
-
-            logger.debug('Rendering session ID = ' + sessionId);
-
-            if (invitationSessionGroup[sessionId] != null) {
-                $tbGroup = $(CATEGORY.INVITATION.id);
-
-                if ($("table#sessions-invitations tr[id='" + sessionId + "']").length > 0) {
-                    sessionAlreadyRendered = true;
-                }
-            }
-            else if (friendSessionGroup[sessionId] != null) {;
-                $tbGroup = $(CATEGORY.FRIEND.id);
-
-                if ($("table#sessions-friends tr[id='" + sessionId + "']").length > 0) {
-                    sessionAlreadyRendered = true;
-                }
-            }
-            else if (otherSessionGroup[sessionId] != null) {
-                $tbGroup = $(CATEGORY.OTHER.id);
-
-                if ($("table#sessions-other tr[id='" + sessionId + "']").length > 0) {
-                    sessionAlreadyRendered = true;
-                }
-            }
-            else {
-                logger.debug('ERROR: No session with ID = ' + sessionId + ' found.');
-                return;
-            }
-
-            if (!sessionAlreadyRendered) {
-                var row = sessionList.renderSession(session, sessionLatency, $tbGroup, $('#template-session-row').html(), $('#template-musician-info').html());
-            }
-
-            refreshDisplay();
-        }
-
-        function beforeShow(data) {
-            context.JK.GenreSelectorHelper.render('#find-session-genre');
-        }
-
-        function afterShow(data) {
-            clearResults();
-            refreshDisplay();
-            loadSessions();
-        }
-
-        function clearResults() {
-            $('table#sessions-invitations').children(':not(:first-child)').remove();
-            $('table#sessions-friends').children(':not(:first-child)').remove();
-            $('table#sessions-other').children(':not(:first-child)').remove();
-
-            sessionCounts = [0, 0, 0];
-
-            sessions = {};
-            invitationSessionGroup = {};
-            friendSessionGroup = {};
-            otherSessionGroup = {};
-        }
-
-        function deleteSession(evt) {
-            var sessionId = $(evt.currentTarget).attr("action-id");
-            if (sessionId) {
-                $.ajax({
-                    type: "DELETE",
-                    url: "/api/sessions/" + sessionId,
-                    error: app.ajaxError
-                }).done(loadSessions);
-            }
-        }
-
-        function events() {
-
-            $('#session-keyword-srch').focus(function() {
-                $(this).val('');
-            });
-
-            $("#session-keyword-srch").keypress(function(evt) {
-                if (evt.which === 13) {
-                    evt.preventDefault();
-                    search();
-                }
-            });
-
-            $('#btn-refresh').on("click", search);
-        }
-
-        /**
-        * Initialize, providing an instance of the SessionLatency class.
-        */
-        function initialize(latency) {
-
-            var screenBindings = {
-                'beforeShow': beforeShow,
-                'afterShow': afterShow
-            };
-            app.bindScreen('findSession', screenBindings);
-
-            if (latency) {
-                sessionLatency = latency;
-            }
-            else {
-                logger.warn("No sessionLatency provided.");
-            }
-
-            sessionList = new context.JK.SessionList(app);
-
-            events();
-        }
-
-        this.initialize = initialize;
-        this.renderSession = renderSession;
-        this.afterShow = afterShow;
-
-        // Following exposed for easier testing.
-        this.setSession = setSession;
-        this.clearResults = clearResults;
-        this.getCategoryEnum = getCategoryEnum;
-
-        return this;
+  context.JK = context.JK || {};
+  context.JK.FindSessionScreen = function (app) {
+    var CATEGORY = {
+      INVITATION: {index: 0, id: "table#sessions-invitations"},
+      FRIEND: {index: 1, id: "table#sessions-friends"},
+      OTHER: {index: 2, id: "table#sessions-other"}
     };
 
- })(window,jQuery);
\ No newline at end of file
+    var logger = context.JK.logger;
+    var rest = context.JK.Rest();
+    var sessionLatency;
+    var sessions = {};
+    var invitationSessionGroup = {};
+    var friendSessionGroup = {};
+    var otherSessionGroup = {};
+    var sessionCounts = [0, 0, 0];
+    var sessionList;
+    var currentQuery = defaultQuery();
+    var currentPage = 0;
+    var LIMIT = 20;
+    var $next = null;
+    var $scroller = null;
+    var $noMoreSessions = null;
+
+
+    function defaultQuery() {
+      return {offset:currentPage * LIMIT, limit:LIMIT, page:currentPage};
+    }
+    // for unit tests
+    function getCategoryEnum() {
+      return CATEGORY;
+    }
+
+    function removeSpinner() {
+      $('<div[layout-id=findSession] .content .spinner').remove();// remove any existing spinners
+
+    }
+
+    function addSpinner() {
+      removeSpinner();
+      $('<div[layout-id=findSession] .content').append('<div class="spinner spinner-large"></div>')
+    }
+
+    function loadSessionsOriginal() {
+      addSpinner();
+
+      rest.findSessions(currentQuery)
+        .done(afterLoadSessions)
+        .fail(app.ajaxError)
+        .always(removeSpinner)
+    }
+
+    function loadSessionsNew() {
+
+      addSpinner();
+
+      rest.findScoredSessions(app.clientId, currentQuery)
+        .done(function(response) { afterLoadScoredSessions(response); })
+        .always(function(){ removeSpinner(); })
+        .fail(app.ajaxError)
+    }
+
+    function loadSessions() {
+
+
+      if (gon.use_cached_session_scores) {
+        loadSessionsNew();
+      }
+      else {
+        loadSessionsOriginal();
+      }
+
+    }
+
+    function buildQuery() {
+      currentQuery = defaultQuery();
+
+      // genre filter
+      var genres = context.JK.GenreSelectorHelper.getSelectedGenres('#find-session-genre');
+      if (genres !== null && genres.length > 0) {
+        currentQuery.genres = genres.join(',');
+      }
+
+      // keyword filter
+      var keyword = $('#session-keyword-srch').val();
+      if (keyword !== null && keyword.length > 0 && keyword !== 'Search by Keyword') {
+        currentQuery.keyword = $('#session-keyword-srch').val();
+      }
+
+      return currentQuery;
+    }
+
+    function search() {
+      logger.debug("Searching for sessions...");
+      clearResults();
+      buildQuery();
+      refreshDisplay();
+      loadSessions();
+    }
+
+    function refreshDisplay() {
+      var priorVisible;
+
+      var INVITATION = 'div#sessions-invitations';
+      var FRIEND = 'div#sessions-friends';
+      var OTHER = 'div#sessions-other';
+
+      // INVITATION
+      //logger.debug("sessionCounts[CATEGORY.INVITATION.index]=" + sessionCounts[CATEGORY.INVITATION.index]);
+      if (sessionCounts[CATEGORY.INVITATION.index] === 0) {
+        priorVisible = false;
+        $(INVITATION).hide();
+      }
+      else {
+        priorVisible = true;
+        $(INVITATION).show();
+      }
+
+      // FRIEND
+      if (!priorVisible) {
+        $(FRIEND).removeClass('mt35');
+      }
+
+      //logger.debug("sessionCounts[CATEGORY.FRIEND.index]=" + sessionCounts[CATEGORY.FRIEND.index]);
+      if (sessionCounts[CATEGORY.FRIEND.index] === 0) {
+        priorVisible = false;
+        $(FRIEND).hide();
+      }
+      else {
+        priorVisible = true;
+        $(FRIEND).show();
+      }
+
+      // OTHER
+      if (!priorVisible) {
+        $(OTHER).removeClass('mt35');
+      }
+
+      //logger.debug("sessionCounts[CATEGORY.OTHER.index]=" + sessionCounts[CATEGORY.OTHER.index]);
+      if (sessionCounts[CATEGORY.OTHER.index] === 0) {
+        $(OTHER).hide();
+      }
+      else {
+        $(OTHER).show();
+      }
+    }
+
+    function afterLoadScoredSessions(sessionList) {
+
+      // display the 'no sessions' banner if appropriate
+      var $noSessionsFound = $('#sessions-none-found');
+      if (currentPage == 0 && sessionList.length == 0) {
+        $noSessionsFound.show();
+      }
+      else {
+        $noSessionsFound.hide();
+      }
+
+      // update pager so infinitescroll can do it's thing
+      //$next.attr('href', '/api/sessions/nindex/' + app.clientId + '?' + $.param(currentQuery))
+
+      /**
+      // XXX
+      if(sessionList.length > 0) {
+        for(var i = 0; i < 20; i++) {
+          var copied =  $.extend(true, {}, sessionList[0]);
+          copied.id = 'session_' + i;
+          sessionList.push(copied);
+        }
+      }
+       */
+
+      $.each(sessionList, function (i, session) {
+        sessions[session.id] = session;
+      });
+
+      $.each(sessionList, function (i, session) {
+        renderSession(session.id);
+      });
+
+      if(sessionList.length < LIMIT) {
+        // if we less results than asked for, end searching
+        $scroller.infinitescroll('pause');
+
+        if(currentPage > 0) {
+          $noMoreSessions.show();
+        }
+
+      }else {
+        currentPage++;
+        buildQuery();
+        registerInfiniteScroll();
+      }
+
+      context.JK.GA.trackFindSessions(sessionList.length);
+    }
+
+
+    function afterLoadSessions(sessionList) {
+
+      // display the 'no sessions' banner if appropriate
+      var $noSessionsFound = $('#sessions-none-found');
+      if (sessionList.length == 0) {
+        $noSessionsFound.show();
+      }
+      else {
+        $noSessionsFound.hide();
+      }
+
+      startSessionLatencyChecks(sessionList);
+
+      context.JK.GA.trackFindSessions(sessionList.length);
+    }
+
+    function startSessionLatencyChecks(sessionList) {
+      logger.debug("Starting latency checks on " + sessionList.length + " sessions");
+
+      sessionLatency.subscribe(app.clientId, latencyResponse);
+      $.each(sessionList, function (index, session) {
+        sessions[session.id] = session;
+        sessionLatency.sessionPings(session);
+      });
+    }
+
+    function containsInvitation(session) {
+      var i, invitation = null;
+
+      if (session !== undefined) {
+        if ("invitations" in session) {
+          // user has invitations for this session
+          for (i = 0; i < session.invitations.length; i++) {
+            invitation = session.invitations[i];
+            // session contains an invitation for this user
+            if (invitation.receiver_id == context.JK.currentUserId) {
+              return true;
+            }
+          }
+        }
+      }
+
+      return false;
+    }
+
+    function containsFriend(session) {
+      var i, participant = null;
+
+      if (session !== undefined) {
+        if ("participants" in session) {
+          for (i = 0; i < session.participants.length; i++) {
+            participant = session.participants[i];
+            // this session participant is a friend
+            if (participant !== null && participant !== undefined && participant.user.is_friend) {
+              return true;
+            }
+          }
+        }
+      }
+      return false;
+    }
+
+    function latencyResponse(sessionId) {
+      logger.debug("Received latency response for session " + sessionId);
+      renderSession(sessionId);
+    }
+
+    /**
+     * Not used normally. Allows modular unit testing
+     * of the renderSession method without having to do
+     * as much heavy setup.
+     */
+    function setSession(session) {
+      invitationSessionGroup[session.id] = session;
+    }
+
+    /**
+     * Render a single session line into the table.
+     * It will be inserted at the appropriate place according to the
+     * sortScore in sessionLatency.
+     */
+    function renderSession(sessionId) {
+      // store session in the appropriate bucket and increment category counts
+      var session = sessions[sessionId];
+      if (containsInvitation(session)) {
+        invitationSessionGroup[sessionId] = session;
+        sessionCounts[CATEGORY.INVITATION.index]++;
+      }
+      else if (containsFriend(session)) {
+        friendSessionGroup[sessionId] = session;
+        sessionCounts[CATEGORY.FRIEND.index]++;
+      }
+      else {
+        otherSessionGroup[sessionId] = session;
+        sessionCounts[CATEGORY.OTHER.index]++;
+      }
+
+      // hack to prevent duplicate rows from being rendered when filtering
+      var sessionAlreadyRendered = false;
+      var $tbGroup;
+
+      logger.debug('Rendering session ID = ' + sessionId);
+
+      if (invitationSessionGroup[sessionId] != null) {
+        $tbGroup = $(CATEGORY.INVITATION.id);
+
+        if ($("table#sessions-invitations tr[id='" + sessionId + "']").length > 0) {
+          sessionAlreadyRendered = true;
+        }
+      }
+      else if (friendSessionGroup[sessionId] != null) {
+        ;
+        $tbGroup = $(CATEGORY.FRIEND.id);
+
+        if ($("table#sessions-friends tr[id='" + sessionId + "']").length > 0) {
+          sessionAlreadyRendered = true;
+        }
+      }
+      else if (otherSessionGroup[sessionId] != null) {
+        $tbGroup = $(CATEGORY.OTHER.id);
+
+        if ($("table#sessions-other tr[id='" + sessionId + "']").length > 0) {
+          sessionAlreadyRendered = true;
+        }
+      }
+      else {
+        logger.debug('ERROR: No session with ID = ' + sessionId + ' found.');
+        return;
+      }
+
+      if (!sessionAlreadyRendered) {
+        var row = sessionList.renderSession(session, sessionLatency, $tbGroup, $('#template-session-row').html(), $('#template-musician-info').html());
+      }
+
+      refreshDisplay();
+    }
+
+    function beforeShow(data) {
+      context.JK.GenreSelectorHelper.render('#find-session-genre');
+    }
+
+    function afterShow(data) {
+      clearResults();
+      buildQuery();
+      refreshDisplay();
+      loadSessions();
+    }
+
+    function clearResults() {
+      currentPage = 0;
+      $noMoreSessions.hide();
+      $scroller.infinitescroll('resume');
+      $('table#sessions-invitations').children(':not(:first-child)').remove();
+      $('table#sessions-friends').children(':not(:first-child)').remove();
+      $('table#sessions-other').children(':not(:first-child)').remove();
+
+      sessionCounts = [0, 0, 0];
+
+      sessions = {};
+      invitationSessionGroup = {};
+      friendSessionGroup = {};
+      otherSessionGroup = {};
+    }
+
+    function deleteSession(evt) {
+      var sessionId = $(evt.currentTarget).attr("action-id");
+      if (sessionId) {
+        $.ajax({
+          type: "DELETE",
+          url: "/api/sessions/" + sessionId,
+          error: app.ajaxError
+        }).done(loadSessions);
+      }
+    }
+    function tempDebugStuff() {
+      if (gon.allow_both_find_algos && context.JK.currentUserAdmin) {
+        // show extra Refresh button, and distinguish between them
+        $('#btn-refresh-other').show().click(function() {
+          clearResults();
+          buildQuery();
+          refreshDisplay();
+          if(gon.use_cached_session_scores) {
+            loadSessionsOriginal();
+          }
+          else {
+            loadSessionsNew();
+          }
+        });
+        $('#btn-refresh').find('.extra').text(gon.use_cached_session_scores ? ' (new way)' : ' (old way)')
+        $('#btn-refresh-other').find('.extra').text(gon.use_cached_session_scores ? ' (old way)' : ' (new way)')
+      }
+    }
+
+    function registerInfiniteScroll() {
+
+      if(gon.use_cached_session_scores) {
+
+        $scroller.infinitescroll({
+
+          behavior: 'local',
+          navSelector: '#findSession .btn-next-wrapper',
+          nextSelector: '#findSession .btn-next',
+          binder: $scroller,
+          dataType: 'json',
+          appendCallback: false,
+          debug: true,
+          prefill: false,
+          bufferPx:100,
+          loading: {
+            msg: $('<div class="infinite-scroll-loader">Loading ...</div>'),
+            img: '/assets/shared/spinner.gif'
+          },
+          path: function(page) {
+            return '/api/sessions/nindex/' + app.clientId + '?' + $.param(buildQuery());
+          }
+        },function(json, opts) {
+          // Get current page
+          //currentPage = opts.state.currPage;
+          // Do something with JSON data, create DOM elements, etc ..
+          afterLoadScoredSessions(json);
+        });
+      }
+    }
+
+    function events() {
+
+      $('#session-keyword-srch').focus(function () {
+        $(this).val('');
+      });
+
+      $("#session-keyword-srch").keypress(function (evt) {
+        if (evt.which === 13) {
+          evt.preventDefault();
+          search();
+        }
+      });
+
+      $('#btn-refresh').on("click", search);
+
+      tempDebugStuff();
+    }
+
+    /**
+     * Initialize, providing an instance of the SessionLatency class.
+     */
+    function initialize(latency) {
+
+      var screenBindings = {
+        'beforeShow': beforeShow,
+        'afterShow': afterShow
+      };
+      app.bindScreen('findSession', screenBindings);
+
+      if (latency) {
+        sessionLatency = latency;
+      }
+      else {
+        logger.warn("No sessionLatency provided.");
+      }
+
+      sessionList = new context.JK.SessionList(app);
+
+      $next = $('#findSession .btn-next')
+      $scroller = $('#findSession .content-body-scroller');
+      $noMoreSessions = $('#end-of-session-list');
+      events();
+    }
+
+    this.initialize = initialize;
+    this.renderSession = renderSession;
+    this.afterShow = afterShow;
+
+    // Following exposed for easier testing.
+    this.setSession = setSession;
+    this.clearResults = clearResults;
+    this.getCategoryEnum = getCategoryEnum;
+
+    return this;
+  };
+
+})(window, jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/jam_rest.js b/web/app/assets/javascripts/jam_rest.js
index ce4bc3939..79b0c7fca 100644
--- a/web/app/assets/javascripts/jam_rest.js
+++ b/web/app/assets/javascripts/jam_rest.js
@@ -34,17 +34,17 @@
             });
         }
 
-        function findSessions(queryString) {
+        function findSessions(query) {
           return $.ajax({
             type: "GET",
-            url: "/api/sessions?" + queryString
+            url: "/api/sessions?" + $.param(query)
           });
         }
 
-      function findScoredSessions(clientId, queryString) {
+      function findScoredSessions(clientId, query) {
         return $.ajax({
           type: "GET",
-          url: "/api/sessions/nindex/" + clientId + "?" + queryString
+          url: "/api/sessions/nindex/" + clientId + "?" + $.param(query)
         });
       }
 
diff --git a/web/app/assets/javascripts/sessionList.js b/web/app/assets/javascripts/sessionList.js
index a282710e5..cc857545a 100644
--- a/web/app/assets/javascripts/sessionList.js
+++ b/web/app/assets/javascripts/sessionList.js
@@ -61,7 +61,7 @@
             else {
                 latencyDescription = LATENCY.POOR.description;
                 latencyStyle = LATENCY.POOR.style;
-                showJoinLink = false;
+                //showJoinLink = false;
             }
         }
 
diff --git a/web/app/assets/stylesheets/client/findSession.css.scss b/web/app/assets/stylesheets/client/findSession.css.scss
index 396923544..5c4e47c0c 100644
--- a/web/app/assets/stylesheets/client/findSession.css.scss
+++ b/web/app/assets/stylesheets/client/findSession.css.scss
@@ -1,4 +1,4 @@
-div[layout-id="findSession"] {
+#findSession {
 
     th, td { margin: 4px; padding:4px; }
 
@@ -11,36 +11,53 @@ div[layout-id="findSession"] {
     bottom: 0;
     right: 0;
   }
-}
 
-.session-filter {
-	width:100%;
-	padding-top: 11px;
-	padding-bottom: 11px;
-	background-color:#4c4c4c;
-	min-height:20px;
-	overflow-x:visible;
-	vertical-align:middle;
-}
+  .content-body-scroller {
+    overflow:auto !important;
+  }
 
-.session-filter select {
-	background-color:#c5c5c5;
-	border:none;
-	-webkit-box-shadow: inset 2px 2px 3px 0px #888;
-	box-shadow: inset 2px 2px 3px 0px #888;
-	color:#666;
-}
+  .session-filter {
+    width:100%;
+    padding-top: 11px;
+    padding-bottom: 11px;
+    background-color:#4c4c4c;
+    min-height:20px;
+    overflow-x:visible;
+    vertical-align:middle;
+  }
 
-#sessions-none-found {
-  color:#CCCCCC;
-  display:none;
-  overflow: none;
-  margin: auto;
-  position: absolute;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  text-align:center;
-  height:20px;
+  .session-filter select {
+    background-color:#c5c5c5;
+    border:none;
+    -webkit-box-shadow: inset 2px 2px 3px 0px #888;
+    box-shadow: inset 2px 2px 3px 0px #888;
+    color:#666;
+  }
+
+  #sessions-none-found {
+    color:#CCCCCC;
+    display:none;
+    overflow: none;
+    margin: auto;
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    text-align:center;
+    height:20px;
+  }
+
+  #end-of-session-list {
+    display:none;
+    overflow: visibility;
+    margin:40px auto 10px;
+    width:100%;
+    height:20px;
+    text-align:center;
+  }
+
+  .btn-next {
+    display:none;
+  }
 }
\ No newline at end of file
diff --git a/web/app/assets/stylesheets/client/jamkazam.css.scss b/web/app/assets/stylesheets/client/jamkazam.css.scss
index dad78e959..1eadb6116 100644
--- a/web/app/assets/stylesheets/client/jamkazam.css.scss
+++ b/web/app/assets/stylesheets/client/jamkazam.css.scss
@@ -485,6 +485,14 @@ input[type="text"], input[type="password"]{
   background-size: 50% 50%;
 }
 
+.infinite-scroll-loader {
+  position:absolute;
+  overflow:hidden;
+  height:14px;
+  text-align: center;
+  margin:auto;
+  width:100%;
+}
 
 // disable text selection for the in-session panel, ftue, and arbitrary elements marked with .no-selection-range
 div[layout-id=session], div[layout-id=ftue], .no-selection-range {
diff --git a/web/app/controllers/clients_controller.rb b/web/app/controllers/clients_controller.rb
index debfda761..c186e0f64 100644
--- a/web/app/controllers/clients_controller.rb
+++ b/web/app/controllers/clients_controller.rb
@@ -26,6 +26,7 @@ class ClientsController < ApplicationController
     gon.isNativeClient = @nativeClient
 
     gon.use_cached_session_scores = Rails.application.config.use_cached_session_scores
+    gon.allow_both_find_algos = Rails.application.config.allow_both_find_algos
 
     if current_user
       render :layout => 'client'
diff --git a/web/app/views/clients/_findSession.html.erb b/web/app/views/clients/_findSession.html.erb
index 2765fa7a2..c3d48139c 100644
--- a/web/app/views/clients/_findSession.html.erb
+++ b/web/app/views/clients/_findSession.html.erb
@@ -1,5 +1,5 @@
 <!-- Find Session Screen -->
-<div layout="screen" layout-id="findSession" class="screen secondary">
+<div layout="screen" layout-id="findSession" id="findSession" class="screen secondary">
     <div class="content">
         <div class="content-head">
             <div class="content-icon">
@@ -27,7 +27,9 @@
                                 <input id="session-keyword-srch" type="text" name="search" placeholder="Search by Keyword" />
                             </div>
                             <div class="right mr10">
-                                <a id="btn-refresh" href="/client#/findSession" style="text-decoration:none;" class="button-grey">REFRESH</a>
+                              <!-- can be removed once new find session is stable-->
+                              <a id="btn-refresh-other" href="/client#/findSession" style="display:none;text-decoration:none;" class="button-grey">REFRESH<span class="extra"></span></a>
+                              <a id="btn-refresh" href="/client#/findSession" style="text-decoration:none;" class="button-grey">REFRESH<span class="extra"></span></a>
                             </div>
                         </div>
                     </div>
@@ -42,14 +44,18 @@
                             <div id="sessions-other" class="mt35">
                                 <%= render :partial => "sessionList", :locals => {:title => "other sessions", :category => "sessions-other"} %>
                             </div>
+                          <span class="btn-next-wrapper"><a href="/api/sessions/nindex/clientid?page=1" class="btn-next">Next</a></span>
                         </div>
                     </div>
                 </form>
 
-
                 <div id="sessions-none-found">
                     There are currently no public sessions.
                 </div>
+
+                <div id="end-of-session-list">
+                    No more sessions.
+                </div>
             </div>
         </div>
     </div>
@@ -57,7 +63,7 @@
 
 <!-- Session Row Template -->
 <script type="text/template" id="template-session-row">
-    <tr id="{id}" data-sortScore="{sortScore}">
+    <tr id="{id}" class="found-session" data-sortScore="{sortScore}">
         <td width="100">{genres}</td>
         <td width="25%">{description}</td>
         <td width="20%">    
diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb
index 654eb2e3a..34add5744 100644
--- a/web/app/views/clients/index.html.erb
+++ b/web/app/views/clients/index.html.erb
@@ -98,11 +98,13 @@
             JK.currentUserAvatarUrl = JK.resolveAvatarUrl('<%= current_user.photo_url %>');
             JK.currentUserName = '<%= current_user.name %>';
             JK.currentUserMusician = '<%= current_user.musician %>';
+            JK.currentUserAdmin = <%= current_user.admin %>;
         <% else %>
             JK.currentUserId = null;
             JK.currentUserAvatarUrl = null;
             JK.currentUserName = null;
             JK.currentUserMusician = null;
+            JK.currentUserAdmin = false;
         <% end %>
 
         // Some things can't be initialized until we're connected. Put them here.
diff --git a/web/config/application.rb b/web/config/application.rb
index 9bffbb19a..a314c9dca 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -107,8 +107,8 @@ if defined?(Bundler)
       config.websocket_gateway_connect_time_stale = 2
       config.websocket_gateway_connect_time_expire = 5
     else
-      config.websocket_gateway_connect_time_stale = 300
-      config.websocket_gateway_connect_time_expire = 6000
+      config.websocket_gateway_connect_time_stale = 12  # 12 matches production
+      config.websocket_gateway_connect_time_expire = 20 # 20 matches production
     end
     config.websocket_gateway_internal_debug = false
     config.websocket_gateway_port = 6767 + ENV['JAM_INSTANCE'].to_i
@@ -216,6 +216,7 @@ if defined?(Bundler)
     config.use_promos_on_homepage = false
 
     # should we use the new FindSessions API that has server-side scores
-    config.use_cached_session_scores = false
+    config.use_cached_session_scores = true
+    config.allow_both_find_algos = false
   end
 end
diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb
index ebb9ba61e..188a87ed9 100644
--- a/web/config/environments/development.rb
+++ b/web/config/environments/development.rb
@@ -68,8 +68,8 @@ SampleApp::Application.configure do
   # it's nice to have even admin accounts (which all the default ones are) generate GA data for testing
   config.ga_suppress_admin = false
 
-  config.websocket_gateway_connect_time_stale = 16
-  config.websocket_gateway_connect_time_expire = 26
+  config.websocket_gateway_connect_time_stale = 12  # 12 matches production
+  config.websocket_gateway_connect_time_expire = 20 # 20 matches production
 
   config.audiomixer_path = ENV['AUDIOMIXER_PATH'] || audiomixer_workspace_path || "/var/lib/audiomixer/audiomixer/audiomixerapp"
 
@@ -79,5 +79,6 @@ SampleApp::Application.configure do
   # set CREATE_SESSION_AGREEMENT=0 if you don't want the autoclick behavior
   config.autocheck_create_session_agreement = ENV['CREATE_SESSION_AGREEMENT'] ? ENV['CREATE_SESSION_AGREEMENT'] == "1" : true
 
-  config.send_join_session_email_notifications = false
+  config.send_join_session_email_notifications = true
+
 end
diff --git a/web/config/environments/test.rb b/web/config/environments/test.rb
index 4fc00e0c3..d31eb7e24 100644
--- a/web/config/environments/test.rb
+++ b/web/config/environments/test.rb
@@ -68,6 +68,6 @@ SampleApp::Application.configure do
 
   config.use_promos_on_homepage = false
 
-  config.use_cached_session_scores = false
+  config.use_cached_session_scores = true
 end
 
diff --git a/web/config/initializers/dev_users.rb b/web/config/initializers/dev_users.rb
index 8d81037fa..ff921dbd9 100644
--- a/web/config/initializers/dev_users.rb
+++ b/web/config/initializers/dev_users.rb
@@ -9,13 +9,10 @@ if Rails.env == "development" && Rails.application.config.bootstrap_dev_users
       User.create_dev_user("Peter", "Walker", "peter@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_peter.jpg')
       User.create_dev_user("Peter", "Walker", "peter2@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_peter.jpg')
       User.create_dev_user("David", "Wilson", "david@jamkazam.com", "jam123", "Austin", "TX", "US", nil, 'http://www.jamkazam.com/assets/avatars/avatar_david.jpg')
-      User.create_dev_user("Jonathon", "Wilson", "jonathon@jamkazam.com", "jam123", "Bozeman", "MT", "US", [{:instrument_id => "keyboard", :proficiency_level => 4, :priority => 1}], 'http://www.jamkazam.com/assets/avatars/avatar_jonathon.jpg')
       User.create_dev_user("Jonathan", "Kolyer", "jonathan@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil)
       User.create_dev_user("Oswald", "Becca", "os@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil)
       User.create_dev_user("Anthony", "Davis", "anthony@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil)
-      User.create_dev_user("George", "Currie", "george@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil)
       User.create_dev_user("Chris", "Doughty", "chris@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil)
-      User.create_dev_user("Daniel", "Weigh", "daniel@jamkazam.com", "jam123", "Austin", "TX", "US", nil, nil)
   end
 
 
diff --git a/web/spec/features/find_sessions_spec.rb b/web/spec/features/find_sessions_spec.rb
index 680add9fc..11be5c7cb 100644
--- a/web/spec/features/find_sessions_spec.rb
+++ b/web/spec/features/find_sessions_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Find Session", :js => true, :type => :feature, :capybara_feature => true do
+describe "Find Session", :js => true, :type => :feature, :capybara_feature => true, :slow => true do
 
   subject { page }
 
@@ -15,22 +15,54 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
 
   before(:each) do
     UserMailer.deliveries.clear
+    MusicSession.delete_all
+    sign_in_poltergeist user
+    visit "/client#/findSession"
   end
 
   # when no sessions have been created:
   it "shows there are no sessions" do
-
-    MusicSession.delete_all
-
-    sign_in_poltergeist user
-    visit "/client#/findSession"
-
     # verify no sessions are found
     expect(page).to have_selector('#sessions-none-found')
   end
 
-
-  it "finds another public session", :slow => true do
+  it "finds another public session"  do
     create_join_session(user, [finder])
   end
+
+  describe "listing behavior" do
+
+    describe "one slush session" do
+      before do
+        @session1 = FactoryGirl.create(:single_user_session)
+      end
+
+      it "find general population user" do
+        find('#btn-refresh').trigger(:click)
+        sleep 1
+        find('div#sessions-other')
+        page.all('div#sessions-other .found-session').count.should == 1
+      end
+
+      describe "tons of slush sessions" do
+        before do
+          20.times do
+            FactoryGirl.create(:single_user_session)
+          end
+        end
+
+        it "find many general users" do
+          find('#btn-refresh').trigger(:click)
+          sleep 1
+          find('div#sessions-other')
+          page.all('div#sessions-other .found-session').count.should == 20
+
+          # attempt to scroll down--the end of session list should show, and there should now be 21 items
+          page.execute_script('jQuery("#findSession .content-body-scroller").scrollTo("100%",100)') #scroll to the bottom of the element
+          find('#end-of-session-list')
+          page.all('div#sessions-other .found-session').count.should == 21
+        end
+      end
+    end
+  end
 end
diff --git a/web/vendor/assets/javascripts/jquery.infinitescroll.js b/web/vendor/assets/javascripts/jquery.infinitescroll.js
new file mode 100644
index 000000000..5801ef2b7
--- /dev/null
+++ b/web/vendor/assets/javascripts/jquery.infinitescroll.js
@@ -0,0 +1,814 @@
+/*jshint undef: true */
+/*global jQuery: true */
+
+/*
+   --------------------------------
+   Infinite Scroll
+   --------------------------------
+   + https://github.com/paulirish/infinite-scroll
+   + version 2.0b2.120519
+   + Copyright 2011/12 Paul Irish & Luke Shumard
+   + Licensed under the MIT license
+
+   + Documentation: http://infinite-scroll.com/
+*/
+
+(function (window, $, undefined) {
+	"use strict";
+
+    $.infinitescroll = function infscr(options, callback, element) {
+        this.element = $(element);
+
+        // Flag the object in the event of a failed creation
+        if (!this._create(options, callback)) {
+            this.failed = true;
+        }
+    };
+
+    $.infinitescroll.defaults = {
+        loading: {
+            finished: undefined,
+            finishedMsg: "<em>Congratulations, you've reached the end of the internet.</em>",
+			img: "data:image/gif;base64,R0lGODlh3AATAPQeAPDy+MnQ6LW/4N3h8MzT6rjC4sTM5r/I5NHX7N7j8c7U6tvg8OLl8uXo9Ojr9b3G5MfP6Ovu9tPZ7PT1+vX2+tbb7vf4+8/W69jd7rC73vn5/O/x+K243ai02////wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQECgD/ACwAAAAA3AATAAAF/6AnjmRpnmiqrmzrvnAsz3Rt33iu73zv/8CgcEj0BAScpHLJbDqf0Kh0Sq1ar9isdioItAKGw+MAKYMFhbF63CW438f0mg1R2O8EuXj/aOPtaHx7fn96goR4hmuId4qDdX95c4+RBIGCB4yAjpmQhZN0YGYGXitdZBIVGAsLoq4BBKQDswm1CQRkcG6ytrYKubq8vbfAcMK9v7q7EMO1ycrHvsW6zcTKsczNz8HZw9vG3cjTsMIYqQkCLBwHCgsMDQ4RDAYIqfYSFxDxEfz88/X38Onr16+Bp4ADCco7eC8hQYMAEe57yNCew4IVBU7EGNDiRn8Z831cGLHhSIgdFf9chIeBg7oA7gjaWUWTVQAGE3LqBDCTlc9WOHfm7PkTqNCh54rePDqB6M+lR536hCpUqs2gVZM+xbrTqtGoWqdy1emValeXKzggYBBB5y1acFNZmEvXAoN2cGfJrTv3bl69Ffj2xZt3L1+/fw3XRVw4sGDGcR0fJhxZsF3KtBTThZxZ8mLMgC3fRatCbYMNFCzwLEqLgE4NsDWs/tvqdezZf13Hvk2A9Szdu2X3pg18N+68xXn7rh1c+PLksI/Dhe6cuO3ow3NfV92bdArTqC2Ebd3A8vjf5QWfH6Bg7Nz17c2fj69+fnq+8N2Lty+fuP78/eV2X13neIcCeBRwxorbZrA1ANoCDGrgoG8RTshahQ9iSKEEzUmYIYfNWViUhheCGJyIP5E4oom7WWjgCeBFAJNv1DVV01MAdJhhjdkplWNzO/5oXI846njjVEIqR2OS2B1pE5PVscajkxhMycqLJghQSwT40PgfAl4GqNSXYdZXJn5gSkmmmmJu1aZYb14V51do+pTOCmA40AqVCIhG5IJ9PvYnhIFOxmdqhpaI6GeHCtpooisuutmg+Eg62KOMKuqoTaXgicQWoIYq6qiklmoqFV0UoeqqrLbq6quwxirrrLTWauutJ4QAACH5BAUKABwALAcABADOAAsAAAX/IPd0D2dyRCoUp/k8gpHOKtseR9yiSmGbuBykler9XLAhkbDavXTL5k2oqFqNOxzUZPU5YYZd1XsD72rZpBjbeh52mSNnMSC8lwblKZGwi+0QfIJ8CncnCoCDgoVnBHmKfByGJimPkIwtiAeBkH6ZHJaKmCeVnKKTHIihg5KNq4uoqmEtcRUtEREMBggtEr4QDrjCuRC8h7/BwxENeicSF8DKy82pyNLMOxzWygzFmdvD2L3P0dze4+Xh1Arkyepi7dfFvvTtLQkZBC0T/FX3CRgCMOBHsJ+EHYQY7OinAGECgQsB+Lu3AOK+CewcWjwxQeJBihtNGHSoQOE+iQ3//4XkwBBhRZMcUS6YSXOAwIL8PGqEaSJCiYt9SNoCmnJPAgUVLChdaoFBURN8MAzl2PQphwQLfDFd6lTowglHve6rKpbjhK7/pG5VinZP1qkiz1rl4+tr2LRwWU64cFEihwEtZgbgR1UiHaMVvxpOSwBA37kzGz9e8G+B5MIEKLutOGEsAH2ATQwYfTmuX8aETWdGPZmiZcccNSzeTCA1Sw0bdiitC7LBWgu8jQr8HRzqgpK6gX88QbrB14z/kF+ELpwB8eVQj/JkqdylAudji/+ts3039vEEfK8Vz2dlvxZKG0CmbkKDBvllRd6fCzDvBLKBDSCeffhRJEFebFk1k/Mv9jVIoIJZSeBggwUaNeB+Qk34IE0cXlihcfRxkOAJFFhwGmKlmWDiakZhUJtnLBpnWWcnKaAZcxI0piFGGLBm1mc90kajSCveeBVWKeYEoU2wqeaQi0PetoE+rr14EpVC7oAbAUHqhYExbn2XHHsVqbcVew9tx8+XJKk5AZsqqdlddGpqAKdbAYBn1pcczmSTdWvdmZ17c1b3FZ99vnTdCRFM8OEcAhLwm1NdXnWcBBSMRWmfkWZqVlsmLIiAp/o1gGV2vpS4lalGYsUOqXrddcKCmK61aZ8SjEpUpVFVoCpTj4r661Km7kBHjrDyc1RAIQAAIfkEBQoAGwAsBwAEAM4ACwAABf/gtmUCd4goQQgFKj6PYKi0yrrbc8i4ohQt12EHcal+MNSQiCP8gigdz7iCioaCIvUmZLp8QBzW0EN2vSlCuDtFKaq4RyHzQLEKZNdiQDhRDVooCwkbfm59EAmKi4SGIm+AjIsKjhsqB4mSjT2IOIOUnICeCaB/mZKFNTSRmqVpmJqklSqskq6PfYYCDwYHDC4REQwGCBLGxxIQDsHMwhAIX8bKzcENgSLGF9PU1j3Sy9zX2NrgzQziChLk1BHWxcjf7N046tvN82715czn9Pryz6Ilc4ACj4EBOCZM8KEnAYYADBRKnACAYUMFv1wotIhCEcaJCisqwJFgAUSQGyX/kCSVUUTIdKMwJlyo0oXHlhskwrTJciZHEXsgaqS4s6PJiCAr1uzYU8kBBSgnWFqpoMJMUjGtDmUwkmfVmVypakWhEKvXsS4nhLW5wNjVroJIoc05wSzTr0PtiigpYe4EC2vj4iWrFu5euWIMRBhacaVJhYQBEFjA9jHjyQ0xEABwGceGAZYjY0YBOrRLCxUp29QM+bRkx5s7ZyYgVbTqwwti2ybJ+vLtDYpycyZbYOlptxdx0kV+V7lC5iJAyyRrwYKxAdiz82ng0/jnAdMJFz0cPi104Ec1Vj9/M6F173vKL/feXv156dw11tlqeMMnv4V5Ap53GmjQQH97nFfg+IFiucfgRX5Z8KAgbUlQ4IULIlghhhdOSB6AgX0IVn8eReghen3NRIBsRgnH4l4LuEidZBjwRpt6NM5WGwoW0KSjCwX6yJSMab2GwwAPDXfaBCtWpluRTQqC5JM5oUZAjUNS+VeOLWpJEQ7VYQANW0INJSZVDFSnZphjSikfmzE5N4EEbQI1QJmnWXCmHulRp2edwDXF43txukenJwvI9xyg9Q26Z3MzGUcBYFEChZh6DVTq34AU8Iflh51Sd+CnKFYQ6mmZkhqfBKfSxZWqA9DZanWjxmhrWwi0qtCrt/43K6WqVjjpmhIqgEGvculaGKklKstAACEAACH5BAUKABwALAcABADOAAsAAAX/ICdyQmaMYyAUqPgIBiHPxNpy79kqRXH8wAPsRmDdXpAWgWdEIYm2llCHqjVHU+jjJkwqBTecwItShMXkEfNWSh8e1NGAcLgpDGlRgk7EJ/6Ae3VKfoF/fDuFhohVeDeCfXkcCQqDVQcQhn+VNDOYmpSWaoqBlUSfmowjEA+iEAEGDRGztAwGCDcXEA60tXEiCrq8vREMEBLIyRLCxMWSHMzExnbRvQ2Sy7vN0zvVtNfU2tLY3rPgLdnDvca4VQS/Cpk3ABwSLQkYAQwT/P309vcI7OvXr94jBQMJ/nskkGA/BQBRLNDncAIAiDcG6LsxAWOLiQzmeURBKWSLCQbv/1F0eDGinJUKR47YY1IEgQASKk7Yc7ACRwZm7mHweRJoz59BJUogisKCUaFMR0x4SlJBVBFTk8pZivTR0K73rN5wqlXEAq5Fy3IYgHbEzQ0nLy4QSoCjXLoom96VOJEeCosK5n4kkFfqXjl94wa+l1gvAcGICbewAOAxY8l/Ky/QhAGz4cUkGxu2HNozhwMGBnCUqUdBg9UuW9eUynqSwLHIBujePef1ZGQZXcM+OFuEBeBhi3OYgLyqcuaxbT9vLkf4SeqyWxSQpKGB2gQpm1KdWbu72rPRzR9Ne2Nu9Kzr/1Jqj0yD/fvqP4aXOt5sW/5qsXXVcv1Nsp8IBUAmgswGF3llGgeU1YVXXKTN1FlhWFXW3gIE+DVChApysACHHo7Q4A35lLichh+ROBmLKAzgYmYEYDAhCgxKGOOMn4WR4kkDaoBBOxJtdNKQxFmg5JIWIBnQc07GaORfUY4AEkdV6jHlCEISSZ5yTXpp1pbGZbkWmcuZmQCaE6iJ0FhjMaDjTMsgZaNEHFRAQVp3bqXnZED1qYcECOz5V6BhSWCoVJQIKuKQi2KFKEkEFAqoAo7uYSmO3jk61wUUMKmknJ4SGimBmAa0qVQBhAAAIfkEBQoAGwAsBwAEAM4ACwAABf/gJm5FmRlEqhJC+bywgK5pO4rHI0D3pii22+Mg6/0Ej96weCMAk7cDkXf7lZTTnrMl7eaYoy10JN0ZFdco0XAuvKI6qkgVFJXYNwjkIBcNBgR8TQoGfRsJCRuCYYQQiI+ICosiCoGOkIiKfSl8mJkHZ4U9kZMbKaI3pKGXmJKrngmug4WwkhA0lrCBWgYFCCMQFwoQDRHGxwwGCBLMzRLEx8iGzMMO0cYNeCMKzBDW19lnF9DXDIY/48Xg093f0Q3s1dcR8OLe8+Y91OTv5wrj7o7B+7VNQqABIoRVCMBggsOHE36kSoCBIcSH3EbFangxogJYFi8CkJhqQciLJEf/LDDJEeJIBT0GsOwYUYJGBS0fjpQAMidGmyVP6sx4Y6VQhzs9VUwkwqaCCh0tmKoFtSMDmBOf9phg4SrVrROuasRQAaxXpVUhdsU6IsECZlvX3kwLUWzRt0BHOLTbNlbZG3vZinArge5Dvn7wbqtQkSYAAgtKmnSsYKVKo2AfW048uaPmG386i4Q8EQMBAIAnfB7xBxBqvapJ9zX9WgRS2YMpnvYMGdPK3aMjt/3dUcNI4blpj7iwkMFWDXDvSmgAlijrt9RTR78+PS6z1uAJZIe93Q8g5zcsWCi/4Y+C8bah5zUv3vv89uft30QP23punGCx5954oBBwnwYaNCDY/wYrsYeggnM9B2Fpf8GG2CEUVWhbWAtGouEGDy7Y4IEJVrbSiXghqGKIo7z1IVcXIkKWWR361QOLWWnIhwERpLaaCCee5iMBGJQmJGyPFTnbkfHVZGRtIGrg5HALEJAZbu39BuUEUmq1JJQIPtZilY5hGeSWsSk52G9XqsmgljdIcABytq13HyIM6RcUA+r1qZ4EBF3WHWB29tBgAzRhEGhig8KmqKFv8SeCeo+mgsF7YFXa1qWSbkDpom/mqR1PmHCqJ3fwNRVXjC7S6CZhFVCQ2lWvZiirhQq42SACt25IK2hv8TprriUV1usGgeka7LFcNmCldMLi6qZMgFLgpw16Cipb7bC1knXsBiEAACH5BAUKABsALAcABADOAAsAAAX/4FZsJPkUmUGsLCEUTywXglFuSg7fW1xAvNWLF6sFFcPb42C8EZCj24EJdCp2yoegWsolS0Uu6fmamg8n8YYcLU2bXSiRaXMGvqV6/KAeJAh8VgZqCX+BexCFioWAYgqNi4qAR4ORhRuHY408jAeUhAmYYiuVlpiflqGZa5CWkzc5fKmbbhIpsAoQDRG8vQwQCBLCwxK6vb5qwhfGxxENahvCEA7NzskSy7vNzzzK09W/PNHF1NvX2dXcN8K55cfh69Luveol3vO8zwi4Yhj+AQwmCBw4IYclDAAJDlQggVOChAoLKkgFkSCAHDwWLKhIEOONARsDKryogFPIiAUb/95gJNIiw4wnI778GFPhzBKFOAq8qLJEhQpiNArjMcHCmlTCUDIouTKBhApELSxFWiGiVKY4E2CAekPgUphDu0742nRrVLJZnyrFSqKQ2ohoSYAMW6IoDpNJ4bLdILTnAj8KUF7UeENjAKuDyxIgOuGiOI0EBBMgLNew5AUrDTMGsFixwBIaNCQuAXJB57qNJ2OWm2Aj4skwCQCIyNkhhtMkdsIuodE0AN4LJDRgfLPtn5YDLdBlraAByuUbBgxQwICxMOnYpVOPej074OFdlfc0TqC62OIbcppHjV4o+LrieWhfT8JC/I/T6W8oCl29vQ0XjLdBaA3s1RcPBO7lFvpX8BVoG4O5jTXRQRDuJ6FDTzEWF1/BCZhgbyAKE9qICYLloQYOFtahVRsWYlZ4KQJHlwHS/IYaZ6sZd9tmu5HQm2xi1UaTbzxYwJk/wBF5g5EEYOBZeEfGZmNdFyFZmZIR4jikbLThlh5kUUVJGmRT7sekkziRWUIACABk3T4qCsedgO4xhgGcY7q5pHJ4klBBTQRJ0CeHcoYHHUh6wgfdn9uJdSdMiebGJ0zUPTcoS286FCkrZxnYoYYKWLkBowhQoBeaOlZAgVhLidrXqg2GiqpQpZ4apwSwRtjqrB3muoF9BboaXKmshlqWqsWiGt2wphJkQbAU5hoCACH5BAUKABsALAcABADOAAsAAAX/oGFw2WZuT5oZROsSQnGaKjRvilI893MItlNOJ5v5gDcFrHhKIWcEYu/xFEqNv6B1N62aclysF7fsZYe5aOx2yL5aAUGSaT1oTYMBwQ5VGCAJgYIJCnx1gIOBhXdwiIl7d0p2iYGQUAQBjoOFSQR/lIQHnZ+Ue6OagqYzSqSJi5eTpTxGcjcSChANEbu8DBAIEsHBChe5vL13G7fFuscRDcnKuM3H0La3EA7Oz8kKEsXazr7Cw9/Gztar5uHHvte47MjktznZ2w0G1+D3BgirAqJmJMAQgMGEgwgn5Ei0gKDBhBMALGRYEOJBb5QcWlQo4cbAihZz3GgIMqFEBSM1/4ZEOWPAgpIIJXYU+PIhRG8ja1qU6VHlzZknJNQ6UanCjQkWCIGSUGEjAwVLjc44+DTqUQtPPS5gejUrTa5TJ3g9sWCr1BNUWZI161StiQUDmLYdGfesibQ3XMq1OPYthrwuA2yU2LBs2cBHIypYQPPlYAKFD5cVvNPtW8eVGbdcQADATsiNO4cFAPkvHpedPzc8kUcPgNGgZ5RNDZG05reoE9s2vSEP79MEGiQGy1qP8LA4ZcdtsJE48ONoLTBtTV0B9LsTnPceoIDBDQvS7W7vfjVY3q3eZ4A339J4eaAmKqU/sV58HvJh2RcnIBsDUw0ABqhBA5aV5V9XUFGiHfVeAiWwoFgJJrIXRH1tEMiDFV4oHoAEGlaWhgIGSGBO2nFomYY3mKjVglidaNYJGJDkWW2xxTfbjCbVaOGNqoX2GloR8ZeTaECS9pthRGJH2g0b3Agbk6hNANtteHD2GJUucfajCQBy5OOTQ25ZgUPvaVVQmbKh9510/qQpwXx3SQdfk8tZJOd5b6JJFplT3ZnmmX3qd5l1eg5q00HrtUkUn0AKaiGjClSAgKLYZcgWXwocGRcCFGCKwSB6ceqphwmYRUFYT/1WKlOdUpipmxW0mlCqHjYkAaeoZlqrqZ4qd+upQKaapn/AmgAegZ8KUtYtFAQQAgAh+QQFCgAbACwHAAQAzgALAAAF/+C2PUcmiCiZGUTrEkKBis8jQEquKwU5HyXIbEPgyX7BYa5wTNmEMwWsSXsqFbEh8DYs9mrgGjdK6GkPY5GOeU6ryz7UFopSQEzygOGhJBjoIgMDBAcBM0V/CYqLCQqFOwobiYyKjn2TlI6GKC2YjJZknouaZAcQlJUHl6eooJwKooobqoewrJSEmyKdt59NhRKFMxLEEA4RyMkMEAjDEhfGycqAG8TQx9IRDRDE3d3R2ctD1RLg0ttKEnbY5wZD3+zJ6M7X2RHi9Oby7u/r9g38UFjTh2xZJBEBMDAboogAgwkQI07IMUORwocSJwCgWDFBAIwZOaJIsOBjRogKJP8wTODw5ESVHVtm3AhzpEeQElOuNDlTZ0ycEUWKWFASqEahGwYUPbnxoAgEdlYSqDBkgoUNClAlIHbSAoOsqCRQnQHxq1axVb06FWFxLIqyaze0Tft1JVqyE+pWXMD1pF6bYl3+HTqAWNW8cRUFzmih0ZAAB2oGKukSAAGGRHWJgLiR6AylBLpuHKKUMlMCngMpDSAa9QIUggZVVvDaJobLeC3XZpvgNgCmtPcuwP3WgmXSq4do0DC6o2/guzcseECtUoO0hmcsGKDgOt7ssBd07wqesAIGZC1YIBa7PQHvb1+SFo+++HrJSQfB33xfav3i5eX3Hnb4CTJgegEq8tH/YQEOcIJzbm2G2EoYRLgBXFpVmFYDcREV4HIcnmUhiGBRouEMJGJGzHIspqgdXxK0yCKHRNXoIX4uorCdTyjkyNtdPWrA4Up82EbAbzMRxxZRR54WXVLDIRmRcag5d2R6ugl3ZXzNhTecchpMhIGVAKAYpgJjjsSklBEd99maZoo535ZvdamjBEpusJyctg3h4X8XqodBMx0tiNeg/oGJaKGABpogS40KSqiaEgBqlQWLUtqoVQnytekEjzo0hHqhRorppOZt2p923M2AAV+oBtpAnnPNoB6HaU6mAAIU+IXmi3j2mtFXuUoHKwXpzVrsjcgGOauKEjQrwq157hitGq2NoWmjh7z6Wmxb0m5w66+2VRAuXN/yFUAIACH5BAUKABsALAcABADOAAsAAAX/4CZuRiaM45MZqBgIRbs9AqTcuFLE7VHLOh7KB5ERdjJaEaU4ClO/lgKWjKKcMiJQ8KgumcieVdQMD8cbBeuAkkC6LYLhOxoQ2PF5Ys9PKPBMen17f0CCg4VSh32JV4t8jSNqEIOEgJKPlkYBlJWRInKdiJdkmQlvKAsLBxdABA4RsbIMBggtEhcQsLKxDBC2TAS6vLENdJLDxMZAubu8vjIbzcQRtMzJz79S08oQEt/guNiyy7fcvMbh4OezdAvGrakLAQwyABsELQkY9BP+//ckyPDD4J9BfAMh1GsBoImMeQUN+lMgUJ9CiRMa5msxoB9Gh/o8GmxYMZXIgxtR/yQ46S/gQAURR0pDwYDfywoyLPip5AdnCwsMFPBU4BPFhKBDi444quCmDKZOfwZ9KEGpCKgcN1jdALSpPqIYsabS+nSqvqplvYqQYAeDPgwKwjaMtiDl0oaqUAyo+3TuWwUAMPpVCfee0cEjVBGQq2ABx7oTWmQk4FglZMGN9fGVDMCuiH2AOVOu/PmyxM630gwM0CCn6q8LjVJ8GXvpa5Uwn95OTC/nNxkda1/dLSK475IjCD6dHbK1ZOa4hXP9DXs5chJ00UpVm5xo2qRpoxptwF2E4/IbJpB/SDz9+q9b1aNfQH08+p4a8uvX8B53fLP+ycAfemjsRUBgp1H20K+BghHgVgt1GXZXZpZ5lt4ECjxYR4ScUWiShEtZqBiIInRGWnERNnjiBglw+JyGnxUmGowsyiiZg189lNtPGACjV2+S9UjbU0JWF6SPvEk3QZEqsZYTk3UAaRSUnznJI5LmESCdBVSyaOWUWLK4I5gDUYVeV1T9l+FZClCAUVA09uSmRHBCKAECFEhW51ht6rnmWBXkaR+NjuHpJ40D3DmnQXt2F+ihZxlqVKOfQRACACH5BAUKABwALAcABADOAAsAAAX/ICdyUCkUo/g8mUG8MCGkKgspeC6j6XEIEBpBUeCNfECaglBcOVfJFK7YQwZHQ6JRZBUqTrSuVEuD3nI45pYjFuWKvjjSkCoRaBUMWxkwBGgJCXspQ36Bh4EEB0oKhoiBgyNLjo8Ki4QElIiWfJqHnISNEI+Ql5J9o6SgkqKkgqYihamPkW6oNBgSfiMMDQkGCBLCwxIQDhHIyQwQCGMKxsnKVyPCF9DREQ3MxMPX0cu4wt7J2uHWx9jlKd3o39MiuefYEcvNkuLt5O8c1ePI2tyELXGQwoGDAQf+iEC2xByDCRAjTlAgIUWCBRgCPJQ4AQBFXAs0coT40WLIjRxL/47AcHLkxIomRXL0CHPERZkpa4q4iVKiyp0tR/7kwHMkTUBBJR5dOCEBAVcKKtCAyOHpowXCpk7goABqBZdcvWploACpBKkpIJI1q5OD2rIWE0R1uTZu1LFwbWL9OlKuWb4c6+o9i3dEgw0RCGDUG9KlRw56gDY2qmCByZBaASi+TACA0TucAaTteCcy0ZuOK3N2vJlx58+LRQyY3Xm0ZsgjZg+oPQLi7dUcNXi0LOJw1pgNtB7XG6CBy+U75SYfPTSQAgZTNUDnQHt67wnbZyvwLgKiMN3oCZB3C76tdewpLFgIP2C88rbi4Y+QT3+8S5USMICZXWj1pkEDeUU3lOYGB3alSoEiMIjgX4WlgNF2EibIwQIXauWXSRg2SAOHIU5IIIMoZkhhWiJaiFVbKo6AQEgQXrTAazO1JhkBrBG3Y2Y6EsUhaGn95hprSN0oWpFE7rhkeaQBchGOEWnwEmc0uKWZj0LeuNV3W4Y2lZHFlQCSRjTIl8uZ+kG5HU/3sRlnTG2ytyadytnD3HrmuRcSn+0h1dycexIK1KCjYaCnjCCVqOFFJTZ5GkUUjESWaUIKU2lgCmAKKQIUjHapXRKE+t2og1VgankNYnohqKJ2CmKplso6GKz7WYCgqxeuyoF8u9IQAgA7",
+            msg: null,
+            msgText: "<em>Loading the next set of posts...</em>",
+            selector: null,
+            speed: 'fast',
+            start: undefined
+        },
+        state: {
+            isDuringAjax: false,
+            isInvalidPage: false,
+            isDestroyed: false,
+            isDone: false, // For when it goes all the way through the archive.
+            isPaused: false,
+            isBeyondMaxPage: false,
+            currPage: 1
+        },
+        debug: false,
+		behavior: undefined,
+        binder: $(window), // used to cache the selector
+        nextSelector: "div.navigation a:first",
+        navSelector: "div.navigation",
+        contentSelector: null, // rename to pageFragment
+        extraScrollPx: 150,
+        itemSelector: "div.post",
+        animate: false,
+        pathParse: undefined,
+        dataType: 'html',
+        appendCallback: true,
+        bufferPx: 40,
+        errorCallback: function () { },
+        infid: 0, //Instance ID
+        pixelsFromNavToBottom: undefined,
+        path: undefined, // Either parts of a URL as an array (e.g. ["/page/", "/"] or a function that takes in the page number and returns a URL
+		prefill: false, // When the document is smaller than the window, load data until the document is larger or links are exhausted
+        maxPage: undefined // to manually control maximum page (when maxPage is undefined, maximum page limitation is not work)
+	};
+
+    $.infinitescroll.prototype = {
+
+        /*	
+            ----------------------------
+            Private methods
+            ----------------------------
+            */
+
+        // Bind or unbind from scroll
+        _binding: function infscr_binding(binding) {
+
+            var instance = this,
+            opts = instance.options;
+
+            opts.v = '2.0b2.120520';
+
+            // if behavior is defined and this function is extended, call that instead of default
+            if (!!opts.behavior && this['_binding_'+opts.behavior] !== undefined) {
+                this['_binding_'+opts.behavior].call(this);
+                return;
+            }
+
+            if (binding !== 'bind' && binding !== 'unbind') {
+                this._debug('Binding value  ' + binding + ' not valid');
+                return false;
+            }
+
+            if (binding === 'unbind') {
+                (this.options.binder).unbind('smartscroll.infscr.' + instance.options.infid);
+            } else {
+                (this.options.binder)[binding]('smartscroll.infscr.' + instance.options.infid, function () {
+                    instance.scroll();
+                });
+            }
+
+            this._debug('Binding', binding);
+        },
+
+        // Fundamental aspects of the plugin are initialized
+        _create: function infscr_create(options, callback) {
+
+            // Add custom options to defaults
+            var opts = $.extend(true, {}, $.infinitescroll.defaults, options);
+			this.options = opts;
+			var $window = $(window);
+			var instance = this;
+
+			// Validate selectors
+            if (!instance._validate(options)) {
+				return false;
+			}
+
+            // Validate page fragment path
+            var path = $(opts.nextSelector).attr('href');
+            if (!path) {
+                this._debug('Navigation selector not found');
+                return false;
+            }
+
+            // Set the path to be a relative URL from root.
+            opts.path = opts.path || this._determinepath(path);
+
+            // contentSelector is 'page fragment' option for .load() / .ajax() calls
+            opts.contentSelector = opts.contentSelector || this.element;
+
+            // loading.selector - if we want to place the load message in a specific selector, defaulted to the contentSelector
+            opts.loading.selector = opts.loading.selector || opts.contentSelector;
+
+            // Define loading.msg
+            opts.loading.msg = opts.loading.msg || $('<div id="infscr-loading"><img alt="Loading..." src="' + opts.loading.img + '" /><div>' + opts.loading.msgText + '</div></div>');
+
+            // Preload loading.img
+            (new Image()).src = opts.loading.img;
+
+            // distance from nav links to bottom
+            // computed as: height of the document + top offset of container - top offset of nav link
+            if(opts.pixelsFromNavToBottom === undefined) {
+				opts.pixelsFromNavToBottom = $(document).height() - $(opts.navSelector).offset().top;
+				this._debug("pixelsFromNavToBottom: " + opts.pixelsFromNavToBottom);
+			}
+
+			var self = this;
+
+            // determine loading.start actions
+            opts.loading.start = opts.loading.start || function() {
+                $(opts.navSelector).hide();
+                opts.loading.msg
+                .appendTo(opts.loading.selector)
+                .show(opts.loading.speed, $.proxy(function() {
+					this.beginAjax(opts);
+				}, self));
+            };
+
+            // determine loading.finished actions
+            opts.loading.finished = opts.loading.finished || function() {
+                if (!opts.state.isBeyondMaxPage)
+                    opts.loading.msg.fadeOut(opts.loading.speed);
+            };
+
+			// callback loading
+            opts.callback = function(instance, data, url) {
+                if (!!opts.behavior && instance['_callback_'+opts.behavior] !== undefined) {
+                    instance['_callback_'+opts.behavior].call($(opts.contentSelector)[0], data, url);
+                }
+
+                if (callback) {
+                    callback.call($(opts.contentSelector)[0], data, opts, url);
+                }
+
+				if (opts.prefill) {
+					$window.bind("resize.infinite-scroll", instance._prefill);
+				}
+            };
+
+			if (options.debug) {
+				// Tell IE9 to use its built-in console
+				if (Function.prototype.bind && (typeof console === 'object' || typeof console === 'function') && typeof console.log === "object") {
+					["log","info","warn","error","assert","dir","clear","profile","profileEnd"]
+						.forEach(function (method) {
+							console[method] = this.call(console[method], console);
+						}, Function.prototype.bind);
+				}
+			}
+
+            this._setup();
+
+			// Setups the prefill method for use
+			if (opts.prefill) {
+				this._prefill();
+			}
+
+            // Return true to indicate successful creation
+            return true;
+        },
+
+		_prefill: function infscr_prefill() {
+			var instance = this;
+			var $window = $(window);
+
+			function needsPrefill() {
+				return (instance.options.contentSelector.height() <= $window.height());
+			}
+
+			this._prefill = function() {
+				if (needsPrefill()) {
+					instance.scroll();
+				}
+
+				$window.bind("resize.infinite-scroll", function() {
+					if (needsPrefill()) {
+						$window.unbind("resize.infinite-scroll");
+						instance.scroll();
+					}
+				});
+			};
+
+			// Call self after setting up the new function
+			this._prefill();
+		},
+
+        // Console log wrapper
+        _debug: function infscr_debug() {
+			if (true !== this.options.debug) {
+				return;
+			}
+
+			if (typeof console !== 'undefined' && typeof console.log === 'function') {
+				// Modern browsers
+				// Single argument, which is a string
+				if ((Array.prototype.slice.call(arguments)).length === 1 && typeof Array.prototype.slice.call(arguments)[0] === 'string') {
+					console.log( (Array.prototype.slice.call(arguments)).toString() );
+				} else {
+					console.log( Array.prototype.slice.call(arguments) );
+				}
+			} else if (!Function.prototype.bind && typeof console !== 'undefined' && typeof console.log === 'object') {
+				// IE8
+				Function.prototype.call.call(console.log, console, Array.prototype.slice.call(arguments));
+			}
+        },
+
+        // find the number to increment in the path.
+        _determinepath: function infscr_determinepath(path) {
+
+            var opts = this.options;
+
+            // if behavior is defined and this function is extended, call that instead of default
+            if (!!opts.behavior && this['_determinepath_'+opts.behavior] !== undefined) {
+                return this['_determinepath_'+opts.behavior].call(this,path);
+            }
+
+            if (!!opts.pathParse) {
+
+                this._debug('pathParse manual');
+                return opts.pathParse(path, this.options.state.currPage+1);
+
+            } else if (path.match(/^(.*?)\b2\b(.*?$)/)) {
+                path = path.match(/^(.*?)\b2\b(.*?$)/).slice(1);
+
+                // if there is any 2 in the url at all.    
+            } else if (path.match(/^(.*?)2(.*?$)/)) {
+
+                // page= is used in django:
+                // http://www.infinite-scroll.com/changelog/comment-page-1/#comment-127
+                if (path.match(/^(.*?page=)2(\/.*|$)/)) {
+                    path = path.match(/^(.*?page=)2(\/.*|$)/).slice(1);
+                    return path;
+                }
+
+                path = path.match(/^(.*?)2(.*?$)/).slice(1);
+
+            } else {
+
+                // page= is used in drupal too but second page is page=1 not page=2:
+                // thx Jerod Fritz, vladikoff
+                if (path.match(/^(.*?page=)1(\/.*|$)/)) {
+                    path = path.match(/^(.*?page=)1(\/.*|$)/).slice(1);
+                    return path;
+                } else {
+                    this._debug('Sorry, we couldn\'t parse your Next (Previous Posts) URL. Verify your the css selector points to the correct A tag. If you still get this error: yell, scream, and kindly ask for help at infinite-scroll.com.');
+                    // Get rid of isInvalidPage to allow permalink to state
+                    opts.state.isInvalidPage = true;  //prevent it from running on this page.
+                }
+            }
+            this._debug('determinePath', path);
+            return path;
+
+        },
+
+        // Custom error
+        _error: function infscr_error(xhr) {
+
+            var opts = this.options;
+
+            // if behavior is defined and this function is extended, call that instead of default
+            if (!!opts.behavior && this['_error_'+opts.behavior] !== undefined) {
+                this['_error_'+opts.behavior].call(this,xhr);
+                return;
+            }
+
+            if (xhr !== 'destroy' && xhr !== 'end') {
+                xhr = 'unknown';
+            }
+
+            this._debug('Error', xhr);
+
+            if (xhr === 'end' || opts.state.isBeyondMaxPage) {
+                this._showdonemsg();
+            }
+
+            opts.state.isDone = true;
+            opts.state.currPage = 1; // if you need to go back to this instance
+            opts.state.isPaused = false;
+            opts.state.isBeyondMaxPage = false;
+            this._binding('unbind');
+
+        },
+
+        // Load Callback
+        _loadcallback: function infscr_loadcallback(box, data, url) {
+            var opts = this.options,
+            callback = this.options.callback, // GLOBAL OBJECT FOR CALLBACK
+            result = (opts.state.isDone) ? 'done' : (!opts.appendCallback) ? 'no-append' : 'append',
+            frag;
+
+            // if behavior is defined and this function is extended, call that instead of default
+            if (!!opts.behavior && this['_loadcallback_'+opts.behavior] !== undefined) {
+                this['_loadcallback_'+opts.behavior].call(this,box,data);
+                return;
+            }
+
+			switch (result) {
+				case 'done':
+					this._showdonemsg();
+					return false;
+
+				case 'no-append':
+					if (opts.dataType === 'html') {
+						data = '<div>' + data + '</div>';
+						data = $(data).find(opts.itemSelector);
+					}
+					break;
+
+				case 'append':
+					var children = box.children();
+					// if it didn't return anything
+					if (children.length === 0) {
+						return this._error('end');
+					}
+
+					// use a documentFragment because it works when content is going into a table or UL
+					frag = document.createDocumentFragment();
+					while (box[0].firstChild) {
+						frag.appendChild(box[0].firstChild);
+					}
+
+					this._debug('contentSelector', $(opts.contentSelector)[0]);
+					$(opts.contentSelector)[0].appendChild(frag);
+					// previously, we would pass in the new DOM element as context for the callback
+					// however we're now using a documentfragment, which doesn't have parents or children,
+					// so the context is the contentContainer guy, and we pass in an array
+					// of the elements collected as the first argument.
+
+					data = children.get();
+					break;
+			}
+
+            // loadingEnd function
+            opts.loading.finished.call($(opts.contentSelector)[0],opts);
+
+            // smooth scroll to ease in the new content
+            if (opts.animate) {
+                var scrollTo = $(window).scrollTop() + $(opts.loading.msg).height() + opts.extraScrollPx + 'px';
+                $('html,body').animate({ scrollTop: scrollTo }, 800, function () { opts.state.isDuringAjax = false; });
+            }
+
+            if (!opts.animate) {
+				// once the call is done, we can allow it again.
+				opts.state.isDuringAjax = false;
+			}
+
+            callback(this, data, url);
+
+			if (opts.prefill) {
+				this._prefill();
+			}
+		},
+
+        _nearbottom: function infscr_nearbottom() {
+
+            var opts = this.options,
+            pixelsFromWindowBottomToBottom = 0 + $(document).height() - (opts.binder.scrollTop()) - $(window).height();
+
+            // if behavior is defined and this function is extended, call that instead of default
+            if (!!opts.behavior && this['_nearbottom_'+opts.behavior] !== undefined) {
+                return this['_nearbottom_'+opts.behavior].call(this);
+            }
+
+            this._debug('math:', pixelsFromWindowBottomToBottom, opts.pixelsFromNavToBottom);
+
+            // if distance remaining in the scroll (including buffer) is less than the orignal nav to bottom....
+            return (pixelsFromWindowBottomToBottom - opts.bufferPx < opts.pixelsFromNavToBottom);
+
+        },
+
+        // Pause / temporarily disable plugin from firing
+        _pausing: function infscr_pausing(pause) {
+
+            var opts = this.options;
+
+            // if behavior is defined and this function is extended, call that instead of default
+            if (!!opts.behavior && this['_pausing_'+opts.behavior] !== undefined) {
+                this['_pausing_'+opts.behavior].call(this,pause);
+                return;
+            }
+
+            // If pause is not 'pause' or 'resume', toggle it's value
+            if (pause !== 'pause' && pause !== 'resume' && pause !== null) {
+                this._debug('Invalid argument. Toggling pause value instead');
+            }
+
+            pause = (pause && (pause === 'pause' || pause === 'resume')) ? pause : 'toggle';
+
+            switch (pause) {
+                case 'pause':
+                    opts.state.isPaused = true;
+                break;
+
+                case 'resume':
+                    opts.state.isPaused = false;
+                break;
+
+                case 'toggle':
+                    opts.state.isPaused = !opts.state.isPaused;
+                break;
+            }
+
+            this._debug('Paused', opts.state.isPaused);
+            return false;
+
+        },
+
+        // Behavior is determined
+        // If the behavior option is undefined, it will set to default and bind to scroll
+        _setup: function infscr_setup() {
+
+            var opts = this.options;
+
+            // if behavior is defined and this function is extended, call that instead of default
+            if (!!opts.behavior && this['_setup_'+opts.behavior] !== undefined) {
+                this['_setup_'+opts.behavior].call(this);
+                return;
+            }
+
+            this._binding('bind');
+
+            return false;
+
+        },
+
+        // Show done message
+        _showdonemsg: function infscr_showdonemsg() {
+
+            var opts = this.options;
+
+            // if behavior is defined and this function is extended, call that instead of default
+            if (!!opts.behavior && this['_showdonemsg_'+opts.behavior] !== undefined) {
+                this['_showdonemsg_'+opts.behavior].call(this);
+                return;
+            }
+
+            opts.loading.msg
+            .find('img')
+            .hide()
+            .parent()
+            .find('div').html(opts.loading.finishedMsg).animate({ opacity: 1 }, 2000, function () {
+                $(this).parent().fadeOut(opts.loading.speed);
+            });
+
+            // user provided callback when done    
+            opts.errorCallback.call($(opts.contentSelector)[0],'done');
+        },
+
+        // grab each selector option and see if any fail
+        _validate: function infscr_validate(opts) {
+            for (var key in opts) {
+                if (key.indexOf && key.indexOf('Selector') > -1 && $(opts[key]).length === 0) {
+                    this._debug('Your ' + key + ' found no elements.');
+                    return false;
+                }
+            }
+
+            return true;
+        },
+
+        /*	
+            ----------------------------
+            Public methods
+            ----------------------------
+            */
+
+        // Bind to scroll
+        bind: function infscr_bind() {
+            this._binding('bind');
+        },
+
+        // Destroy current instance of plugin
+        destroy: function infscr_destroy() {
+            this.options.state.isDestroyed = true;
+			this.options.loading.finished();
+            return this._error('destroy');
+        },
+
+        // Set pause value to false
+        pause: function infscr_pause() {
+            this._pausing('pause');
+        },
+
+        // Set pause value to false
+        resume: function infscr_resume() {
+            this._pausing('resume');
+        },
+
+		beginAjax: function infscr_ajax(opts) {
+			var instance = this,
+				path = opts.path,
+				box, desturl, method, condition;
+
+			// increment the URL bit. e.g. /page/3/
+			opts.state.currPage++;
+
+            // Manually control maximum page 
+            if ( opts.maxPage != undefined && opts.state.currPage > opts.maxPage ){
+                opts.state.isBeyondMaxPage = true;
+                this.destroy();
+                return;
+            }
+
+			// if we're dealing with a table we can't use DIVs
+			box = $(opts.contentSelector).is('table, tbody') ? $('<tbody/>') : $('<div/>');
+
+			desturl = (typeof path === 'function') ? path(opts.state.currPage) : path.join(opts.state.currPage);
+			instance._debug('heading into ajax', desturl);
+
+			method = (opts.dataType === 'html' || opts.dataType === 'json' ) ? opts.dataType : 'html+callback';
+			if (opts.appendCallback && opts.dataType === 'html') {
+				method += '+callback';
+			}
+
+			switch (method) {
+				case 'html+callback':
+					instance._debug('Using HTML via .load() method');
+					box.load(desturl + ' ' + opts.itemSelector, undefined, function infscr_ajax_callback(responseText) {
+						instance._loadcallback(box, responseText, desturl);
+					});
+
+					break;
+
+				case 'html':
+					instance._debug('Using ' + (method.toUpperCase()) + ' via $.ajax() method');
+					$.ajax({
+						// params
+						url: desturl,
+						dataType: opts.dataType,
+						complete: function infscr_ajax_callback(jqXHR, textStatus) {
+							condition = (typeof (jqXHR.isResolved) !== 'undefined') ? (jqXHR.isResolved()) : (textStatus === "success" || textStatus === "notmodified");
+							if (condition) {
+								instance._loadcallback(box, jqXHR.responseText, desturl);
+							} else {
+								instance._error('end');
+							}
+						}
+					});
+
+					break;
+				case 'json':
+					instance._debug('Using ' + (method.toUpperCase()) + ' via $.ajax() method');
+					$.ajax({
+						dataType: 'json',
+						type: 'GET',
+						url: desturl,
+						success: function (data, textStatus, jqXHR) {
+							condition = (typeof (jqXHR.isResolved) !== 'undefined') ? (jqXHR.isResolved()) : (textStatus === "success" || textStatus === "notmodified");
+							if (opts.appendCallback) {
+								// if appendCallback is true, you must defined template in options.
+								// note that data passed into _loadcallback is already an html (after processed in opts.template(data)).
+								if (opts.template !== undefined) {
+									var theData = opts.template(data);
+									box.append(theData);
+									if (condition) {
+										instance._loadcallback(box, theData);
+									} else {
+										instance._error('end');
+									}
+								} else {
+									instance._debug("template must be defined.");
+									instance._error('end');
+								}
+							} else {
+								// if appendCallback is false, we will pass in the JSON object. you should handle it yourself in your callback.
+								if (condition) {
+									instance._loadcallback(box, data, desturl);
+								} else {
+									instance._error('end');
+								}
+							}
+						},
+						error: function() {
+							instance._debug("JSON ajax request failed.");
+							instance._error('end');
+						}
+					});
+
+					break;
+			}
+		},
+
+        // Retrieve next set of content items
+        retrieve: function infscr_retrieve(pageNum) {
+			pageNum = pageNum || null;
+
+			var instance = this,
+            opts = instance.options;
+
+            // if behavior is defined and this function is extended, call that instead of default
+            if (!!opts.behavior && this['retrieve_'+opts.behavior] !== undefined) {
+                this['retrieve_'+opts.behavior].call(this,pageNum);
+                return;
+            }
+
+            // for manual triggers, if destroyed, get out of here
+            if (opts.state.isDestroyed) {
+                this._debug('Instance is destroyed');
+                return false;
+            }
+
+            // we dont want to fire the ajax multiple times
+            opts.state.isDuringAjax = true;
+
+            opts.loading.start.call($(opts.contentSelector)[0],opts);
+        },
+
+        // Check to see next page is needed
+        scroll: function infscr_scroll() {
+
+            var opts = this.options,
+            state = opts.state;
+
+            // if behavior is defined and this function is extended, call that instead of default
+            if (!!opts.behavior && this['scroll_'+opts.behavior] !== undefined) {
+                this['scroll_'+opts.behavior].call(this);
+                return;
+            }
+
+            if (state.isDuringAjax || state.isInvalidPage || state.isDone || state.isDestroyed || state.isPaused) {
+				return;
+			}
+
+            if (!this._nearbottom()) {
+				return;
+			}
+
+            this.retrieve();
+
+        },
+
+        // Toggle pause value
+        toggle: function infscr_toggle() {
+            this._pausing();
+        },
+
+        // Unbind from scroll
+        unbind: function infscr_unbind() {
+            this._binding('unbind');
+        },
+
+        // update options
+        update: function infscr_options(key) {
+            if ($.isPlainObject(key)) {
+                this.options = $.extend(true,this.options,key);
+            }
+        }
+    };
+
+
+    /*	
+        ----------------------------
+        Infinite Scroll function
+        ----------------------------
+
+        Borrowed logic from the following...
+
+        jQuery UI
+        - https://github.com/jquery/jquery-ui/blob/master/ui/jquery.ui.widget.js
+
+        jCarousel
+        - https://github.com/jsor/jcarousel/blob/master/lib/jquery.jcarousel.js
+
+        Masonry
+        - https://github.com/desandro/masonry/blob/master/jquery.masonry.js		
+
+*/
+
+    $.fn.infinitescroll = function infscr_init(options, callback) {
+
+
+        var thisCall = typeof options;
+
+        switch (thisCall) {
+
+            // method 
+            case 'string':
+                var args = Array.prototype.slice.call(arguments, 1);
+
+				this.each(function () {
+					var instance = $.data(this, 'infinitescroll');
+
+					if (!instance) {
+						// not setup yet
+						// return $.error('Method ' + options + ' cannot be called until Infinite Scroll is setup');
+						return false;
+					}
+
+					if (!$.isFunction(instance[options]) || options.charAt(0) === "_") {
+						// return $.error('No such method ' + options + ' for Infinite Scroll');
+						return false;
+					}
+
+					// no errors!
+					instance[options].apply(instance, args);
+				});
+
+            break;
+
+            // creation 
+            case 'object':
+
+                this.each(function () {
+
+                var instance = $.data(this, 'infinitescroll');
+
+                if (instance) {
+
+                    // update options of current instance
+                    instance.update(options);
+
+                } else {
+
+                    // initialize new instance
+                    instance = new $.infinitescroll(options, callback, this);
+
+                    // don't attach if instantiation failed
+                    if (!instance.failed) {
+                        $.data(this, 'infinitescroll', instance);
+                    }
+
+                }
+
+            });
+
+            break;
+
+        }
+
+        return this;
+    };
+
+
+
+    /* 
+     * smartscroll: debounced scroll event for jQuery *
+     * https://github.com/lukeshumard/smartscroll
+     * Based on smartresize by @louis_remi: https://github.com/lrbabe/jquery.smartresize.js *
+     * Copyright 2011 Louis-Remi & Luke Shumard * Licensed under the MIT license. *
+     */
+
+    var event = $.event,
+    scrollTimeout;
+
+    event.special.smartscroll = {
+        setup: function () {
+            $(this).bind("scroll", event.special.smartscroll.handler);
+        },
+        teardown: function () {
+            $(this).unbind("scroll", event.special.smartscroll.handler);
+        },
+        handler: function (event, execAsap) {
+            // Save the context
+            var context = this,
+            args = arguments;
+
+            // set correct event type
+            event.type = "smartscroll";
+
+            if (scrollTimeout) { clearTimeout(scrollTimeout); }
+            scrollTimeout = setTimeout(function () {
+                $(context).trigger('smartscroll', args);
+            }, execAsap === "execAsap" ? 0 : 100);
+        }
+    };
+
+    $.fn.smartscroll = function (fn) {
+        return fn ? this.bind("smartscroll", fn) : this.trigger("smartscroll", ["execAsap"]);
+    };
+
+
+})(window, jQuery);