Release 1.5.0

Author: kswedberg

Gruntfile.js

@@ -2,8 +2,6 @@
 
 module.exports = function(grunt) {
 
-  // Because I'm lazy
-  var _ = grunt.util._;
   var marked = require('marked');
   // var hl = require('highlight').Highlight;
   var hl = require('node-syntaxhighlighter');
@@ -20,7 +18,7 @@ module.exports = function(grunt) {
   // Project configuration.
   grunt.initConfig({
     bower: './bower.json',
-    pkg: grunt.file.readJSON('smooth-scroll.jquery.json'),
+    pkg: grunt.file.readJSON('package.json'),
     meta: {
       banner: '/*!<%= "\\n" %>' +
           ' * <%= pkg.title || pkg.name %> - v<%= pkg.version %> - ' +
@@ -150,29 +148,32 @@ module.exports = function(grunt) {
 
   grunt.registerTask( 'deploy', ['setshell:rsync', 'shell:rsync']);
 
-  grunt.registerTask( 'bower', 'Update bower.json', function() {
-    var comp = grunt.config('bower'),
-        pkgName = grunt.config('pkg').name,
-        pkg = grunt.file.readJSON(pkgName + '.jquery.json'),
-        json = {};
-
-    ['name', 'version', 'dependencies'].forEach(function(el) {
-      json[el] = pkg[el];
+  grunt.registerTask( 'configs', 'Update json configs based on package.json', function() {
+    var rjQuery = /^jquery\./,
+        bowerFile = grunt.config('bower'),
+        bower = grunt.file.readJSON(bowerFile),
+        pkg = grunt.config('pkg'),
+        jqConfigFile = pkg.name.replace(rjQuery, '') + '.jquery.json',
+        jqConfig = grunt.file.readJSON(jqConfigFile);
+
+    ['name', 'main', 'version', 'dependencies', 'keywords'].forEach(function(el) {
+      bower[el] = pkg[el];
+      jqConfig[el] = pkg[el];
     });
 
-    _.extend(json, {
-      main: grunt.config('concat.all.dest'),
-      ignore: [
-        'demo/',
-        'lib/',
-        'src/',
-        '*.json'
-      ]
+
+    ['author', 'repository', 'homepage', 'docs', 'bugs', 'demo', 'licenses'].forEach(function(el) {
+      jqConfig[el] = pkg[el];
     });
-    json.name = 'jquery.' + json.name;
 
-    grunt.file.write( comp, JSON.stringify(json, null, 2) );
-    grunt.log.writeln( 'File "' + comp + '" updated."' );
+    jqConfig.keywords.shift();
+    jqConfig.name = jqConfig.name.replace(rjQuery, '');
+
+    grunt.file.write( bowerFile, JSON.stringify(bower, null, 2) + '\n');
+    grunt.log.writeln( 'File "' + bowerFile + '" updated."' );
+
+    grunt.file.write( jqConfigFile, JSON.stringify(jqConfig, null, 2) + '\n');
+    grunt.log.writeln( 'File "' + jqConfigFile + '" updated."' );
   });
 
   grunt.registerTask('docs', 'Convert readme.md to html and concat with header and footer for index.html', function() {
@@ -185,8 +186,8 @@ module.exports = function(grunt) {
     grunt.file.write('index.html', head + doc + foot);
   });
 
-  grunt.registerTask('build', ['jshint', 'concat', 'version:same', 'bower', 'uglify', 'docs']);
-  grunt.registerTask('patch', ['jshint', 'concat', 'version:bannerPatch', 'version:patch', 'bower', 'uglify']);
+  grunt.registerTask('build', ['jshint', 'concat', 'version:same', 'configs', 'uglify', 'docs']);
+  grunt.registerTask('patch', ['jshint', 'concat', 'version:bannerPatch', 'version:patch', 'configs', 'uglify']);
   grunt.registerTask('default', ['build']);
 
   grunt.loadNpmTasks('grunt-contrib-jshint');

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.smooth-scroll",
-  "version": "1.4.13",
+  "version": "1.5.0",
   "dependencies": {
     "jquery": ">=1.3"
   },

jquery.smooth-scroll.js

@@ -1,12 +1,12 @@
 /*!
- * Smooth Scroll - v1.4.13 - 2013-11-02
+ * Smooth Scroll - v1.5.0 - 2014-08-11
  * https://github.com/kswedberg/jquery-smooth-scroll
- * Copyright (c) 2013 Karl Swedberg
+ * Copyright (c) 2014 Karl Swedberg
  * Licensed MIT (https://github.com/kswedberg/jquery-smooth-scroll/blob/master/LICENSE-MIT)
  */
 
 (function($) {
-var version = '1.4.13',
+var version = '1.5.0',
     optionOverrides = {},
     defaults = {
       exclude: [],
@@ -34,7 +34,7 @@ var version = '1.4.13',
       speed: 400,
 
       // coefficient for "auto" speed
-      autoCoefficent: 2,
+      autoCoefficient: 2,
 
       // $.fn.smoothScroll only: whether to prevent the default click action
       preventDefault: true
@@ -43,11 +43,11 @@ var version = '1.4.13',
     getScrollable = function(opts) {
       var scrollable = [],
           scrolled = false,
-          dir = opts.dir && opts.dir == 'left' ? 'scrollLeft' : 'scrollTop';
+          dir = opts.dir && opts.dir === 'left' ? 'scrollLeft' : 'scrollTop';
 
       this.each(function() {
 
-        if (this == document || this == window) { return; }
+        if (this === document || this === window) { return; }
         var el = $(this);
         if ( el[dir]() > 0 ) {
           scrollable.push(this);
@@ -68,7 +68,7 @@ var version = '1.4.13',
       // (doing this because Safari sets scrollTop async,
       // so can't set it to 1 and immediately get the value.)
       if (!scrollable.length) {
-        this.each(function(index) {
+        this.each(function() {
           if (this.nodeName === 'BODY') {
             scrollable = [this];
           }
@@ -81,8 +81,7 @@ var version = '1.4.13',
       }
 
       return scrollable;
-    },
-    isTouch = 'ontouchend' in document;
+    };
 
 $.fn.extend({
   scrollable: function(dir) {
@@ -152,6 +151,7 @@ $.fn.extend({
           scrollTarget: thisOpts.scrollTarget || thisHash,
           link: link
         });
+
         $.smoothScroll( clickOpts );
       }
     });
@@ -164,13 +164,12 @@ $.smoothScroll = function(options, px) {
   if ( options === 'options' && typeof px === 'object' ) {
     return $.extend(optionOverrides, px);
   }
-  var opts, $scroller, scrollTargetOffset, speed,
+  var opts, $scroller, scrollTargetOffset, speed, delta,
       scrollerOffset = 0,
       offPos = 'offset',
       scrollDir = 'scrollTop',
       aniProps = {},
-      aniOpts = {},
-      scrollprops = [];
+      aniOpts = {};
 
   if (typeof options === 'number') {
     opts = $.extend({link: null}, $.fn.smoothScroll.defaults, optionOverrides);
@@ -179,13 +178,13 @@ $.smoothScroll = function(options, px) {
     opts = $.extend({link: null}, $.fn.smoothScroll.defaults, options || {}, optionOverrides);
     if (opts.scrollElement) {
       offPos = 'position';
-      if (opts.scrollElement.css('position') == 'static') {
+      if (opts.scrollElement.css('position') === 'static') {
         opts.scrollElement.css('position', 'relative');
       }
     }
   }
 
-  scrollDir = opts.direction == 'left' ? 'scrollLeft' : scrollDir;
+  scrollDir = opts.direction === 'left' ? 'scrollLeft' : scrollDir;
 
   if ( opts.scrollElement ) {
     $scroller = opts.scrollElement;
@@ -211,11 +210,15 @@ $.smoothScroll = function(options, px) {
   // automatically calculate the speed of the scroll based on distance / coefficient
   if (speed === 'auto') {
 
-    // if aniProps[scrollDir] == 0 then we'll use scrollTop() value instead
-    speed = aniProps[scrollDir] || $scroller.scrollTop();
+    // $scroller.scrollTop() is position before scroll, aniProps[scrollDir] is position after
+    // When delta is greater, speed will be greater.
+    delta = aniProps[scrollDir] - $scroller.scrollTop();
+    if(delta < 0) {
+      delta *= -1;
+    }
 
-    // divide the speed by the coefficient
-    speed = speed / opts.autoCoefficent;
+    // Divide the delta by the coefficient
+    speed = delta / opts.autoCoefficient;
   }
 
   aniOpts = {
@@ -239,6 +242,7 @@ $.smoothScroll = function(options, px) {
 
 $.smoothScroll.version = version;
 $.smoothScroll.filterPath = function(string) {
+  string = string || '';
   return string
     .replace(/^\//,'')
     .replace(/(?:index|default).[a-zA-Z]{3,4}$/,'')

jquery.smooth-scroll.min.js

@@ -1,10 +1,32 @@
 {
-  "name": "smooth-scroll",
-  "version": "1.4.13",
+  "name": "jquery.smooth-scroll",
+  "version": "1.5.0",
   "scripts": {
     "test": "./node_modules/.bin/grunt"
   },
-  "dependencies": {},
+  "main": "jquery.smooth-scroll.js",
+  "author": {
+    "name": "Karl Swedberg",
+    "email": "kswedberg@gmail.com",
+    "url": "http://www.learningjquery.com/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/kswedberg/jquery-smooth-scroll"
+  },
+  "homepage": "https://github.com/kswedberg/jquery-smooth-scroll",
+  "docs": "https://github.com/kswedberg/jquery-smooth-scroll",
+  "bugs": "https://github.com/kswedberg/jquery-smooth-scroll/issues",
+  "demo": "http://plugins.learningjquery.com/smooth-scroll/demo/",
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "https://github.com/kswedberg/jquery-smooth-scroll/blob/master/LICENSE-MIT"
+    }
+  ],
+  "dependencies": {
+    "jquery": ">=1.3"
+  },
   "devDependencies": {
     "grunt": "~0.4.0",
     "grunt-contrib-concat": "~0.1.2",
@@ -16,5 +38,10 @@
     "marked": "^0.3.2",
     "node-syntaxhighlighter": "~0.8.1"
   },
+  "keywords": [
+    "jQuery",
+    "scroll",
+    "animation"
+  ],
   "readmeFilename": "readme.md"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smooth-scroll",
-  "version": "1.4.13",
+  "version": "1.5.0",
   "title": "Smooth Scroll",
   "description": "Easy implementation of smooth scrolling for same-page links",
   "author": {
@@ -25,5 +25,9 @@
   "dependencies": {
     "jquery": ">=1.3"
   },
-  "keywords": ["scroll", "animation"]
+  "keywords": [
+    "scroll",
+    "animation"
+  ],
+  "main": "jquery.smooth-scroll.js"
 }

smooth-scroll.jquery.json

@@ -1,5 +1,5 @@
 (function($) {
-var version = '1.4.13',
+var version = '1.5.0',
     optionOverrides = {},
     defaults = {
       exclude: [],