Merge pull request dirkfabisch#14 from MarkBorcherding/javascript_opt…

…imizations

Javascript optimizations

_includes/head.html

@@ -22,9 +22,4 @@
 
   <link rel="stylesheet" type="text/css" media="screen" href="{{ "/css/main.css"  | prepend: site.baseurl  }}" />
   <link rel="stylesheet" type="text/css" media="print" href="{{ "/css/print.css"  | prepend: site.baseurl  }}" />
-  <script src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
-
-  <script type="text/javascript" src="{{ "/assets/js/jquery.fitvids.js" | prepend: site.baseurl  }}"></script>
-  <script type="text/javascript" src="{{ "/assets/js/index.js" | prepend: site.baseurl  }}"></script>
-  <script type="text/javascript" src="{{ "/assets/js/readingTime.min.js" | prepend: site.baseurl  }}"></script>
 </head>

_includes/javascripts.html

@@ -0,0 +1,39 @@
+<script src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
+<script type="text/javascript" src="{{ "/assets/js/jquery.fitvids.js" | prepend: site.baseurl  }}"></script>
+<script type="text/javascript" src="{{ "/assets/js/index.js" | prepend: site.baseurl  }}"></script>
+<script type="text/javascript" src="{{ "/assets/js/readingTime.min.js" | prepend: site.baseurl  }}"></script>
+<script>
+(function ($) {
+  "use strict";
+  $(document).ready(function(){
+
+    var $window = $(window),
+    $image = $('.post-image-image, .teaserimage-image');
+    $window.on('scroll', function() {
+      var top = $window.scrollTop();
+
+      if (top < 0 || top > 1500) { return; }
+      $image
+        .css('transform', 'translate3d(0px, '+top/3+'px, 0px)')
+        .css('opacity', 1-Math.max(top/700, 0));
+    });
+    $window.trigger('scroll');
+
+    var height = $('.article-image').height();
+    $('.post-content').css('padding-top', height + 'px');
+
+    $('a[href*=#]:not([href=#])').click(function() {
+      if (location.pathname.replace(/^\//,'') == this.pathname.replace(/^\//,'')
+       && location.hostname == this.hostname) {
+        var target = $(this.hash);
+        target = target.length ? target : $('[name=' + this.hash.slice(1) +']');
+        if (target.length) {
+          $('html,body').animate({ scrollTop: target.offset().top }, 500);
+          return false;
+        }
+      }
+    });
+  });
+}(jQuery));
+</script>
+

_layouts/default.html

@@ -18,6 +18,7 @@
     <!-- content end -->
 
     {% include footer.html %}
+    {% include javascripts.html %}
 
   </body>
 

_layouts/page.html

@@ -23,46 +23,6 @@ <h4 class="author-name" itemprop="author" itemscope itemtype="http://schema.org/
             </div>
           </div>
         </div>
-        <script>
-          (function ($) {
-              "use strict";
-
-              $(document).ready(function(){
-
-                  var $window = $(window),
-                      $image = $('.post-image-image');
-                  $window.on('scroll', function() {
-                      var top = $window.scrollTop();
-
-                      if (top < 0 || top > 1500) { return; }
-                      $image
-                          .css('transform', 'translate3d(0px, '+top/3+'px, 0px)')
-                          .css('opacity', 1-Math.max(top/700, 0));
-                  });
-                  $window.trigger('scroll');
-
-                  var height = $('.article-image').height();
-                      $('.post-content').css('padding-top', height + 'px');
-
-                  $(function() {
-                    $('a[href*=#]:not([href=#])').click(function() {
-                      if (location.pathname.replace(/^\//,'') == this.pathname.replace(/^\//,'') && location.hostname == this.hostname) {
-                        var target = $(this.hash);
-                        target = target.length ? target : $('[name=' + this.hash.slice(1) +']');
-                        if (target.length) {
-                          $('html,body').animate({
-                            scrollTop: target.offset().top
-                          }, 500);
-                          return false;
-                        }
-                      }
-                    });
-                  });
-
-              });
-
-          }(jQuery));
-        </script>
         {% else %}
         <div class="noarticleimage">
           <div class="post-meta">
@@ -94,5 +54,6 @@ <h2 class="blog-description">{{ site.description }}</h2>
         <a href="/" class="btn">Back to Overview</a>
       </div>
     </div>
+    {% include javascripts.html %}
   </body>
 </html>

_layouts/post.html

@@ -26,44 +26,6 @@ <h4 class="author-name" itemprop="author" itemscope itemtype="http://schema.org/
             </div>
           </div>
         </div>
-        <script>
-          (function ($) {
-              "use strict";
-              $(document).ready(function(){
-                  var $window = $(window),
-                      $image = $('.post-image-image');
-                  $window.on('scroll', function() {
-                      var top = $window.scrollTop();
-
-                      if (top < 0 || top > 1500) { return; }
-                      $image
-                          .css('transform', 'translate3d(0px, '+top/3+'px, 0px)')
-                          .css('opacity', 1-Math.max(top/700, 0));
-                  });
-                  $window.trigger('scroll');
-
-                  var height = $('.article-image').height();
-                      $('.post-content').css('padding-top', height + 'px');
-
-                  $(function() {
-                    $('a[href*=#]:not([href=#])').click(function() {
-                      if (location.pathname.replace(/^\//,'') == this.pathname.replace(/^\//,'') && location.hostname == this.hostname) {
-                        var target = $(this.hash);
-                        target = target.length ? target : $('[name=' + this.hash.slice(1) +']');
-                        if (target.length) {
-                          $('html,body').animate({
-                            scrollTop: target.offset().top
-                          }, 500);
-                          return false;
-                        }
-                      }
-                    });
-                  });
-
-              });
-
-          }(jQuery));
-        </script>
         {% else %}
         <div class="noarticleimage">
           <div class="post-meta">
@@ -135,5 +97,6 @@ <h2 class="blog-description">{{ site.description }}</h2>
         <a href="/" class="btn">Back to Overview</a>
       </div>
     </div>
+    {% include javascripts.html %}
   </body>
 </html>

index.html

@@ -25,28 +25,6 @@ <h2 class="blog-description">{{ site.description }}</h2>
     </div>
 </header>
 
-<script>
-    (function ($) {
-        "use strict";
-
-        $(document).ready(function(){
-
-            var $window = $(window),
-                $image = $('.teaserimage-image');
-            $window.on('scroll', function() {
-                var top = $window.scrollTop();
-
-                if (top < 0 || top > 1500) { return; }
-                $image
-                    .css('transform', 'translate3d(0px, '+top/3+'px, 0px)')
-                    .css('opacity', 1-Math.max(top/700, 0));
-            });
-            $window.trigger('scroll');
-
-        });
-
-    }(jQuery));
-</script>
 
 <main class="content" role="main">