Upgrade to casper 2.1.0 css and js

jyunderwood · Sep 3, 2017 · 7798576 · 7798576
1 parent a1a0ceb
commit 7798576
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 150 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/jyunderwood/jekyll-caspertwo.svg?branch=master)](https://travis-ci.org/jyunderwood/jekyll-caspertwo)
 
-A port of Casper 2.0 to Jekyll. Just porting templates, the CSS hasn't been changed.
+A port of [Casper](https://github.com/tryghost/casper) 2.0 to Jekyll. Just porting templates, the CSS hasn't been changed.
 
 What's currently missing:
 

diff --git a/assets/js/infinitescroll.js b/assets/js/infinitescroll.js
@@ -1,83 +1,83 @@
 // Code snippet inspired by https://github.com/douglasrodrigues5/ghost-blog-infinite-scroll
 $(function ($) {
-    var currentPage = 1;
-    var pathname = window.location.pathname;
-    var $document = $(document);
-    var $result = $('.post-feed');
-    var buffer = 100;
-
-    var ticking = false;
-    var isLoading = false;
-
-    var lastScrollY = window.scrollY;
-    var lastWindowHeight = window.innerHeight;
-    var lastDocumentHeight = $document.height();
-
-    // remove hash params from pathname
-    pathname = pathname.replace(/#(.*)$/g, '').replace('/\//g', '/');
-
-    function onScroll() {
-        lastScrollY = window.scrollY;
-        requestTick();
-    }
-
-    function onResize() {
-        lastWindowHeight = window.innerHeight;
-        lastDocumentHeight = $document.height();
-        requestTick();
-    }
-
-    function requestTick() {
-        if (!ticking) {
-            requestAnimationFrame(infiniteScroll)
-        }
-        ticking = true;
-    }
-
-    function infiniteScroll () {
-        // return if already loading
-        if (isLoading) {
-            return;
-        }
-
-        // return if not scroll to the bottom
-        if (lastScrollY + lastWindowHeight <= lastDocumentHeight - buffer) {
-            ticking = false;
-            return;
-        }
-
-        // return if currentPage is the last page already
-        if (currentPage === maxPages) {
-            return;
-        }
-
-        isLoading = true;
-
-        // next page
-        currentPage++;
-
-        // Load more
-        var nextPage = pathname + 'page/' + currentPage + '/';
-
-        $.get(nextPage, function (content) {
-            $result.append($(content).find('.post').hide().fadeIn(100));
-
-        }).fail(function (xhr) {
-            // 404 indicates we've run out of pages
-            if (xhr.status === 404) {
-                window.removeEventListener('scroll', onScroll, {passive: true});
-                window.removeEventListener('resize', onResize);
-            }
-
-        }).always(function () {
-            lastDocumentHeight = $document.height();
-            isLoading = false;
-            ticking = false;
-        });
-    }
-
-    window.addEventListener('scroll', onScroll, {passive: true});
-    window.addEventListener('resize', onResize);
-
-    infiniteScroll();
+  var currentPage = 1;
+  var pathname = window.location.pathname;
+  var $document = $(document);
+  var $result = $('.post-feed');
+  var buffer = 100;
+
+  var ticking = false;
+  var isLoading = false;
+
+  var lastScrollY = window.scrollY;
+  var lastWindowHeight = window.innerHeight;
+  var lastDocumentHeight = $document.height();
+
+  // remove hash params from pathname
+  pathname = pathname.replace(/#(.*)$/g, '').replace('/\//g', '/');
+
+  function onScroll() {
+      lastScrollY = window.scrollY;
+      requestTick();
+  }
+
+  function onResize() {
+      lastWindowHeight = window.innerHeight;
+      lastDocumentHeight = $document.height();
+      requestTick();
+  }
+
+  function requestTick() {
+      if (!ticking) {
+          requestAnimationFrame(infiniteScroll)
+      }
+      ticking = true;
+  }
+
+  function infiniteScroll () {
+      // return if already loading
+      if (isLoading) {
+          return;
+      }
+
+      // return if not scroll to the bottom
+      if (lastScrollY + lastWindowHeight <= lastDocumentHeight - buffer) {
+          ticking = false;
+          return;
+      }
+
+      // return if currentPage is the last page already
+      if (currentPage === maxPages) {
+          return;
+      }
+
+      isLoading = true;
+
+      // next page
+      currentPage++;
+
+      // Load more
+      var nextPage = pathname + 'page/' + currentPage + '/';
+
+      $.get(nextPage, function (content) {
+          $result.append($(content).find('.post').hide().fadeIn(100));
+
+      }).fail(function (xhr) {
+          // 404 indicates we've run out of pages
+          if (xhr.status === 404) {
+              window.removeEventListener('scroll', onScroll, {passive: true});
+              window.removeEventListener('resize', onResize);
+          }
+
+      }).always(function () {
+          lastDocumentHeight = $document.height();
+          isLoading = false;
+          ticking = false;
+      });
+  }
+
+  window.addEventListener('scroll', onScroll, {passive: true});
+  window.addEventListener('resize', onResize);
+
+  infiniteScroll();
 });
diff --git a/assets/js/jquery.fitvids.js b/assets/js/jquery.fitvids.js
@@ -1,87 +1,89 @@
 /*jshint browser:true */
 /*!
-* FitVids 1.1
+* FitVids 1.3
 *
-* Copyright 2013, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com
+*
+* Copyright 2017, Chris Coyier + Dave Rupert + Ghost Foundation
+* This is an unofficial release, ported by John O'Nolan
 * Credit to Thierry Koblentz - http://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/
-* Released under the WTFPL license - http://sam.zoy.org/wtfpl/
+* Released under the MIT license
 *
 */
 
 ;(function( $ ){
 
-  'use strict';
-
-  $.fn.fitVids = function( options ) {
-    var settings = {
-      customSelector: null,
-      ignore: null
-    };
-
-    if(!document.getElementById('fit-vids-style')) {
-      // appendStyles: https://github.com/toddmotto/fluidvids/blob/master/dist/fluidvids.js
-      var head = document.head || document.getElementsByTagName('head')[0];
-      var css = '.fluid-width-video-wrapper{width:100%;position:relative;padding:0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed {position:absolute;top:0;left:0;width:100%;height:100%;}';
-      var div = document.createElement("div");
-      div.innerHTML = '<p>x</p><style id="fit-vids-style">' + css + '</style>';
-      head.appendChild(div.childNodes[1]);
-    }
-
-    if ( options ) {
-      $.extend( settings, options );
-    }
+    'use strict';
 
-    return this.each(function(){
-      var selectors = [
-        'iframe[src*="player.vimeo.com"]',
-        'iframe[src*="youtube.com"]',
-        'iframe[src*="youtube-nocookie.com"]',
-        'iframe[src*="kickstarter.com"][src*="video.html"]',
-        'object',
-        'embed'
-      ];
+    $.fn.fitVids = function( options ) {
+      var settings = {
+        customSelector: null,
+        ignore: null
+      };
 
-      if (settings.customSelector) {
-        selectors.push(settings.customSelector);
+      if(!document.getElementById('fit-vids-style')) {
+        // appendStyles: https://github.com/toddmotto/fluidvids/blob/master/dist/fluidvids.js
+        var head = document.head || document.getElementsByTagName('head')[0];
+        var css = '.fluid-width-video-container{flex-grow: 1;width:100%;}.fluid-width-video-wrapper{width:100%;position:relative;padding:0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed {position:absolute;top:0;left:0;width:100%;height:100%;}';
+        var div = document.createElement("div");
+        div.innerHTML = '<p>x</p><style id="fit-vids-style">' + css + '</style>';
+        head.appendChild(div.childNodes[1]);
       }
 
-      var ignoreList = '.fitvidsignore';
-
-      if(settings.ignore) {
-        ignoreList = ignoreList + ', ' + settings.ignore;
+      if ( options ) {
+        $.extend( settings, options );
       }
 
-      var $allVideos = $(this).find(selectors.join(','));
-      $allVideos = $allVideos.not('object object'); // SwfObj conflict patch
-      $allVideos = $allVideos.not(ignoreList); // Disable FitVids on this video.
+      return this.each(function(){
+        var selectors = [
+          'iframe[src*="player.vimeo.com"]',
+          'iframe[src*="youtube.com"]',
+          'iframe[src*="youtube-nocookie.com"]',
+          'iframe[src*="kickstarter.com"][src*="video.html"]',
+          'object',
+          'embed'
+        ];
 
-      $allVideos.each(function(){
-        var $this = $(this);
-        if($this.parents(ignoreList).length > 0) {
-          return; // Disable FitVids on this video.
+        if (settings.customSelector) {
+          selectors.push(settings.customSelector);
         }
-        if (this.tagName.toLowerCase() === 'embed' && $this.parent('object').length || $this.parent('.fluid-width-video-wrapper').length) { return; }
-        if ((!$this.css('height') && !$this.css('width')) && (isNaN($this.attr('height')) || isNaN($this.attr('width'))))
-        {
-          $this.attr('height', 9);
-          $this.attr('width', 16);
-        }
-        var height = ( this.tagName.toLowerCase() === 'object' || ($this.attr('height') && !isNaN(parseInt($this.attr('height'), 10))) ) ? parseInt($this.attr('height'), 10) : $this.height(),
-            width = !isNaN(parseInt($this.attr('width'), 10)) ? parseInt($this.attr('width'), 10) : $this.width(),
-            aspectRatio = height / width;
-        if(!$this.attr('name')){
-          var videoName = 'fitvid' + $.fn.fitVids._count;
-          $this.attr('name', videoName);
-          $.fn.fitVids._count++;
+
+        var ignoreList = '.fitvidsignore';
+
+        if(settings.ignore) {
+          ignoreList = ignoreList + ', ' + settings.ignore;
         }
-        $this.wrap('<div class="fluid-width-video-wrapper"></div>').parent('.fluid-width-video-wrapper').css('padding-top', (aspectRatio * 100)+'%');
-        $this.removeAttr('height').removeAttr('width');
+
+        var $allVideos = $(this).find(selectors.join(','));
+        $allVideos = $allVideos.not('object object'); // SwfObj conflict patch
+        $allVideos = $allVideos.not(ignoreList); // Disable FitVids on this video.
+
+        $allVideos.each(function(){
+          var $this = $(this);
+          if($this.parents(ignoreList).length > 0) {
+            return; // Disable FitVids on this video.
+          }
+          if (this.tagName.toLowerCase() === 'embed' && $this.parent('object').length || $this.parent('.fluid-width-video-wrapper').length) { return; }
+          if ((!$this.css('height') && !$this.css('width')) && (isNaN($this.attr('height')) || isNaN($this.attr('width'))))
+          {
+            $this.attr('height', 9);
+            $this.attr('width', 16);
+          }
+          var height = ( this.tagName.toLowerCase() === 'object' || ($this.attr('height') && !isNaN(parseInt($this.attr('height'), 10))) ) ? parseInt($this.attr('height'), 10) : $this.height(),
+              width = !isNaN(parseInt($this.attr('width'), 10)) ? parseInt($this.attr('width'), 10) : $this.width(),
+              aspectRatio = height / width;
+          if(!$this.attr('name')){
+            var videoName = 'fitvid' + $.fn.fitVids._count;
+            $this.attr('name', videoName);
+            $.fn.fitVids._count++;
+          }
+          $this.wrap('<div class="fluid-width-video-container"><div class="fluid-width-video-wrapper"></div></div>').parent('.fluid-width-video-wrapper').css('padding-top', (aspectRatio * 100)+'%');
+          $this.removeAttr('height').removeAttr('width');
+        });
       });
-    });
-  };
+    };
 
-  // Internal counter for unique video names.
-  $.fn.fitVids._count = 0;
+    // Internal counter for unique video names.
+    $.fn.fitVids._count = 0;
 
-// Works with either jQuery or Zepto
-})( window.jQuery || window.Zepto );
+  // Works with either jQuery or Zepto
+  })( window.jQuery || window.Zepto );
diff --git a/assets/screen.css b/assets/screen.css
diff --git a/assets/screen.css.map b/assets/screen.css.map
diff --git a/caspertwo.gemspec b/caspertwo.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name     = 'caspertwo'
-  spec.version  = '2.0.1.0'
+  spec.version  = '2.1.0.0'
   spec.authors  = ['Jonathan Underwood']
   spec.email    = ['jonathan@jyunderwood.com']