ultimate-flash 0.9.0 → 0.9.2

data/app/assets/javascripts/ultimate/flash.js.coffee

@@ -1,5 +1,5 @@
 ###*
- * Ultimate Flash 0.9.0 - Ruby on Rails oriented jQuery plugin for smart notifications
+ * Ultimate Flash 0.9.2 - Ruby on Rails oriented jQuery plugin for smart notifications
  * Copyright 2011-2013 Karpunin Dmitry (KODer) / Evrone.com
  * Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
  *
@@ -27,7 +27,7 @@
  *
  * * * USE INSTEAD
  * @usage
- *   window.flash = new Ultimate.Plugin.Flash[(Object options = {})]
+ *   window.flash = new Ultimate.Plugins.Flash[(Object options = {})]
  *   flash.notice String text
 ###
 
@@ -159,6 +159,9 @@ class Ultimate.Plugins.Flash extends Ultimate.__FlashClass
       clearTimeout jFlash.data('timeoutId')
       @_hide jFlash.addClass('hide'), @_getOptionOverFlash('slideTime', jFlash)
 
+  _template: (type, text) ->
+    "<div class=\"#{@flashClass} #{type}\" style=\"display: none;\">#{text}</div>"
+
   _append: (jFlash) ->
     jFlash.appendTo @$el
 
@@ -173,7 +176,7 @@ class Ultimate.Plugins.Flash extends Ultimate.__FlashClass
       excessFlashes = jActiveFlashes.length - (@maxFlashes - 1)
       if excessFlashes > 0
         @hide jActiveFlashes.slice(0, excessFlashes)
-    jFlash = $("<div class=\"#{@flashClass} #{type}\" style=\"display: none;\">#{text}</div>")
+    jFlash = $(@_template(type, text))
     if perFlashOptions
       jFlash.data(key, value)  for key, value of perFlashOptions
     @_show @_append(jFlash), @_getOptionOverFlash('slideTime', perFlashOptions)
@@ -247,7 +250,8 @@ class Ultimate.Plugins.Flash extends Ultimate.__FlashClass
     if jqXHR.responseText
       try
         # try parse respose as json
-        if parsedJSON = $.parseJSON(jqXHR.responseText)
+        parsedJSON = $.parseJSON(jqXHR.responseText)
+        if _.isObject(parsedJSON) and not _.isEmpty(parsedJSON)
           # catch 'flash' object and call auto() method with autodetecting flash-notice type
           return @auto(parsedJSON['flash'])  if parsedJSON['flash']
           # catch 'error' object and call alert() method
@@ -256,18 +260,20 @@ class Ultimate.Plugins.Flash extends Ultimate.__FlashClass
           if @detectFormErrors is true
             # show message about form with errors
             return @alert(@t('formFieldsError'))
-          else if _.isFunction(@detectFormErrors)
-            # using showFormError as callback
-            return @detectFormErrors.apply(@, [parsedJSON])
+          else if _.isFunction(@detectFormErrors) and (detectedError = @detectFormErrors(parsedJSON))
+            # using detectFormErrors as callback
+            return @alert(detectedError)
           else
             # nothing
             return false
       catch e
         # nop
+    # about 404: https://github.com/bcardarella/client_side_validations/issues/297
+    return false  if jqXHR.status < 400 or jqXHR.status is 404
     if @productionMode
       thrownError = @t('defaultThrownError')
     else
-      if jqXHR.status >= 400 and jqXHR.responseText
+      if jqXHR.responseText
         # try detect Rails raise message
         if raiseMatches = jqXHR.responseText.match(/<\/h1>\n<pre>(.+?)<\/pre>/)
           thrownError = raiseMatches[1]

data/app/assets/stylesheets/ultimate/flash.scss

@@ -1,4 +1,4 @@
-//  NOTE: This style require usage of https://github.com/evrone/ultimate-mixins
+//  NOTE: This style require usage of https://github.com/evrone/ultimate-mixins or Piebone
 //
 //  Usage:
 //    .l-page__flashes {
@@ -42,7 +42,7 @@
     font-size:     24px;
     line-height:   30px;
     color:         $text-color;
-    @include box-sizing;
+    @include box-sizing(border-box);
     @include pie-bg($default-background);
     border-bottom: 2px solid $default-border-color;
     @if $opacity < 1 {

data/lib/ultimate-flash/version.rb

@@ -1,5 +1,5 @@
 module Ultimate
   module Flash
-    VERSION = '0.9.0'
+    VERSION = '0.9.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultimate-flash
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies: []
 description: Ruby on Rails oriented jQuery plugin for smart notifications
 email: