Merge pull request #22 from ashupp/master

Corrected logic in resetTimeout

README.md

@@ -129,6 +129,10 @@ idle({
 
 ##Changelog
 
+###1.2.7
+--------
+* Corrected the logic in resetTimeout. Setting the idle = false before calling the onActive handler prevents looping when calling idle:stop in the onActive handler. ([@ashupp](https://github.com/ashupp))
+
 ###1.2.6
 --------
 * Added a non-Jquery version ([@hugohil](https://github.com/hugohil))

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "jquery.idle",
   "main": "jquery.idle.js",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "homepage": "https://github.com/kidh0/jquery.idle",
   "authors": [
     "Henrique Boaventura <hboaventura@gmail.com>"

jquery.idle.js

@@ -5,7 +5,7 @@
  *  About: Author
  *  Henrique Boaventura (hboaventura@gmail.com).
  *  About: Version
- *  1.2.6
+ *  1.2.7
  *  About: License
  *  Copyright (C) 2013, Henrique Boaventura (hboaventura@gmail.com).
  *  MIT License:
@@ -58,8 +58,8 @@
 
     resetTimeout = function (id, settings) {
       if (idle) {
-        settings.onActive.call();
         idle = false;
+        settings.onActive.call();
       }
       clearTimeout(id);
       if(settings.keepTracking) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.idle",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "A dead simple jQuery plugin that executes a callback function if the user is idle.",
   "main": "jquery.idle.js",
   "scripts": {

vanilla.idle.js

@@ -3,7 +3,7 @@
  * @title: Vanilla Idle.
  * @description: A simple VanillaJS port of this jQuery plugin.
  * @author @hugohil
- * @version 1.2.6
+ * @version 1.2.7
  * @license https://opensource.org/licenses/MIT
  */
 
@@ -38,8 +38,8 @@
 
     var resetTimeout = function resetTimeout (id, settings){
       if(idle){
-        settings.onActive.call();
         idle = false;
+        settings.onActive.call();
       }
       clearTimeout(id);
       if(settings.keepTracking){