Skip to content
This repository has been archived by the owner on Oct 21, 2022. It is now read-only.

Commit

Permalink
Merge pull request #90 from filamentgroup/npm-ready
Browse files Browse the repository at this point in the history
rename package for npm, expose toss if overthrow not defined already,…
  • Loading branch information
scottjehl committed Nov 16, 2015
2 parents 6e07628 + 2a2d54b commit a719a37
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
11 changes: 6 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ module.exports = function(grunt) {
grunt.initConfig({
// Metadata.
pkg: pkg = grunt.file.readJSON('package.json'),
banner: '/*! <%= pkg.title || pkg.name %> - <%= pkg.description %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' +
scriptname: 'overthrow',
banner: '/*! <%= pkg.title || scriptname %> - <%= pkg.description %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' +
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>; Licensed <%= pkg.license %> */\n',
// Task configuration.
concat: {
Expand All @@ -19,11 +20,11 @@ module.exports = function(grunt) {
},
main: {
src: ['src/overthrow-detect.js','src/overthrow-toss.js','src/overthrow-polyfill.js','src/overthrow-init.js'],
dest: 'dist/<%= pkg.name %>.js'
dest: 'dist/<%= scriptname %>.js'
},
sidescroller: {
src: ['src/overthrow-detect.js','src/overthrow-toss.js','src/overthrow-polyfill.js','src/overthrow-init.js','extensions/overthrow-sidescroller.js'],
dest: 'dist/<%= pkg.name %>.sidescroller.js'
dest: 'dist/<%= scriptname %>.sidescroller.js'
}
},
qunit: {
Expand All @@ -36,11 +37,11 @@ module.exports = function(grunt) {
},
main: {
src: ['src/overthrow-detect.js','src/overthrow-toss.js','src/overthrow-polyfill.js','src/overthrow-init.js'],
dest: 'dist/<%= pkg.name %>.min.js'
dest: 'dist/<%= scriptname %>.min.js'
},
sidescroller: {
src: ['src/overthrow-detect.js','src/overthrow-toss.js','src/overthrow-polyfill.js','src/overthrow-init.js','extensions/overthrow-sidescroller.js'],
dest: 'dist/<%= pkg.name %>.sidescroller.min.js'
dest: 'dist/<%= scriptname %>.sidescroller.min.js'
},

sidescrollerExtensions: {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "overthrow",
"version": "0.7.0",
"name": "fg-overthrow",
"version": "0.7.1",
"description": "An overflow:auto polyfill for responsive design.",
"author": {
"name": "Scott Jehl, Filament Group, Inc.",
Expand Down
2 changes: 1 addition & 1 deletion src/overthrow-toss.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// o is overthrow reference from overthrow-polyfill.js
if( o === undefined ){
return;
w.overthrow = o = {};
}

// Easing can use any of Robert Penner's equations (http://www.robertpenner.com/easing_terms_of_use.html). By default, overthrow includes ease-out-cubic
Expand Down

0 comments on commit a719a37

Please sign in to comment.