Merge pull request #3 from TrySound/master

Fixes

Gruntfile.js

@@ -60,17 +60,6 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-watch');
 
-    // Custom task
-    grunt.registerTask('sync_versions', 'Keeps versions in sync between NPM and Bower', function(){
-        var bower = {
-            name: pkg.name,
-            author: pkg.author,
-            version: pkg.version,
-            main: 'dist/ripple.min.js'
-        };
-        fs.writeFileSync('bower.json', JSON.stringify(bower, null, "\t"));
-    });
-
-    grunt.registerTask('default', ['jshint', 'uglify', 'cssmin', 'sync_versions']);
-    grunt.registerTask('develop', ['jshint', 'uglify', 'cssmin', 'sync_versions', 'watch']);
+    grunt.registerTask('default', ['jshint', 'uglify', 'cssmin']);
+    grunt.registerTask('develop', ['jshint', 'uglify', 'cssmin', 'watch']);
 };

bower.json

@@ -1,6 +1,31 @@
 {
-	"name": "Ripple.js",
-	"author": "Jacob Kelley",
-	"version": "1.2.0",
-	"main": "dist/ripple.min.js"
-}
+  "name": "Ripple.js",
+  "homepage": "http://jakiestfu.github.io/Ripple.js/demo",
+  "authors": [
+    "Jacob Kelley <[email protected]>"
+  ],
+  "description": "Adds Material style ripple to anything",
+  "main": [
+    "src/ripple.js",
+    "src/ripple.css"
+  ],
+  "keywords": [
+    "material",
+    "ripple",
+    "animation"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": "~2.1.3"
+  },
+  "devDependencies": {
+    "bootstrap": "~3.3.2"
+  }
+}

package.json

@@ -1,7 +1,7 @@
 {
     "name": "Ripple.js",
     "author": "Jacob Kelley",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "repository": {
         "type": "git",
         "url": "https://github.com/jakiestfu/Ripple.js.git"

src/ripple.css

@@ -2,8 +2,6 @@
     position: relative;
     overflow: hidden;
     -webkit-transform: translate3d(0,0,0);
-    -moz-transform: translate3d(0,0,0);
-    -ms-transform: translate3d(0,0,0);
     -o-transform: translate3d(0,0,0);
     transform: translate3d(0,0,0);
 }
@@ -14,52 +12,34 @@
     border-radius: 50%;
 
     -webkit-transform: scale(0);
-    -moz-transform: scale(0);
-    -ms-transform: scale(0);
     -o-transform: scale(0);
     transform: scale(0);
 
     background: #fff;
     opacity: 1;
 }
-.ripple.animate {
+.ripple-animate {
     -webkit-animation: ripple;
-    -moz-animation: ripple;
-    -ms-animation: ripple;
     -o-animation: ripple;
     animation: ripple;
 }
-@keyframes ripple {
-    100% {
-        opacity: 0;
-        transform: scale(2);
-    }
-}
 @-webkit-keyframes ripple {
     100% {
         opacity: 0;
         -webkit-transform: scale(2);
         transform: scale(2);
     }
 }
-@-moz-keyframes ripple {
-    100% {
-        opacity: 0;
-        -moz-transform: scale(2);
-        transform: scale(2);
-    }
-}
-@-ms-keyframes ripple {
+@-o-keyframes ripple {
     100% {
         opacity: 0;
-        -ms-transform: scale(2);
+        -o-transform: scale(2);
         transform: scale(2);
     }
 }
-@-o-keyframes ripple {
+@keyframes ripple {
     100% {
         opacity: 0;
-        -o-transform: scale(2);
         transform: scale(2);
     }
 }

src/ripple.js

@@ -100,7 +100,7 @@
 
             // Kill animation
             _log('Destroy: Ripple Animation');
-            $ripple.removeClass("animate");
+            $ripple.removeClass("ripple-animate");
 
 
             // Retrieve coordinates
@@ -127,7 +127,7 @@
             $ripple.css({
                 top: y + 'px',
                 left: x + 'px'
-            }).addClass("animate");
+            }).addClass("ripple-animate");
         };
 
         $(document).on(self.defaults.on, self.selector, Trigger);