fix configuration issue, bump version to 0.7.0

typerandom · Jan 19, 2016 · 7a766fa · 7a766fa
1 parent f988816
commit 7a766fa
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 54 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ $ bower install activity --save
 
 ## Usage
 
-At the end of your code, right before `</body>`, add the following:
+At the end of your code, right before `</body>`, call the following:
 
 ```javascript
 Activity.detect();
@@ -34,12 +34,12 @@ Activity.detect();
 Once this is done, you'll be able to detect user activity by listening to either the `user_active` or `user_inactive` events, as shown below:
 
 ```javascript
-window.addEventListener('user_active', function () {
-	console.log("The user is active!");
+Activity.on('active', function () {
+  console.log("The user is active!");
 });
 
-window.addEventListener('user_inactive', function () {
-	console.log("The user is inactive!");
+Activity.on('inactive', function () {
+  console.log("The user is inactive!");
 });
 ```
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "activity",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "main": [
     "dist/activity.min.js"
   ],

diff --git a/dist/activity.js b/dist/activity.js
diff --git a/dist/activity.js.map b/dist/activity.js.map
diff --git a/dist/activity.min.js b/dist/activity.min.js
diff --git a/dist/activity.min.js.map b/dist/activity.min.js.map
diff --git a/example/console.html b/example/console.html
@@ -0,0 +1,18 @@
+<html>
+<head>
+	<script src="../dist/activity.js"></script>
+	<script>
+		Activity.on('active', function () {
+		  console.log("The user is active!");
+		});
+
+		Activity.on('inactive', function () {
+		  console.log("The user is inactive!");
+		});
+
+		Activity.detect();
+	</script>
+</head>
+<body>
+</body>
+</html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "activityjs",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Know when your users are using your site",
   "homepage": "https://github.com/typerandom/activity.js#readme",
   "author": "Robin Orheden",

diff --git a/src/activity.js b/src/activity.js
@@ -209,14 +209,23 @@
 
   Object.freeze(Activity.State);
 
-  // Method that helps with setting up the user monitor.
-  // Forwards all user monitoring events to the window scope.
-  Activity.detect = function detect(options) {
-    if (Activity._instance) {
-      return false;
+  var instance = null;
+  function resolveInstance(options) {
+    return !instance ? instance = new Activity(options) : instance;
+  }
+
+  Activity.configure = function configure(options) {
+    return resolveInstance(options);
+  };
+
+  Activity.detect = function detect() {
+    var instance = resolveInstance();
+
+    if (instance.initialized) {
+      return true;
     }
 
-    var instance = Activity._instance = new Activity(options);
+    instance.initialized = true;
 
     instance.on('inactive', function () {
       window.dispatchEvent(new CustomEvent('user_inactive'));
@@ -231,26 +240,12 @@
     return true;
   };
 
-  // Listen to a event.
   Activity.on = function on(name, listener) {
-    var instance = Activity._instance;
-
-    if (!instance) {
-      throw new Error('Activity.detect() hasn\'t been called.');
-    }
-
-    return instance.on(event, handler);
+    return resolveInstance().on(name, listener);
   };
 
-  // Get activity state.
   Activity.state = function state() {
-    var instance = Activity._instance;
-
-    if (!instance) {
-      throw new Error('Activity.detect() hasn\'t been called.');
-    }
-
-    return instance.state();
+    return resolveInstance().state();
   };
 
   // Replays the current user state to all event listeners.