auto-session-timeout-warning 0.1.1 → 0.1.2

data/lib/auto/session/timeout/warning/version.rb

@@ -2,7 +2,7 @@ module Auto
   module Session
     module Timeout
       module Warning
-        VERSION = "0.1.1"
+        VERSION = "0.1.2"
       end
     end
   end

data/lib/auto_session_timeout_warning.rb

@@ -27,7 +27,7 @@ module AutoSessionTimeoutWarning
 
   def render_session_status
     response.headers["Etag"] = ""  # clear etags to prevent caching
-    render text: !!current_user, status: 200
+    render json: {live: !!current_user, timeout: session[:auto_session_expires_at]}
   end
 
   def render_session_timeout

data/lib/auto_session_timeout_warning_helper.rb

@@ -32,9 +32,11 @@ if(typeof(jQuery) != 'undefined'){
     $.ajax({
       url: '/active',
       success: function(data) {
-        if(data == 'false'){
+        if(new Date(data.timeout).getTime() < (new Date().getTime() + #{warning} * 1000)){
           showDialog();
-          setTimeout(doTimeout, (#{warning} * 1000));
+        }
+        if(data.live == false){
+          window.location.href = '/timeout';
         }
       }
     });
@@ -45,10 +47,6 @@ if(typeof(jQuery) != 'undefined'){
   function showDialog(){
     $('.logout_dialog').trigger('click');
   }
-
-  function doTimeout(){
-    window.location.href = '/timeout';
-  }
 }
 JS
     javascript_tag(code)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto-session-timeout-warning
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler