Merge pull request #68 from nnattawat/add-namespace

Add namespace to flip events
nnattawat · Jan 8, 2016 · 7eee1ad · 7eee1ad
2 parents 3dfb478 + 0018251
commit 7eee1ad
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,66 @@
 **A lightweight jQuery plugin to create 3d flip animation.** 
 See the [project page](http://nnattawat.github.io/flip/)
 
+## Getting Started
+
+### CDN
+    https://cdn.rawgit.com/nnattawat/flip/v1.0.19/dist/jquery.flip.min.js
+
+### Download 
+* [jquery.flip.js][max] (development version, commented ~9kB)
+* [jquery.flip.min.js][min] (production version, minified ~4kB, gzipped ~2kB)
+* [jquery.flip.min.js.map][map] (source map, ~5kB)
+[max]: https://cdn.rawgit.com/nnattawat/flip/v1.0.19/dist/jquery.flip.js
+[min]: https://cdn.rawgit.com/nnattawat/flip/v1.0.19/dist/jquery.flip.min.js
+[map]: https://cdn.rawgit.com/nnattawat/flip/v1.0.19/dist/jquery.flip.min.js.map
+
+### Bower
+<pre>bower install flip</pre>
+
+### Usage
+In your web page:
+
+```html
+
+<div id="card"> 
+  <div class="front"> 
+    Front content
+  </div> 
+  <div class="back">
+    Back content
+  </div> 
+</div>
+
+<script src="jquery.js"></script>
+<script src="jquery.flip.js"></script>
+<script>
+$(function($) {
+  $("#card").flip(); 
+});
+</script>
+```
+
+## Documentation and Example
+
+Please refer to [the project website](http://nnattawat.github.io/flip/)
+
+## Development
+Ensure that you have the latest [Node.js](http://nodejs.org/) and [npm](http://npmjs.org/) installed.
+
+Test that Grunt's CLI and Bower are installed by running `grunt --version` and `bower --version`.  If the commands aren't found, run `npm install -g grunt-cli bower`.  For more information about installing the tools, see the [getting started with Grunt guide](http://gruntjs.com/getting-started) or [bower.io](http://bower.io/) respectively.
+
+To run the demo locally, do the following.
+<pre>
+npm install
+bower install
+</pre>
+
+And run grunt command to create files in /dist folder.
+<pre>grunt</pre>
+
 ## What's new
+* **Flip v1.0.19**
+  * [Add `.flap` namespace to all flip events](https://github.com/nnattawat/flip/commit/b75660b)
 * **Flip v1.0.18**
   * Fixed [Missing comma in package.json #64](https://github.com/nnattawat/flip/issues/64)
   * Thanks to [Zlatko Fedor](https://github.com/seeden) for reporting and fixing this!
@@ -61,59 +120,3 @@ See the [project page](http://nnattawat.github.io/flip/)
 * **Flip v1.0.2 - v1.0.5**
   Chaotic period of development culminating in v1.0.6 see above.
 
-## Getting Started
-
-### CDN
-    https://cdn.rawgit.com/nnattawat/flip/v1.0.18/dist/jquery.flip.min.js
-
-### Download 
-* [jquery.flip.js][max] (development version, commented ~9kB)
-* [jquery.flip.min.js][min] (production version, minified ~4kB, gzipped ~2kB)
-* [jquery.flip.min.js.map][map] (source map, ~5kB)
-[max]: https://cdn.rawgit.com/nnattawat/flip/v1.0.18/dist/jquery.flip.js
-[min]: https://cdn.rawgit.com/nnattawat/flip/v1.0.18/dist/jquery.flip.min.js
-[map]: https://cdn.rawgit.com/nnattawat/flip/v1.0.18/dist/jquery.flip.min.js.map
-
-### Bower
-<pre>bower install flip</pre>
-
-### Usage
-In your web page:
-
-```html
-
-<div id="card"> 
-  <div class="front"> 
-    Front content
-  </div> 
-  <div class="back">
-    Back content
-  </div> 
-</div>
-
-<script src="jquery.js"></script>
-<script src="jquery.flip.js"></script>
-<script>
-$(function($) {
-  $("#card").flip(); 
-});
-</script>
-```
-
-## Documentation and Example
-
-Please refer to [the project website](http://nnattawat.github.io/flip/)
-
-## Development
-Ensure that you have the latest [Node.js](http://nodejs.org/) and [npm](http://npmjs.org/) installed.
-
-Test that Grunt's CLI and Bower are installed by running `grunt --version` and `bower --version`.  If the commands aren't found, run `npm install -g grunt-cli bower`.  For more information about installing the tools, see the [getting started with Grunt guide](http://gruntjs.com/getting-started) or [bower.io](http://bower.io/) respectively.
-
-To run the demo locally, do the following.
-<pre>
-npm install
-bower install
-</pre>
-
-And run grunt command to create files in /dist folder.
-<pre>grunt</pre>
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "flip",
-	"version": "1.0.18",
+	"version": "1.0.19",
 	"dependencies": {
 		"jquery": "~2.0"
 	},

diff --git a/dist/jquery.flip.js b/dist/jquery.flip.js
@@ -1,6 +1,6 @@
-/*! flip - v1.0.18 - 2015-11-12
+/*! flip - v1.0.19 - 2016-01-04
 * https://github.com/nnattawat/flip
-* Copyright (c) 2015 Nattawat Nonsung; Licensed MIT */
+* Copyright (c) 2016 Nattawat Nonsung; Licensed MIT */
 (function( $ ) {
   var flip = function($dom, callback) {
     $dom.data("flipped", true);
@@ -155,7 +155,7 @@
 		  // Back face always visible on Chrome #39
           if ((window.chrome || (window.Intl && Intl.v8BreakIterator)) && 'CSS' in window){
             //Blink Engine, add preserve-3d to $dom
-			$dom.css({"-webkit-transform-style": "preserve-3d"});
+            $dom.css({"-webkit-transform-style": "preserve-3d"});
           }
 		  // /#39
 
@@ -178,7 +178,7 @@
           }, 20);
 
           if (settings.trigger.toLowerCase() == "click") {
-            $dom.on($.fn.tap ? "tap" : "click", function(event) {
+            $dom.on($.fn.tap ? "tap.flip" : "click.flip", function(event) {
               if (!event) {event = window.event;}
               if ($dom.find($(event.target).closest('button, a, input[type="submit"]')).length) {
                 return;
@@ -193,12 +193,12 @@
           }
           else if (settings.trigger.toLowerCase() == "hover") {
             var performFlip = function() {
-              $dom.unbind('mouseleave', performUnflip);
+              $dom.off('mouseleave.flip');
 
               flip($dom);
 
               setTimeout(function() {
-                $dom.bind('mouseleave', performUnflip);
+                $dom.on('mouseleave.flip', performUnflip);
                 if (!$dom.is(":hover")) {
                   unflip($dom);
                 }
@@ -209,8 +209,8 @@
               unflip($dom);
             };
 
-            $dom.mouseenter(performFlip);
-            $dom.mouseleave(performUnflip);
+            $dom.on('mouseenter.flip', performFlip);
+            $dom.on('mouseleave.flip', performUnflip);
           }
         }else{
           //The element has been initiated, all we have to do is change applicable settings
@@ -273,4 +273,4 @@
         setTimeout(callback.bind(this), 0);
     }
   };
-}( jQuery ));
+}( jQuery ));
diff --git a/dist/jquery.flip.min.js b/dist/jquery.flip.min.js