thin_man 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7505c23309e907eb80f25e8efb2dbbce0c0b6e84
-  data.tar.gz: ae498426ab48b3cee758a0998b7dc4004b99f0e9
+  metadata.gz: c78fa7fda7cd7c1a392af814feb0302669c812b0
+  data.tar.gz: b945bb9dc6bd45f6baf3930efff768c09638dee7
 SHA512:
-  metadata.gz: 77f3cdb8f2e7dcfcc56a77dcc03de079e78a4b24f32024eb661ed84b8888b397e1c10267209e2fc51f20a2574f45bcb3585b8e4f1a7978e178c9baf2fea973aa
-  data.tar.gz: a7875b7830ade5ff848936c2bf2f1eca0cd375256f17570364c75bc3a06c65a209b7ebb5691103eeca540d0382839562fa5834e6067bcb0186ba64fbd709d4d8
+  metadata.gz: ab36ac0ec87222b67cf959fe9a4efc2a0a2384f85182e4b9a08030a0b68a24c5561012e75bdffbaf13dfc7fd7e990990d09694c11aa50897d453d47826c9e6c9
+  data.tar.gz: 55deb2c24be04ab2eb04739ec43616edbf4cf515efa03cec9a86bb65c21d6ce6fb4e9001b16ca69700cdcb4a29fef4b6da8be83624286a42469581e68ba1a7e8

data/app/assets/javascripts/ajax_bindings.js

@@ -142,11 +142,19 @@ var AjaxSubmission = Class.extend({
       // hmmm, the response is not JSON, so there's no flash.
     }
     if(typeof response_data.flash_message != 'undefined'){
-      flash_style = this.httpResponseToFlashStyle(jqXHR.status)
+      var flash_style = this.httpResponseToFlashStyle(jqXHR.status);
+      var flash_duration = null;
+      if(typeof response_data.flash_persist != 'undefined'){
+        if(response_data.flash_persist){
+          flash_duration = 'persist'
+        } else {
+          flash_duration = 'fade'
+        }
+      }
       if(this.target){
-        new AjaxFlash(flash_style, response_data.flash_message,this.target);
+        new AjaxFlash(flash_style, response_data.flash_message,this.target, flash_duration);
       }else{
-        new AjaxFlash(flash_style, response_data.flash_message,this.jq_obj);
+        new AjaxFlash(flash_style, response_data.flash_message,this.jq_obj, flash_duration);
       }
     }
     if('function' == typeof this.params.on_complete){
@@ -241,16 +249,34 @@ var AjaxProgress = Class.extend({
   }
 });
 var AjaxFlash = Class.extend({
-  init: function(type,message,elem){
+  init: function(type,message,elem,duration){
     this.flash_container = $('#thin-man-flash-container').clone();
     $('body').append(this.flash_container);
     this.flash_container.css({position:'absolute',visibility: 'hidden'});
+    this.alert_type = type;
+    this.elem = elem;
     var alert_class = 'alert-' + type;
     this.flash_container.addClass(alert_class);
     $('#thin-man-flash-content', this.flash_container).html(message);
     this.flash_container.show();
+    this.setFadeBehavior(duration);
     this.reposition(elem);
   },
+  setFadeBehavior: function(duration){
+    if(duration){
+      if('persist' == duration){
+        this.fade = false
+      } else {
+        this.fade = true
+      }
+    }else{ //default behavior if persist duration is not sent back with message
+      if('error' == this.alert_type || 'warning' == this.alert_type || 'info' == this.alert_type){
+        this.fade = false;
+      } else {
+        this.fade = true;
+      }
+    }
+  },
   reposition: function(elem){
     var this_window = {
       top: $(window).scrollTop(),
@@ -270,8 +296,8 @@ var AjaxFlash = Class.extend({
     var new_left = this_window.horiz_middle - this_flash.half_width;
     this.flash_container.css({left: new_left, top: new_top, visibility: 'visible'});
     var ajax_flash = this;
-    if (! $('form', elem).data('ajax-flash-persist')) {
-      setTimeout(function(){ajax_flash.fadeOut()},1000);
+    if (this.fade) {
+      setTimeout(function(){ajax_flash.fadeOut()},1618);
     }
   },
   fadeOut: function(){

data/lib/thin_man/version.rb

@@ -1,3 +1,3 @@
 module ThinMan
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thin_man
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Eric Draut, Adam Bialek