Merge branch 'release/1.2.2'

grbsk · grbsk · commit 7c741a424866 · 2016-04-29T13:27:33.000-04:00
diff --git a/angular-idle.js b/angular-idle.js
@@ -1,6 +1,6 @@
 /*** Directives and services for responding to idle users in AngularJS
 * @author Mike Grabski <me@mikegrabski.com>
-* @version v1.2.1
+* @version v1.2.2
 * @link https://github.com/HackedByChinese/ng-idle.git
 * @license MIT
 */
diff --git a/angular-idle.min.js b/angular-idle.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-idle",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "homepage": "https://github.com/HackedByChinese/ng-idle",
   "description": "Responding to idle users in AngularJS",
   "main": "angular-idle.js",
diff --git a/gruntfile.js b/gruntfile.js
@@ -38,7 +38,7 @@ module.exports = function(grunt) {
         browsers: [grunt.option('browser') || 'Chrome']
       }
     },
-    clean: [pkg.main],
+    clean: [],
     concat: {
       options: {
         stripBanners: true,
@@ -74,6 +74,6 @@ module.exports = function(grunt) {
 
   grunt.registerTask('test', ['karma:unit']);
   grunt.registerTask('test-server', ['karma:server']);
-  grunt.registerTask('build', ['clean', 'concat:js', 'uglify']);
+  grunt.registerTask('build', ['concat:js', 'uglify']);
   grunt.registerTask('sample', ['connect']);
 };
diff --git a/index.js b/index.js
@@ -0,0 +1,2 @@
+require('./angular-idle');
+module.exports = 'ngIdle';
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-idle",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Directives and services for responding to idle users in AngularJS",
   "keywords": [
     "angularjs",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ng-idle",`
`3`		`- "version": "1.2.1",`
	`3`	`+ "version": "1.2.2",`
`4`	`4`	`"homepage": "https://github.com/HackedByChinese/ng-idle",`
`5`	`5`	`"description": "Responding to idle users in AngularJS",`
`6`	`6`	`"main": "angular-idle.js",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+require('./angular-idle');`
	`2`	`+module.exports = 'ngIdle';`