Commit 3006a8cbbe994aabe03596c5b4b49a6959454669
1 parent
7c2d851a
Fixed notify javascript and errors from migration from 4.0.0
Showing
2 changed files
with
6 additions
and
15 deletions
... | ... | @@ -22,71 +22,56 @@ |
22 | 22 | |
23 | 23 | package org.richfaces.component; |
24 | 24 | |
25 | -import org.richfaces.cdk.annotations.Attribute; | |
26 | - | |
27 | 25 | public interface NotifyAttributes { |
28 | 26 | |
29 | - @Attribute | |
30 | 27 | boolean isSticky(); |
31 | 28 | |
32 | 29 | void setSticky(boolean sticky); |
33 | 30 | |
34 | - @Attribute | |
35 | 31 | Integer getStayTime(); |
36 | 32 | |
37 | 33 | void setStayTime(Integer time); |
38 | 34 | |
39 | - @Attribute | |
40 | 35 | Integer getDelay(); |
41 | 36 | |
42 | 37 | void setDelay(Integer delay); |
43 | 38 | |
44 | - @Attribute | |
45 | 39 | String getStyleClass(); |
46 | 40 | |
47 | 41 | void setStyleClass(String styleClass); |
48 | 42 | |
49 | - @Attribute | |
50 | 43 | String getAppearAnimation(); |
51 | 44 | |
52 | 45 | void setAppearAnimation(String appearAnimation); |
53 | 46 | |
54 | - @Attribute | |
55 | 47 | String getHideAnimation(); |
56 | 48 | |
57 | 49 | void setHideAnimation(String hideAnimation); |
58 | 50 | |
59 | - @Attribute | |
60 | 51 | Integer getAnimationSpeed(); |
61 | 52 | |
62 | 53 | void setAnimationSpeed(Integer animationSpeed); |
63 | 54 | |
64 | - @Attribute | |
65 | 55 | boolean isShowHistory(); |
66 | 56 | |
67 | 57 | void setShowHistory(boolean showHistory); |
68 | 58 | |
69 | - @Attribute | |
70 | 59 | boolean isNonblocking(); |
71 | 60 | |
72 | 61 | void setNonblocking(boolean nonblocking); |
73 | 62 | |
74 | - @Attribute | |
75 | 63 | boolean isShowShadow(); |
76 | 64 | |
77 | 65 | void setShowShadow(boolean showShadow); |
78 | 66 | |
79 | - @Attribute(defaultValue = "true") | |
80 | 67 | boolean isShowCloseButton(); |
81 | 68 | |
82 | 69 | void setShowCloseButton(boolean showCloseButton); |
83 | 70 | |
84 | - @Attribute | |
85 | 71 | Double getNonblockingOpacity(); |
86 | 72 | |
87 | 73 | void setNonblockingOpacity(Double nonblockingOpacity); |
88 | 74 | |
89 | - @Attribute | |
90 | 75 | String getStack(); |
91 | 76 | |
92 | 77 | void setStack(String stack); | ... | ... |
... | ... | @@ -191,6 +191,12 @@ |
191 | 191 | opts.pnotify_text = options; |
192 | 192 | } else { |
193 | 193 | opts = $.extend({}, $.pnotify.defaults, options); |
194 | + if (opts['pnotify_animation'] instanceof Object) { | |
195 | + opts['pnotify_animation'] = $.extend({ | |
196 | + effect_in:$.pnotify.defaults.pnotify_animation, | |
197 | + effect_out:$.pnotify.defaults.pnotify_animation | |
198 | + }, opts['pnotify_animation']); | |
199 | + } | |
194 | 200 | } |
195 | 201 | |
196 | 202 | if (opts.pnotify_before_init) { | ... | ... |
Please
register
or
login
to post a comment