Merge pull request #28 from dwebbuilder/master

Add check for jQuery slim version
gdsmith · Oct 10, 2017 · 17566b3 · 17566b3
2 parents fdf871b + 4832b3e
commit 17566b3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "jquery.easing",
   "main": "jquery.easing.js",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "homepage": "https://github.com/gdsmith/jquery.easing",
   "authors": [
     "George McGinley Smith <george@gsgd.co.uk>"

diff --git a/jquery.easing.js b/jquery.easing.js
@@ -1,5 +1,5 @@
 /*
- * jQuery Easing v1.4.0 - http://gsgd.co.uk/sandbox/jquery/easing/
+ * jQuery Easing v1.4.1 - http://gsgd.co.uk/sandbox/jquery/easing/
  * Open source under the BSD License.
  * Copyright © 2008 George McGinley Smith
  * All rights reserved.
@@ -19,7 +19,9 @@
 })(function($){
 
 // Preserve the original jQuery "swing" easing as "jswing"
-$.easing['jswing'] = $.easing['swing'];
+if (typeof $.easing !== 'undefined') {
+	$.easing['jswing'] = $.easing['swing'];
+}
 
 var pow = Math.pow,
 	sqrt = Math.sqrt,

diff --git a/jquery.easing.min.js b/jquery.easing.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery.easing",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "homepage": "https://github.com/gdsmith/jquery.easing",
   "description": "A jQuery plugin from GSGD to give advanced easing options",
   "author": {