gritter 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a4d70ada18b99410d0f29cb2616f6dadefa0f8
-  data.tar.gz: 0623da1810fb180cd63be4c65de5848a45eb36c5
+  metadata.gz: 54551106ba744c1616af221540c32425cad73c52
+  data.tar.gz: 2626b99d7700a1238e8592c815507c93a14ee69f
 SHA512:
-  metadata.gz: 46f1ab7a732ebe9eadadaad6df43df5a362166b687a0221f9a092eb8979a3cc4b99c46de9317578340e4b8b2c99247d37c032adea9935f719b55e26106ae9a86
-  data.tar.gz: 40b1829f0b6607b46038825ac5effb30aa71885005bb503e8d6a1afa1778c7f7bccd78d7c630cd35a8a72030ee234f06320547b3566dcaebf7ea294b1dcda2a5
+  metadata.gz: b1bc25056d1afe902436d82e2a014ba91425c9c46416936a234b224334b47652d7cc7a1434e71d9b7f7bf37bb42b1c308a2e2b5e827d269802fda9b3d5748053
+  data.tar.gz: 32aee095cae9c5453cf874a57cb171774252a4d8228f933679b4fed56f8e3ea95c5fb4702feb1a7d067f396427f24404bf8efb151629ff54593fb3c3a3421bef

data/README.md

@@ -1,8 +1,7 @@
 # gritter
 
-    version 1.1.0
+    version 1.2.0
     Robin Brouwer
-    montblanc
 
 This Ruby on Rails gem allows you to easily add Growl-like notifications to your application using a jQuery plugin called 'gritter'. [Check out the demo for this plugin](http://boedesign.com/demos/gritter/).
 
@@ -16,7 +15,7 @@ Also check out that branch, because the newer version of gritter inside this gem
 
 You can use this gem by putting the following inside your Gemfile:
 
-    gem "gritter", "1.1.0"
+    gem "gritter", "1.2.0"
 
 Now generate the locale for gritter:
 
@@ -34,9 +33,14 @@ And that's it!
 
 ## Changes
 
+Version 1.2.0 changes (02/08/2015):
+    
+    - Added Rails 4 support.
+    - Added on_click support.
+
 Version 1.1.0 changes (31/01/2013):
     
-    - All gflash messages are also stored in the Rails flash messages.
+    - All gflash messages can also be stored in the Rails flash messages (optional).
     - Added i18n interpolation for gflash messages.
     - Added default values for the gflash messages.
     - Fixed several other issues.
@@ -111,6 +115,7 @@ There are many more arguments you can pass to the helper:
 :class_name => "gritter"               # => Allows you to set a different classname.
 :before_open => "alert('Opening!');"   # => Execute javascript before opening.
 :after_open => "alert('Opened!');"     # => Execute javascript after opening.
+:on_click => "alert('Clicked!');"      # => Execute javascript on click (close button click is ignored).
 :before_close => "alert('Closing!');"  # => Execute javascript before closing.
 :after_close => "alert('Closed!');"    # => Execute javascript after closing.
 :nodom_wrap  => true                   # => Removes the DOM wrap on the produced JQuery code. Default, this argument
@@ -275,7 +280,7 @@ Here you can set the locales for all your gflash messages and the titles. It wor
           progress: "Progress"
         products: # => Controller name
           create: # => Action name
-            notice: "Custom notice message"
+            notice: "Custom notice message"case
 
 It's also possible to add default gflash messages.
 
@@ -331,7 +336,7 @@ def create
     render :new
   end
 end
-```ruby
+```
 
 You can also use gflash directly inside the `redirect_to` method.
 
@@ -438,4 +443,4 @@ Many thanks to Jordan Boesch, creator of the AWESOME jQuery plugin gritter.
 http://boedesign.com/blog/2009/07/11/growl-for-jquery-gritter/
 
 Also special thanks to Liam McKay for creating the awesome icons!
-http://wefunction.com/2008/07/function-free-icon-set/
+http://wefunction.com/2008/07/function-free-icon-set/

data/{vendor → app}/assets/javascripts/gritter.js

@@ -10,7 +10,7 @@
  */
 
 // Modernizr for CSS3 support check.
-window.Modernizr = function (a, b, c) {
+window.GritterModernizr = function (a, b, c) {
    function A(a, b) {
        var c = a.charAt(0).toUpperCase() + a.substr(1),
            d = (a + " " + m.join(c + " ") + c).split(" ");
@@ -127,7 +127,7 @@ window.Modernizr = function (a, b, c) {
   */
   var gritter_item;
   var gritter_content = '[[close]][[image]]<div class="[[class_name]]"><span class="gritter-title">[[username]]</span><p>[[text]]</p></div><div style="clear:both"></div>';
-  if(Modernizr.borderradius && Modernizr.rgba) {
+  if(GritterModernizr.borderradius && GritterModernizr.rgba) {
     gritter_item = '<div class="gritter-item gritter-css3">'+ gritter_content +'</div>';
   } else {
     gritter_item = '<div class="gritter-top"></div><div class="gritter-item gritter-css2">'+ gritter_content +'</div><div class="gritter-bottom"></div>';    
@@ -186,7 +186,7 @@ window.Modernizr = function (a, b, c) {
         tmp = this._tpl_item;
       
       // Assign callbacks
-      $(['before_open', 'after_open', 'before_close', 'after_close']).each(function(i, val){
+      $(['before_open', 'after_open', 'before_close', 'after_close', 'on_click']).each(function(i, val){
         Gritter['_' + val + '_' + number] = ($.isFunction(params[val])) ? params[val] : function(){}
       });
 
@@ -219,6 +219,27 @@ window.Modernizr = function (a, b, c) {
       if(!sticky){
         this._setFadeTimer(item, number);
       }
+
+      // Add on_click listener
+      $(item).click(function(){
+        Gritter['_' + 'on_click' + '_' + number]($(this));
+      });
+    
+      /**  
+         *  In order to avoid conflicts between on_click and before/after_close 
+         *  Disable on_click event when hover over close button
+         *  Enable on_click event on mouse leave
+      */
+      $(item).find('.gritter-close').bind('mouseenter mouseleave', function(event){
+        if(event.type == 'mouseenter'){
+          $(item).off("click");
+        }
+        else {
+          $(item).on("click",function(){
+            Gritter['_' + 'on_click' + '_' + number]($(this));
+          });
+        }
+      });
       
       // Bind the hover/unhover states
       $(item).bind('mouseenter mouseleave', function(event){

data/{vendor → app}/assets/stylesheets/gritter.css.scss

@@ -28,18 +28,18 @@
 .gritter-item-wrapper {
   position:relative;
   margin:0 0 10px 0;
-  background:url(image_path('ie-spacer.gif')); // ie7/8 fix
+  background:url(asset-url('ie-spacer.gif')); // ie7/8 fix
 }
 
 .gritter-top {
-  background:url(image_path('gritter.png')) no-repeat left -30px;
+  background:url(asset-url('gritter.png')) no-repeat left -30px;
   height:10px;
 }
 .hover .gritter-top {
   background-position:right -30px;
 }
 .gritter-bottom {
-  background:url(image_path('gritter.png')) no-repeat left bottom;
+  background:url(asset-url('gritter.png')) no-repeat left bottom;
   height:8px;
   margin:0;
 }
@@ -56,7 +56,7 @@
   filter:inherit; // ie8 fix
   
   &.gritter-css2 {
-    background:url(image_path('gritter.png')) no-repeat left -40px;
+    background:url(asset-url('gritter.png')) no-repeat left -40px;
   }
   &.gritter-css3 {
     background:rgba(0, 0, 0, 0.8);
@@ -91,10 +91,10 @@
   filter:inherit; // ie8 fix
 }
 .gritter-css2 .gritter-close {
-  background:url(image_path('gritter.png')) no-repeat left top;
+  background:url(asset-url('gritter.png')) no-repeat left top;
 }
 .gritter-css3 .gritter-close {
-  background:url(image_path('gritter-close.png')) no-repeat;
+  background:url(asset-url('gritter-close.png')) no-repeat;
 }
 
 .gritter-title {

data/gritter.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.version     = Gritter::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Robin Brouwer"]
-  s.email       = ["robin@montblanc.nl"]
-  s.homepage    = "http://www.montblanc.nl"
+  s.email       = ["robin@sparkforce.nl"]
+  s.homepage    = "http://www.sparkforce.nl"
   s.summary     = %q{Growl notifications for your Rails application.}
   s.description = %q{This Ruby on Rails gem allows you to easily add Growl-like notifications to your application using a jQuery plugin called 'gritter'.}
   

data/lib/gritter/helpers.rb

@@ -3,7 +3,7 @@ module Gritter
     def add_gritter text, *args
       options = args.extract_options!
       options[:title] = "Notification" if options[:title].blank?
-      options[:image] = asset_path("#{options[:image]}#{options[:image].to_s == 'progress' ? '.gif' : '.png'}") if %w(success warning error notice progress).include?(options[:image].to_s)
+      options[:image] = image_path("#{options[:image]}#{options[:image].to_s == 'progress' ? '.gif' : '.png'}") if %w(success warning error notice progress).include?(options[:image].to_s)
       notification = Array.new
       notification.push("jQuery(function(){") if options[:nodom_wrap].blank?
       notification.push("jQuery.gritter.add({")
@@ -15,6 +15,7 @@ module Gritter
       notification.push("after_open:function(e){#{options[:after_open]}},") if options[:after_open].present?
       notification.push("before_close:function(e){#{options[:before_close]}},") if options[:before_close].present?
       notification.push("after_close:function(e){#{options[:after_close]}},") if options[:after_close].present?
+      notification.push("on_click:function(e){#{options[:on_click]}},") if options[:on_click].present?
       notification.push("title:'#{escape_javascript(options[:title])}',")
       notification.push("text:'#{escape_javascript(text)}'")
       notification.push("});")
@@ -54,6 +55,7 @@ module Gritter
         titles = gflash_titles(options)
         flashes = []
         session[:gflash].each do |key, value|
+          key = key.to_sym
           value.each do |gflash_value|
             gritter_options = { :image => key, :title => titles[key], :nodom_wrap => nodom_wrap }
             if gflash_value.is_a?(Hash)

data/lib/gritter/railtie.rb

@@ -4,6 +4,7 @@ if defined?(Rails::Railtie)
       initializer :gritter do
         Gritter.initialize
       end
+      config.assets.precompile += %w(error.png gritter-close.png gritter.png ie-spacer.gif notice.png progress.gif success.png warning.png)
     end
   end
 end

data/lib/gritter/version.rb

@@ -1,3 +1,3 @@
 module Gritter
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: gritter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Robin Brouwer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies: []
 description: This Ruby on Rails gem allows you to easily add Growl-like notifications
   to your application using a jQuery plugin called 'gritter'.
 email:
-- robin@montblanc.nl
+- robin@sparkforce.nl
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -22,6 +22,16 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- app/assets/images/error.png
+- app/assets/images/gritter-close.png
+- app/assets/images/gritter.png
+- app/assets/images/ie-spacer.gif
+- app/assets/images/notice.png
+- app/assets/images/progress.gif
+- app/assets/images/success.png
+- app/assets/images/warning.png
+- app/assets/javascripts/gritter.js
+- app/assets/stylesheets/gritter.css.scss
 - gritter.gemspec
 - init.rb
 - lib/generators/gritter/USAGE
@@ -33,17 +43,7 @@ files:
 - lib/gritter/helpers.rb
 - lib/gritter/railtie.rb
 - lib/gritter/version.rb
-- vendor/assets/images/error.png
-- vendor/assets/images/gritter-close.png
-- vendor/assets/images/gritter.png
-- vendor/assets/images/ie-spacer.gif
-- vendor/assets/images/notice.png
-- vendor/assets/images/progress.gif
-- vendor/assets/images/success.png
-- vendor/assets/images/warning.png
-- vendor/assets/javascripts/gritter.js
-- vendor/assets/stylesheets/gritter.css.scss
-homepage: http://www.montblanc.nl
+homepage: http://www.sparkforce.nl
 licenses: []
 metadata: {}
 post_install_message: 
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Growl notifications for your Rails application.