minimize and organize custom js

Author: ShMcK

Diff for: _includes/base/scripts.html

@@ -1,15 +1,14 @@
 <!-- Scripts -->
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
 
 <script src="{{ " /js/lib/jquery.scrollex.min.js " | prepend: site.baseurl }}"></script>
 <script src="{{ " /js/lib/jquery.scrolly.min.js " | prepend: site.baseurl }}"></script>
 <script src="{{ " /js/lib/skel.min.js " | prepend: site.baseurl }}"></script>
 <script src="{{ " /js/lib/animatedModal.min.js " | prepend: site.baseurl }}"></script>
 <script src="{{ " /js/lib/util.min.js " | prepend: site.baseurl }}"></script>
-<!--[if lte IE 8]><script src="{{ "/js/ie/respond.min.js" | prepend: site.baseurl }}"></script><![endif]-->
-<script src="{{ " /js/main.min.js " | prepend: site.baseurl }}"></script>
-<script src="{{ " /js/modals.min.js " | prepend: site.baseurl }}"></script>
 <script src="{{ " /js/lib/png2gif.min.js " | prepend: site.baseurl }}"></script>
 <script src="{{ " /js/lib/jquery.lazyload.min.js " | prepend: site.baseurl }}"></script>
 <script src="{{ " /js/lib/jquery.smoothscroll.min.js " | prepend: site.baseurl }}"></script>
-<script src="{{ " /js/ga.min.js " | prepend: site.baseurl }}"></script>
+<!--[if lte IE 8]><script src="{{ "/js/ie/respond.min.js" | prepend: site.baseurl }}"></script><![endif]-->
+<script src="{{ " /dist/build.min.js " | prepend: site.baseurl }}"></script>
+<script src="{{ " /js/lib/ga.min.js " | prepend: site.baseurl }}"></script>

Diff for: dist/build.min.js

@@ -2,15 +2,11 @@ const gulp = require('gulp');
 const uglify = require('gulp-uglify');
 const pump = require('pump');
 const concat = require('gulp-concat');
+const sass = require('gulp-sass');
 
 gulp.task('compress', function (cb) {
   pump([
         gulp.src([
-          'js/lib/jquery.scrollex.min.js',
-          'js/lib/jquery.scrolly.min.js',
-          'js/lib/skel.min.js',
-          'js/lib/util.min.js',
-          'js/lib/*.js',
           'js/*.js'
         ]),
         concat('build.min.js'),
@@ -21,6 +17,10 @@ gulp.task('compress', function (cb) {
   );
 });
 
-
+gulp.task('sass', function () {
+  return gulp.src('./_sass/main.scss')
+    .pipe(sass().on('error', sass.logError))
+    .pipe(gulp.dest('./dist'));
+});
 
 gulp.task('default', ['compress', 'sass']);

Diff for: gulpfile.js

@@ -0,0 +1,7 @@
+$(function() {
+  // images
+  $("img.lazy").lazyload({
+    effect: "fadeIn",
+    threshold : 200,
+  });
+});

Diff for: js/images.js

@@ -16,53 +16,4 @@ $(function() {
         .attr("src", "images/demos/builder-demo.gif");
     }
   });
-
-  // images
-  $("img.lazy").lazyload({
-    effect: "fadeIn",
-    threshold : 200,
-  });
-
-  // smooth scroll
-  $('a.smooth').smoothScroll({
-    offset: -70,
-    direction: 'top',
-    easing: 'swing',
-    speed: 400,
-    autoCoefficient: 2,
-    preventDefault: true
-  });
-
-
-  const scrollnow = function(e) {
-    var target;
-    if (e) {
-      e.preventDefault();
-      target = this.hash;
-    } else {
-      target = location.hash;
-    }
-    $.smoothScroll({
-      offset: -70,
-      easing: 'swing',
-      speed: 400,
-      autoCoefficient: 2,
-      preventDefault: true,
-      scrollTarget: target
-    });
-  };
-
-  if (location.hash) {
-    $('html, body').scrollTop(0).show();
-      scrollnow();
-    }
-
-  $('a[href*="/"][href*=#]').each(function(){
-    if (this.pathname.replace(/^\//,'') == location.pathname.replace(/^\//,'') && this.hostname == location.hostname) {
-      $(this).attr("href", this.hash);
-    }
-  });
-
-  $('a[href^=#]:not([href=#])').click(scrollnow);
-
 });

Diff for: js/ga.min.js renamed to js/lib/ga.min.js

@@ -0,0 +1,44 @@
+$(function() {
+  // smooth scroll
+  $('a.smooth').smoothScroll({
+    offset: -70,
+    direction: 'top',
+    easing: 'swing',
+    speed: 400,
+    autoCoefficient: 2,
+    preventDefault: true
+  });
+
+
+  const scrollnow = function(e) {
+    var target;
+    if (e) {
+      e.preventDefault();
+      target = this.hash;
+    } else {
+      target = location.hash;
+    }
+    $.smoothScroll({
+      offset: -70,
+      easing: 'swing',
+      speed: 400,
+      autoCoefficient: 2,
+      preventDefault: true,
+      scrollTarget: target
+    });
+  };
+
+  if (location.hash) {
+    $('html, body').scrollTop(0).show();
+      scrollnow();
+    }
+
+  $('a[href*="/"][href*=\\#]').each(function(){
+    if (this.pathname.replace(/^\//,'') == location.pathname.replace(/^\//,'') && this.hostname == location.hostname) {
+      $(this).attr("href", this.hash);
+    }
+  });
+
+  $('a[href^=#]:not([href=#])').click(scrollnow);
+
+});