kill infinite scroll

Gruntfile.js

@@ -105,11 +105,10 @@ module.exports = function(grunt){
                         'node_modules/picturefill/dist/picturefill.js'
                     ],
                     '<%= config.site %>/<%= config.assets.js %>/CustomElements.min.js': [
-                        'node_modules/webcomponentsjs/CustomElements.js'
+                        'node_modules/webcomponents.js/CustomElements.js'
                     ],
                     '<%= config.site %>/<%= config.assets.js %>/kremalicious3.min.js': [
                         'node_modules/jquery/dist/jquery.js',
-                        'bower_components/jquery-infinite-scroll/jquery.infinitescroll.js',
                         'node_modules/masonry-layout/dist/masonry.pkgd.js',
                         'node_modules/imagesloaded/imagesloaded.js',
                         'bower_components/simple-jekyll-search/dest/jekyll-search.js',

_config.yml

@@ -23,7 +23,7 @@ author:
 # --------------------
 
 permalink:              /:title/
-paginate:               15
+paginate:               10
 paginate_path:          "/page/:num"
 category_dir:           "/"
 category_title_prefix:  ""

_src/_includes/head.html

@@ -30,7 +30,7 @@
 
     <title>
         {% if paginator.previous_page %}
-            Page {{ paginator.page }} &brvbar; {{ page.title }}
+            Page {{ paginator.page }} &brvbar; {{ site.name }}
         {% elsif page.title %}
             {{ page.title }} &brvbar; {{ site.name }}
         {% else %}

_src/_includes/paginator.html

@@ -2,49 +2,44 @@
 
     <nav class="row paginator">
 
+        <p class="paginator-previous col2">
             {% if paginator.previous_page %}
-            <p class="previous col2">
+            <a
-                <i class="icon-arrow-left"></i> 
-                
                 {% if page.category %}
-                
                     {% if paginator.previous_page == 1 %}
-                        <a href="/{{ page.category }}/" rel="prev">Previous</a>
+                        href="/{{ page.category }}/"
                     {% else %}
-                        <a href="/{{ page.category }}/page/{{ paginator.previous_page }}/" rel="prev">Previous</a>
+                        href="/{{ page.category }}/page/{{ paginator.previous_page }}/"
                     {% endif %}
-                    
                 {% else %}
-                    
                     {% if paginator.previous_page == 1 %}
-                        <a href="/" rel="prev">Previous</a>
+                        href="/"
                     {% else %}
-                        <a href="/page/{{ paginator.previous_page }}/" rel="prev">Previous</a>
+                        href="/page/{{ paginator.previous_page }}/"
                     {% endif %}
-                    
                 {% endif %}
-                
+                rel="prev"><i class="icon icon-arrow-left"></i> Previous
+            </a>
+            {% endif %}
         </p>
-        {% endif %}
+
 
         <p class="col2 pagenumber textcenter">
-            <span class="page_number ">Page {{ paginator.page }} of {{ paginator.total_pages }}</span>
+            <span class="paginator-number ">Page {{ paginator.page }} of {{ paginator.total_pages }}</span>
         </p>
 
+        <p class="paginator-next col2">
             {% if paginator.next_page %}
-            <p class="next col2">
+            <a
                 {% if page.category %}
-                    <a href="/{{ page.category }}/page/{{ paginator.next_page }}/" rel="next">Next</a> 
+                    href="/{{ page.category }}/page/{{ paginator.next_page }}/"
                 {% else %}
-                    <a href="/page/{{ paginator.next_page }}/" rel="next">Next</a> 
+                    href="/page/{{ paginator.next_page }}/"
                 {% endif %}
-                <i class="icon-arrow-right"></i>
+                rel="next">Next <i class="icon icon-arrow-right"></i>
-            </p>
+            </a>
-        {% else %}
-            <p class="next col2">
-                The End
-            </p>
             {% endif %}
+        </p>
 
     </nav>
 

_src/assets/js/app.js

@@ -2,7 +2,6 @@ $(ASAP = function() {
 
     siteNavigation.init();
     siteEffects.init();
-    infiniteScroll.init();
 
 });
 
@@ -156,81 +155,3 @@ var siteEffects = {
     }
 
 }
-
-var infiniteScroll = {
-
-    infiniteScrollSetup: function() {
-
-        if ($('.page-photos').length > 0) {
-            var items = '#main .masonry';
-        } else {
-            var items = '#main article.hentry';
-        }
-        var $scrollContent = $('#main');
-
-        $scrollContent.infinitescroll({
-            loading: {
-                img: ''
-            },
-            itemSelector: items,
-            nextSelector: '.next a',
-            navSelector: '.paginator',
-            binder: $scrollContent,
-            behavior: 'krlc3',
-        }, function($scrollContent) {
-            // run picturefill over retrieved items
-            picturefill();
-            // run the photogrid over retrieved items
-            photoGrid.init();
-        });
-
-    },
-
-    init: function() {
-        this.infiniteScrollSetup();
-    }
-
-}
-
-/*
-	--------------------------------
-	Infinite Scroll Behavior
-	Manual mode with minimal loader
-
-	Usage: behavior: 'krlc3'
-	--------------------------------
-*/
-$.extend($.infinitescroll.prototype, {
-
-    _setup_krlc3: function infscr_setup_krlc3() {
-        var opts = this.options,
-            instance = this,
-            loader = $('<span class="loading"> ...</span>');
-
-        $(opts.nextSelector).parent().parent().addClass('infiniteLoader');
-
-        // Bind nextSelector link to retrieve
-        $(opts.nextSelector).click(function(e) {
-            if (e.which == 1 && !e.metaKey && !e.shiftKey) {
-                e.preventDefault();
-                instance.retrieve();
-            }
-        });
-
-        // custom start
-        instance.options.loading.start = function(opts) {
-            loader
-                .appendTo(opts.nextSelector)
-                .show(opts.loading.speed, function() {
-                    instance.beginAjax(opts);
-                });
-        }
-
-        // custom finish
-        instance.options.loading.finished = function(opts) {
-            loader.detach();
-        };
-
-    }
-
-});

_src/assets/styl/navigation.styl

@@ -91,35 +91,24 @@
 .paginator
     @extend .clearfix
 
-    p
+    .icon
-        position: relative
+        vertical-align: middle
-    a
-        display: block
 
-    i
+.paginator-next
-        position: absolute
-        left: 0
-        top: 0
-
-    .next
     @extend .alignright
     text-align: right
 
-        a
+.paginator-previous
-            margin-right: 1.5em
-
-        i
-            margin-left: .5em
-            left: auto
-            right: 0
-
-    .previous
     @extend .alignleft
 
-        a
+.paginator-number
-            margin-left: 1.5em
+    font-size: $font-size-small
-        i
+    color: $brand-grey-light
-            margin-right: .5em
+
+.paginator-title
+    @extend .h3, .heading-band
+    color: $brand-grey-light
+    margin-bottom: 0
 
 
 // Infinite Loader

_src/index.html

@@ -15,6 +15,10 @@ redirect_from:
 
 <section role="main" id="main" class="row">
 
+    {% if paginator.previous_page %}
+        <h1 class="paginator-title">Page {{ paginator.page }}</h1>
+    {% endif %}
+
     {% for post in paginator.posts %}
 
         {% include articles.html %}

bower.json

@@ -8,7 +8,6 @@
   "description": "Blog of Matthias Kretschmann",
   "license": "MIT",
   "dependencies": {
-    "jquery-infinite-scroll": ">=2.0.2",
     "simple-jekyll-search": ">=1.0.6",
     "time-elements": ">=0.4.0"
   },