growlyflash 0.1.3 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGNhYTdjMDY2NzNiMTQ0OTg2NDg2ZTg2NmNmZWNkN2NiNmMwODc2MA==
+    YzVlZDcwMDJhN2Y3ZWViNzA5ODkzYTUxMzg0YmUyZGM0ZGQ3NGVhNg==
   data.tar.gz: !binary |-
-    ZTEzN2IyNDY0YTE3NDI0NjJjNWI2ZmY0YmEwYzdiYWQzMmQ5ODgzNA==
+    ZTI2Nzc3ZDhjODMwODlhODJkYWEyNDQ1MWI0YWQ0OTUzYjBlOGYzZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGIyMDQ5YmJkM2FlZmI0YTAzZTc3ZWU1MDMwNzA3ODYzYmFlNzYwN2ZhZTE5
-    OGZlY2ZmMjdjMTliODAzYWJjZWI3NjMxNmUxOTM4NzNiNTIzM2ZiMGZmZTM5
-    NGNjMTQ3YzQyZTJkOTcwOTE0MjU0NWQ4ZjI5NDQ1MWZhZDdlYzY=
+    MjM4OTMxNjMwNjQ2YjNjZGM1NjZkNmI4NDVjMTdiYTE0MDljZGRmMDVlN2Zj
+    MjE1OTkzMWE3NmM3NmI1YmJkODFlMWZiNTgyMzc3N2FjMDkxODFmNTMyYmMy
+    NmI1N2EwYzE2YjU3YTkzNzgyNTIzMjU3YmM5ZTk5Mzk0MjQ3YzY=
   data.tar.gz: !binary |-
-    Y2Y0Zjk5MzVhZTdkZGY1OGQwMThhODZjY2JiZDNlYTIyNDVjY2RiYTBkMWVj
-    MjY3Y2RmMjM2OGFmYWI5ZDcyNTJiYzA3NDFiNDk5Yzc5YjE2NWYyOWM3MmY5
-    MzlmM2YwZWJmY2QwYWI2ZTgzY2EzOWIyNjBjNzFjMDU0MWYwOTA=
+    ZmNlYjVhOGIwY2NmYjJkNzcwZGMxMGI3MmE1M2ViY2I2NjNkYWZhNjc3NjZi
+    NDBiNTNjMjM3ZWQyMmRlMGViYWM3MDFmZTljNzQwNzMzYWQ5NjM3NjU3ODQz
+    ZmZjMWU0MjlmYTY5OTkxMTk2MDFjNWIwOTIzZWFlYjRmMGM1YzI=

data/lib/growlyflash/version.rb

@@ -1,3 +1,3 @@
 module Growlyflash
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/vendor/assets/javascripts/growlyflash/bootstrap-growl.js.coffee

@@ -2,54 +2,63 @@
 
 $ = jQuery
 
-$.extend
-  bootstrapGrowl: (message, options) ->
-    settings =
-      ele: 'body'
-      type: null
-      offset: from:'top',  amount:20
-      align: "right"
-      width: 250
-      delay: 4000
-      allow_dismiss: true
-      stackup_spacing: 10
-    
-    settings = $.extend settings, options
-    
-    html_attrs = 
-      class: 'bootstrap-growl alert'
-      html: ''
-    html_attrs.class += " alert-#{settings.type}" if settings.type?
-    html_attrs.html += """<a class="close" data-dismiss="alert" href="#">&times;</a>""" if settings.allow_dismiss
-    html_attrs.html += message
-  
-    $alert = $ '<div />', html_attrs
-
-    # Prevent BC breaks
-    if settings.top_offset?
-      settings.offset = from:'top',  amount:settings.top_offset
-
-    # calculate any 'stack-up'
-    offsetAmount = settings.offset.amount
-    $(".bootstrap-growl").each ->
-      offsetAmount = Math.max(offsetAmount, parseInt($(@).css(settings.offset.from)) + $(@).outerHeight() + settings.stackup_spacing)
-
-    $alert.css
-      position: (if (settings.ele == 'body') then 'fixed' else 'absolute')
-      margin: 0
-      zIndex: 9999
-      display: 'none'
-      width: (if (settings.width != 'auto') then "#{settings.width}px" else 'auto')
-    $alert.css settings.offset.from, "#{offsetAmount}px"
-
-    # have to append before we can use outerWidth()
-    $(settings.ele).append $alert
-    $alert.css switch settings.align
-      when "center" then left:'50%', marginLeft:"-#{($alert.outerWidth() / 2)}px"
-      when "left"   then left:'20px'
-      else right:'20px'
-    $alert.fadeIn()
-
-    # Only remove after delay if delay is more than 0
-    if settings.delay > 0
-      $alert.delay(settings.delay).fadeOut -> $(@).remove()
+old = $.bootstrapGrowl
+
+$.bootstrapGrowl = (message, options) ->
+  settings = $.extend {}, $.bootstrapGrowl.defaults, options
+
+  html_attrs = 
+    class: 'bootstrap-growl alert'
+    html: ''
+  html_attrs.class += " alert-#{settings.type}" if settings.type?
+  html_attrs.html += """<a class="close" data-dismiss="alert" href="#">&times;</a>""" if settings.can_dismiss
+  html_attrs.html += message
+
+  DivAlert = $ '<div />', html_attrs
+
+  # calculate any 'stack-up'
+  offset = settings.offset.amount
+  $(".bootstrap-growl").each ->
+    offset_from  = parseInt $(@).css settings.offset.from
+    height = $(@).outerHeight()
+    offset = Math.max offset, offset_from + height + settings.spacing
+
+  DivAlert.css
+    position: (if settings.target is 'body' then 'fixed' else 'absolute')
+    margin: 0
+    zIndex: 9999
+    display: 'none'
+    width: (if settings.width isnt 'auto' then "#{settings.width}px" else 'auto')
+
+  DivAlert.css settings.offset.from, "#{offset}px"
+
+  # have to append before we can use outerWidth()
+  $(settings.target).append DivAlert
+
+  DivAlert.css switch settings.align
+    when "center" then left: '50%', marginLeft:"-#{DivAlert.outerWidth() / 2}px"
+    when "left"   then left: '20px'
+    else right: '20px'
+  DivAlert.fadeIn()
+
+  # Only remove after delay if delay is more than 0
+  if settings.delay > 0
+    DivAlert.delay(settings.delay).fadeOut -> $(@).remove()
+
+  @
+
+$.bootstrapGrowl.defaults = 
+  width:    250
+  delay:    4000
+  spacing:  10  
+  target:   'body'
+  align:    'right'
+  dismiss:  true
+  type:     null
+  offset:   
+    from:   'top'
+    amount: 20
+
+$.bootstrapGrowl.noConflict = ->
+  $.bootstrapGrowl = old
+  @

data/vendor/assets/javascripts/growlyflash/growlyflash.js.coffee

@@ -45,12 +45,12 @@ class Growlyflash
     do callback
   
   get_log_matches: (messages) ->
-    last_log = @flashes_log.slice -messages.length
+    last_log = @flash_log.slice -messages.length
     not_matches = 0
     not_matches++ for id, f of messages when (last_log[id].type isnt f.type) and (last_log[id].msg isnt f.msg)
     not_matches > 0
 
 root.Growlyflash = Growlyflash
 
-jQuery ->
+$ ->
   new Growlyflash document

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: growlyflash
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Tõnis Simo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties