From 3006a8cbbe994aabe03596c5b4b49a6959454669 Mon Sep 17 00:00:00 2001
From: Bernard Labno <bernard.labno@itcrowd.pl>
Date: Sun, 18 Jul 2010 07:49:49 +0000
Subject: [PATCH] Fixed notify javascript and errors from migration from 4.0.0

---
 src/main/java/org/richfaces/component/NotifyAttributes.java               | 15 ---------------
 src/main/resources/org/richfaces/renderkit/html/scripts/jquery.pnotify.js |  6 ++++++
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/richfaces/component/NotifyAttributes.java b/src/main/java/org/richfaces/component/NotifyAttributes.java
index f1dcc20..918d30c 100644
--- a/src/main/java/org/richfaces/component/NotifyAttributes.java
+++ b/src/main/java/org/richfaces/component/NotifyAttributes.java
@@ -22,71 +22,56 @@
 
 package org.richfaces.component;
 
-import org.richfaces.cdk.annotations.Attribute;
-
 public interface NotifyAttributes {
 
-    @Attribute
     boolean isSticky();
 
     void setSticky(boolean sticky);
 
-    @Attribute
     Integer getStayTime();
 
     void setStayTime(Integer time);
 
-    @Attribute
     Integer getDelay();
 
     void setDelay(Integer delay);
 
-    @Attribute
     String getStyleClass();
 
     void setStyleClass(String styleClass);
 
-    @Attribute
     String getAppearAnimation();
 
     void setAppearAnimation(String appearAnimation);
 
-    @Attribute
     String getHideAnimation();
 
     void setHideAnimation(String hideAnimation);
 
-    @Attribute
     Integer getAnimationSpeed();
 
     void setAnimationSpeed(Integer animationSpeed);
 
-    @Attribute
     boolean isShowHistory();
 
     void setShowHistory(boolean showHistory);
 
-    @Attribute
     boolean isNonblocking();
 
     void setNonblocking(boolean nonblocking);
 
-    @Attribute
     boolean isShowShadow();
 
     void setShowShadow(boolean showShadow);
 
-    @Attribute(defaultValue = "true")
     boolean isShowCloseButton();
 
     void setShowCloseButton(boolean showCloseButton);
 
-    @Attribute
     Double getNonblockingOpacity();
 
     void setNonblockingOpacity(Double nonblockingOpacity);
 
-    @Attribute
     String getStack();
 
     void setStack(String stack);
diff --git a/src/main/resources/org/richfaces/renderkit/html/scripts/jquery.pnotify.js b/src/main/resources/org/richfaces/renderkit/html/scripts/jquery.pnotify.js
index ce68fbd..1d71fee 100644
--- a/src/main/resources/org/richfaces/renderkit/html/scripts/jquery.pnotify.js
+++ b/src/main/resources/org/richfaces/renderkit/html/scripts/jquery.pnotify.js
@@ -191,6 +191,12 @@
 				opts.pnotify_text = options;
 			} else {
 				opts = $.extend({}, $.pnotify.defaults, options);
+                if (opts['pnotify_animation'] instanceof Object) {
+                    opts['pnotify_animation'] = $.extend({
+                        effect_in:$.pnotify.defaults.pnotify_animation,
+                        effect_out:$.pnotify.defaults.pnotify_animation
+                    }, opts['pnotify_animation']);
+                }
 			}
 
 			if (opts.pnotify_before_init) {
--
libgit2 0.24.0