From d585b4756b9269fa9366d982eba5a1e11fa182a9 Mon Sep 17 00:00:00 2001 From: Bernard Labno Date: Mon, 22 Nov 2010 07:11:15 +0000 Subject: [PATCH] Added "selectable" attribute to coordinatesGrid component. --- pom.xml | 25 +++++++++++++++++++++++-- src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java | 4 ++-- src/main/resources/org/richfaces/renderkit/html/scripts/jquery.pnotify.js | 712 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/main/templates/notify.jspx | 57 --------------------------------------------------------- 4 files changed, 232 insertions(+), 566 deletions(-) delete mode 100644 src/main/templates/notify.jspx diff --git a/pom.xml b/pom.xml index 2d8c3b2..abeebcb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,8 @@ - ui org.richfaces.sandbox + ui 3.3.3.Final 4.0.0 @@ -25,13 +25,31 @@ - org.richfaces.ui + org.richfaces.sandbox.ui notify + http://richfaces.org/notify + + maven-compiler-plugin + true + + 1.5 + 1.5 + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-resources-plugin + 2.2 + + ${project.build.sourceEncoding} + + @@ -41,4 +59,7 @@ ${project.version} + + UTF-8 + diff --git a/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java b/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java index 27da309..985ce73 100644 --- a/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java +++ b/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java @@ -61,7 +61,7 @@ public class NotifyRenderer extends HeaderResourcesRendererBase { } private final InternetResource[] scripts = { - getResource("/org/richfaces/renderkit/html/scripts/jquery-1.4.2.js"), + getResource("/org/richfaces/renderkit/html/scripts/jquery/jquery.js"), getResource("/org/richfaces/renderkit/html/scripts/jquery.pnotify.js"), getResource("/org/richfaces/renderkit/html/scripts/richfaces.notify.js") }; @@ -131,7 +131,7 @@ public class NotifyRenderer extends HeaderResourcesRendererBase { } } - protected Class getComponentClass() { + protected Class getComponentClass() { return UINotify.class; } 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 1d71fee..bfef4db 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 @@ -1,5 +1,5 @@ /* - * jQuery Pines Notify (pnotify) Plugin 1.0.0 + * jQuery Pines Notify (pnotify) Plugin 1.0 * * Copyright (c) 2009 Hunter Perrin * @@ -8,11 +8,10 @@ */ (function($) { - var history_handle_top, timer; - var body; - var jwindow; + var first_top, first_right, history_handle_top, timer; $.extend({ pnotify_remove_all: function () { + var body = $("body"); var body_data = body.data("pnotify"); /* POA: Added null-check */ if (body_data && body_data.length) { @@ -26,167 +25,70 @@ if (timer) clearTimeout(timer); timer = null; + var body = $("body"); + var nexttop = first_top; + var nextright = first_right; + var addwidth = 0; var body_data = body.data("pnotify"); if (!body_data || !body_data.length) return; $.each(body_data, function(){ - var s = this.opts.pnotify_stack; - if (!s) return; - if (!s.nextpos1) - s.nextpos1 = s.firstpos1; - if (!s.nextpos2) - s.nextpos2 = s.firstpos2; - if (!s.addpos2) - s.addpos2 = 0; if (this.css("display") != "none") { - var curpos1, curpos2; - var animate = {}; - // Calculate the current pos1 value. - var csspos1; - switch (s.dir1) { - case "down": - csspos1 = "top"; - break; - case "up": - csspos1 = "bottom"; - break; - case "left": - csspos1 = "right"; - break; - case "right": - csspos1 = "left"; - break; + var postop, posright, animate = {}; + // Calculate the top value, disregarding the scroll, since position=fixed. + postop = this.offset().top - $(window).scrollTop(); + // Remember the topmost position, so the first visible notice goes there. + if (typeof first_top == "undefined") { + first_top = postop; + nexttop = first_top; } - curpos1 = parseInt(this.css(csspos1)); - if (isNaN(curpos1)) - curpos1 = 0; - // Remember the first pos1, so the first visible notice goes there. - if (typeof s.firstpos1 == "undefined") { - s.firstpos1 = curpos1; - s.nextpos1 = s.firstpos1; - } - // Calculate the current pos2 value. - var csspos2; - switch (s.dir2) { - case "down": - csspos2 = "top"; - break; - case "up": - csspos2 = "bottom"; - break; - case "left": - csspos2 = "right"; - break; - case "right": - csspos2 = "left"; - break; - } - curpos2 = parseInt(this.css(csspos2)); - if (isNaN(curpos2)) - curpos2 = 0; - // Remember the first pos2, so the first visible notice goes there. - if (typeof s.firstpos2 == "undefined") { - s.firstpos2 = curpos2; - s.nextpos2 = s.firstpos2; - } - // Check that it's not beyond the viewport edge. - if ((s.dir1 == "down" && s.nextpos1 + this.height() > jwindow.height()) || - (s.dir1 == "up" && s.nextpos1 + this.height() > jwindow.height()) || - (s.dir1 == "left" && s.nextpos1 + this.width() > jwindow.width()) || - (s.dir1 == "right" && s.nextpos1 + this.width() > jwindow.width()) ) { - // If it is, it needs to go back to the first pos1, and over on pos2. - s.nextpos1 = s.firstpos1; - s.nextpos2 += s.addpos2 + 10; - s.addpos2 = 0; - } - // Animate if we're moving on dir2. - if (s.animation && s.nextpos2 < curpos2) { - switch (s.dir2) { - case "down": - animate.top = s.nextpos2+"px"; - break; - case "up": - animate.bottom = s.nextpos2+"px"; - break; - case "left": - animate.right = s.nextpos2+"px"; - break; - case "right": - animate.left = s.nextpos2+"px"; - break; + if (typeof window.innerHeight != "undefined") { + posright = parseInt(this.css("right")); + if (isNaN(posright)) + posright = 18; + // Remember the rightmost position, so the first visible notice goes there. + if (typeof first_right == "undefined") { + first_right = posright; + nextright = first_right; + } + // Check that we're not below the bottom of the page. + if (nexttop + this.height() > window.innerHeight) { + // If we are, we need to go back to the top, and over to the left. + nexttop = first_top; + nextright += addwidth + 10; + addwidth = 0; } - } else - this.css(csspos2, s.nextpos2+"px"); - // Keep track of the widest/tallest notice in the column/row, so we can push the next column/row. - switch (s.dir2) { - case "down": - case "up": - if (this.outerHeight(true) > s.addpos2) - s.addpos2 = this.height(); - break; - case "left": - case "right": - if (this.outerWidth(true) > s.addpos2) - s.addpos2 = this.width(); - break; + // Animate if we're moving to the right. + if (nextright < posright) { + animate.right = nextright+"px"; + } else { + this.css("right", nextright+"px"); + } + // Keep track of the widest notice in the column, so we can push the next column. + if (this.outerWidth(true) > addwidth) + addwidth = this.width(); } - // Move the notice on dir1. - if (s.nextpos1) { - // Animate if we're moving toward the first pos. - if (s.animation && (curpos1 > s.nextpos1 || animate.top || animate.bottom || animate.right || animate.left)) { - switch (s.dir1) { - case "down": - animate.top = s.nextpos1+"px"; - break; - case "up": - animate.bottom = s.nextpos1+"px"; - break; - case "left": - animate.right = s.nextpos1+"px"; - break; - case "right": - animate.left = s.nextpos1+"px"; - break; - } - } else - this.css(csspos1, s.nextpos1+"px"); + if (nexttop) { + // Animate if we're moving up or to the right. + if (postop > nexttop || animate.right) { + animate.top = nexttop+"px"; + } else { + this.css("top", nexttop+"px"); + } } - if (animate.top || animate.bottom || animate.right || animate.left) + if (animate.top || animate.right) this.animate(animate, {duration: 500, queue: false}); - // Calculate the next dir1 position. - switch (s.dir1) { - case "down": - case "up": - s.nextpos1 += this.height() + 10; - break; - case "left": - case "right": - s.nextpos1 += this.width() + 10; - break; - } + nexttop += this.height() + 10; } }); - // Reset the next position data. - $.each(body_data, function(){ - var s = this.opts.pnotify_stack; - if (!s) return; - s.nextpos1 = s.firstpos1; - s.nextpos2 = s.firstpos2; - s.addpos2 = 0; - s.animation = true; - }); }, pnotify: function(options) { - if (!body) - body = $("body"); - if (!jwindow) - jwindow = $(window); - - var animating; + var body = $("body"); + var closer; // Build main options. var opts; - if (typeof options != "object") { + if (typeof options == "string") { opts = $.extend({}, $.pnotify.defaults); opts.pnotify_text = options; } else { @@ -203,143 +105,33 @@ if (opts.pnotify_before_init(opts) === false) return null; } - - // This keeps track of the last element the mouse was over, so - // mouseleave, mouseenter, etc can be called. - var nonblock_last_elem; - // This is used to pass events through the notice if it is non-blocking. - var nonblock_pass = function(e, e_name){ - pnotify.css("display", "none"); - var element_below = document.elementFromPoint(e.clientX, e.clientY); - pnotify.css("display", "block"); - var jelement_below = $(element_below); - var cursor_style = jelement_below.css("cursor"); - pnotify.css("cursor", cursor_style != "auto" ? cursor_style : "default"); - // If the element changed, call mouseenter, mouseleave, etc. - if (!nonblock_last_elem || nonblock_last_elem.get(0) != element_below) { - if (nonblock_last_elem) { - dom_event.call(nonblock_last_elem.get(0), "mouseleave", e.originalEvent); - dom_event.call(nonblock_last_elem.get(0), "mouseout", e.originalEvent); - } - dom_event.call(element_below, "mouseenter", e.originalEvent); - dom_event.call(element_below, "mouseover", e.originalEvent); - } - dom_event.call(element_below, e_name, e.originalEvent); - // Remember the latest element the mouse was over. - nonblock_last_elem = jelement_below; - }; - - // Create our widget. - // Stop animation, reset the removal timer, and show the close - // button when the user mouses over. - var pnotify = $("
", { - "class": "rf-ny "+opts.pnotify_addclass, - "css": {"display": "none"}, - "mouseenter": function(e){ - if (opts.pnotify_nonblock) e.stopPropagation(); - if (opts.pnotify_mouse_reset && animating == "out") { - // If it's animating out, animate back in really quick. - pnotify.stop(true); - pnotify.css("height", "auto").animate({"width": opts.pnotify_width, "opacity": opts.pnotify_nonblock ? opts.pnotify_nonblock_opacity : opts.pnotify_opacity}, "fast"); - } else if (opts.pnotify_nonblock && animating != "out") { - // If it's non-blocking, animate to the other opacity. - pnotify.animate({"opacity": opts.pnotify_nonblock_opacity}, "fast"); - } - if (opts.pnotify_hide && opts.pnotify_mouse_reset) pnotify.pnotify_cancel_remove(); - if (opts.pnotify_closer && !opts.pnotify_nonblock) pnotify.closer.show(); - }, - "mouseleave": function(e){ - if (opts.pnotify_nonblock) e.stopPropagation(); - nonblock_last_elem = null; - pnotify.css("cursor", "auto"); - if (opts.pnotify_nonblock && animating != "out") - pnotify.animate({"opacity": opts.pnotify_opacity}, "fast"); - if (opts.pnotify_hide && opts.pnotify_mouse_reset) pnotify.pnotify_queue_remove(); - pnotify.closer.hide(); - $.pnotify_position_all(); - }, - "mouseover": function(e){ - if (opts.pnotify_nonblock) e.stopPropagation(); - }, - "mouseout": function(e){ - if (opts.pnotify_nonblock) e.stopPropagation(); - }, - "mousemove": function(e){ - if (opts.pnotify_nonblock) { - e.stopPropagation(); - nonblock_pass(e, "onmousemove"); - } - }, - "mousedown": function(e){ - if (opts.pnotify_nonblock) { - e.stopPropagation(); - e.preventDefault(); - nonblock_pass(e, "onmousedown"); - } - }, - "mouseup": function(e){ - if (opts.pnotify_nonblock) { - e.stopPropagation(); - e.preventDefault(); - nonblock_pass(e, "onmouseup"); - } - }, - "click": function(e){ - if (opts.pnotify_nonblock) { - e.stopPropagation(); - nonblock_pass(e, "onclick"); - } - }, - "dblclick": function(e){ - if (opts.pnotify_nonblock) { - e.stopPropagation(); - nonblock_pass(e, "ondblclick"); - } - } - }); + + var pnotify = $("
").addClass("ui-widget ui-helper-clearfix ui-pnotify"); pnotify.opts = opts; - // Create a drop shadow. - if (opts.pnotify_shadow && !$.browser.msie) - pnotify.shadow_container = $("
", {"class": "rf-ny-sh"}).prependTo(pnotify); - // Create a container for the notice contents. - pnotify.container = $("
", {"class": "rf-ny-co"}) - .appendTo(pnotify); + pnotify.container = $("
").addClass("ui-corner-all ui-pnotify-container"); + pnotify.append(pnotify.container); pnotify.pnotify_version = "1.0.0"; - // This function is for updating the notice. pnotify.pnotify = function(options) { // Update the notice. var old_opts = opts; - if (typeof options == "string") + if (typeof options == "string") { opts.pnotify_text = options; - else + } else { opts = $.extend({}, opts, options); - pnotify.opts = opts; - // Update the shadow. - if (opts.pnotify_shadow != old_opts.pnotify_shadow) { - if (opts.pnotify_shadow && !$.browser.msie) - pnotify.shadow_container = $("
", {"class": "rf-ny-sh"}).prependTo(pnotify); - else - pnotify.children(".rf-ny-sh").remove(); } - // Update the additional classes. - if (opts.pnotify_addclass === false) - pnotify.removeClass(old_opts.pnotify_addclass); - else if (opts.pnotify_addclass !== old_opts.pnotify_addclass) - pnotify.removeClass(old_opts.pnotify_addclass).addClass(opts.pnotify_addclass); - // Update the title. - if (opts.pnotify_title === false) - pnotify.title_container.hide("fast"); - else if (opts.pnotify_title !== old_opts.pnotify_title) + if (typeof opts.pnotify_title == "string") { pnotify.title_container.html(opts.pnotify_title).show(200); - // Update the text. - if (opts.pnotify_text === false) { - pnotify.text_container.hide("fast"); - } else if (opts.pnotify_text !== old_opts.pnotify_text) { + } else if (opts.pnotify_title === false) { + pnotify.title_container.hide("fast"); + } + if (typeof opts.pnotify_text == "string") { if (opts.pnotify_insert_brs) - opts.pnotify_text = opts.pnotify_text.replace(/\n/g, "
"); + opts.pnotify_text = opts.pnotify_text.replace("\n", "
"); pnotify.text_container.html(opts.pnotify_text).show(200); + } else if (opts.pnotify_text === false) { + pnotify.text_container.hide("fast"); } pnotify.pnotify_history = opts.pnotify_history; // Change the notice type. @@ -350,77 +142,95 @@ (opts.pnotify_type != old_opts.pnotify_type)) { // Remove any old icon. pnotify.container.find("div.rf-ny-ic").remove(); -// if ((opts.pnotify_error_icon && opts.pnotify_type == "error") || (opts.pnotify_notice_icon)) { + if ((opts.pnotify_notice_icon && opts.pnotify_type == "notice") || (opts.pnotify_error_icon && opts.pnotify_type == "error")) { // Build the new icon. - $("
", {"class": "rf-ny-ic"}) - .append($("", {"class": opts.pnotify_type == "error" ? opts.pnotify_error_icon : opts.pnotify_notice_icon})) - .prependTo(pnotify.container); -// } + var icon = $("
").addClass("rf-ny-ic"); + icon.append($("").addClass(opts.pnotify_type == "notice" ? opts.pnotify_notice_icon : opts.pnotify_error_icon)); + pnotify.container.prepend(icon); + } } // Update the width. - if (opts.pnotify_width !== old_opts.pnotify_width) + if (opts.pnotify_width != old_opts.pnotify_width && typeof opts.pnotify_width == "string") pnotify.animate({width: opts.pnotify_width}); // Update the minimum height. - if (opts.pnotify_min_height !== old_opts.pnotify_min_height) + if (opts.pnotify_min_height != old_opts.pnotify_min_height && typeof opts.pnotify_min_height == "string") pnotify.container.animate({minHeight: opts.pnotify_min_height}); // Update the opacity. - if (opts.pnotify_opacity !== old_opts.pnotify_opacity) + if (opts.pnotify_opacity != old_opts.pnotify_opacity) pnotify.fadeTo(opts.pnotify_animate_speed, opts.pnotify_opacity); - if (!opts.pnotify_hide) + if (!opts.pnotify_hide) { pnotify.pnotify_cancel_remove(); - else if (!old_opts.pnotify_hide) + } else if (!old_opts.pnotify_hide) { pnotify.pnotify_queue_remove(); + } + pnotify.opts = opts; pnotify.pnotify_queue_position(); return pnotify; }; - // Queue the position function so it doesn't run repeatedly and use - // up resources. + pnotify.pnotify_init = function() { + body.append(pnotify); + + // Add events to stop fading when the user mouses over. + if (opts.pnotify_hide) { + pnotify.mouseenter(function(){ + pnotify.stop(); + pnotify.fadeTo("fast", opts.pnotify_opacity); + pnotify.pnotify_cancel_remove(); + }).mouseleave(function(){ + pnotify.pnotify_queue_remove(); + $.pnotify_position_all(); + }); + } + + if (opts.pnotify_closer) { + if (closer) closer.remove(); + closer = $("
").addClass("rf-ny-cl").css("cursor", "pointer"); + closer.append($("").addClass("rf-ny-cl-ic")); + closer.click(function(){ + pnotify.pnotify_remove(); + }); + closer.hide(); + pnotify.container.prepend(closer); + pnotify.hover(function(){ + closer.show(); + }, function(){ + closer.hide(); + }); + } + }; + pnotify.pnotify_queue_position = function() { if (timer) clearTimeout(timer); timer = setTimeout($.pnotify_position_all, 10); }; - // Display the notice. pnotify.pnotify_display = function() { - // If the notice is not in the DOM, append it. - if (!pnotify.parent().length) - pnotify.appendTo(body); - // Run callback. + if (pnotify.parent().get()) + pnotify.pnotify_init(); if (opts.pnotify_before_open) { if (opts.pnotify_before_open(pnotify) === false) return; } pnotify.pnotify_queue_position(); // First show it, then set its opacity, then hide it. - if (opts.pnotify_animation == "fade" || opts.pnotify_animation.effect_in == "fade") { - // If it's fading in, it should start at 0. - pnotify.show().fadeTo(0, 0).hide(); - } else { - // Or else it should be set to the opacity. - if (opts.pnotify_opacity != 1) - pnotify.show().fadeTo(0, opts.pnotify_opacity).hide(); - } + pnotify.show().fadeTo(0, opts.pnotify_opacity).hide(); pnotify.animate_in(function(){ if (opts.pnotify_after_open) opts.pnotify_after_open(pnotify); - - pnotify.pnotify_queue_position(); - + // Now set it to hide. if (opts.pnotify_hide) pnotify.pnotify_queue_remove(); }); }; - // Remove the notice. pnotify.pnotify_remove = function() { if (pnotify.timer) { window.clearTimeout(pnotify.timer); pnotify.timer = null; } - // Run callback. if (opts.pnotify_before_close) { if (opts.pnotify_before_close(pnotify) === false) return; @@ -431,273 +241,171 @@ return; } pnotify.pnotify_queue_position(); - // If we're supposed to remove the notice from the DOM, do it. if (opts.pnotify_remove) - pnotify.detach(); + pnotify.remove(); }); }; - // Animate the notice in. pnotify.animate_in = function(callback){ - // Declare that the notice is animating in. (Or has completed animating in.) - animating = "in"; var animation; - if (typeof opts.pnotify_animation.effect_in != "undefined") + if (typeof opts.pnotify_animation.effect_in != "undefined") { animation = opts.pnotify_animation.effect_in; - else + } else { animation = opts.pnotify_animation; + } if (animation == "none") { pnotify.show(); callback(); - } else if (animation == "show") + } else if (animation == "show") { pnotify.show(opts.pnotify_animate_speed, callback); - else if (animation == "fade") - pnotify.show().fadeTo(opts.pnotify_animate_speed, opts.pnotify_opacity, callback); - else if (animation == "slide") + } else if (animation == "fade") { + pnotify.show().fadeTo(0, 0).fadeTo(opts.pnotify_animate_speed, opts.pnotify_opacity, callback); + } else if (animation == "slide") { pnotify.slideDown(opts.pnotify_animate_speed, callback); - else if (typeof animation == "function") + } else if (typeof animation == "function") { animation("in", callback, pnotify); - else if (pnotify.effect) - pnotify.effect(animation, {}, opts.pnotify_animate_speed, callback); + } else { + if (pnotify.effect) + pnotify.effect(animation, {}, opts.pnotify_animate_speed, callback); + } }; - // Animate the notice out. pnotify.animate_out = function(callback){ - // Declare that the notice is animating out. (Or has completed animating out.) - animating = "out"; var animation; - if (typeof opts.pnotify_animation.effect_out != "undefined") + if (typeof opts.pnotify_animation.effect_out != "undefined") { animation = opts.pnotify_animation.effect_out; - else + } else { animation = opts.pnotify_animation; + } if (animation == "none") { pnotify.hide(); callback(); - } else if (animation == "show") + } else if (animation == "show") { pnotify.hide(opts.pnotify_animate_speed, callback); - else if (animation == "fade") + } else if (animation == "fade") { pnotify.fadeOut(opts.pnotify_animate_speed, callback); - else if (animation == "slide") + } else if (animation == "slide") { pnotify.slideUp(opts.pnotify_animate_speed, callback); - else if (typeof animation == "function") + } else if (typeof animation == "function") { animation("out", callback, pnotify); - else if (pnotify.effect) - pnotify.effect(animation, {}, opts.pnotify_animate_speed, callback); + } else { + if (pnotify.effect) + pnotify.effect(animation, {}, opts.pnotify_animate_speed, callback); + } }; - // Cancel any pending removal timer. pnotify.pnotify_cancel_remove = function() { if (pnotify.timer) window.clearTimeout(pnotify.timer); }; - // Queue a removal timer. pnotify.pnotify_queue_remove = function() { - // Cancel any current removal timer. pnotify.pnotify_cancel_remove(); pnotify.timer = window.setTimeout(function(){ pnotify.pnotify_remove(); }, (isNaN(opts.pnotify_delay) ? 0 : opts.pnotify_delay)); }; - // Provide a button to close the notice. - pnotify.closer = $("
", { - "class": "rf-ny-cl", - "css": {"cursor": "pointer", "display": "none"}, - "click": function(){ - pnotify.pnotify_remove(); - pnotify.closer.hide(); - } - }) - .append($("", {"class": "rf-ny-cl-ic"})) - .appendTo(pnotify.container); +// if (opts.pnotify_type == "error") { +// pnotify.container.addClass("ui-state-error"); +// } else if (opts.pnotify_type == "notice") { +// pnotify.container.addClass("ui-state-highlight"); +// } - // Add the appropriate icon. -// if ((opts.pnotify_error_icon && opts.pnotify_type == "error") || (opts.pnotify_notice_icon)) { - $("
", {"class": "rf-ny-ic"}) - .append($("", {"class": opts.pnotify_type == "error" ? opts.pnotify_error_icon : opts.pnotify_notice_icon})) - .appendTo(pnotify.container); +// if ((opts.pnotify_notice_icon && opts.pnotify_type == "notice") || (opts.pnotify_error_icon && opts.pnotify_type == "error")) { + var icon = $("
").addClass("rf-ny-ic"); + icon.append($("").addClass(opts.pnotify_type == "notice" ? opts.pnotify_notice_icon : opts.pnotify_error_icon)); + pnotify.container.append(icon); // } - // Add a title. - pnotify.title_container = $("
", { - "class": "rf-ny-tl", - "html": opts.pnotify_title - }) - .appendTo(pnotify.container); - if (opts.pnotify_title === false) + pnotify.title_container = $("").addClass("rf-ny-ti"); + pnotify.title_container.html(opts.pnotify_title); + pnotify.container.append(pnotify.title_container); + if (typeof opts.pnotify_title != "string") pnotify.title_container.hide(); - // Replace new lines with HTML line breaks. + pnotify.text_container = $("").addClass("rf-ny-te"); if (opts.pnotify_insert_brs && typeof opts.pnotify_text == "string") - opts.pnotify_text = opts.pnotify_text.replace(/\n/g, "
"); - // Add text. - pnotify.text_container = $("
", { - "class": "rf-ny-te", - "html": opts.pnotify_text - }) - .appendTo(pnotify.container); - if (opts.pnotify_text === false) + opts.pnotify_text = opts.pnotify_text.replace("\n", "
"); + pnotify.text_container.html(opts.pnotify_text); + pnotify.container.append(pnotify.text_container); + if (typeof opts.pnotify_text != "string") pnotify.text_container.hide(); - // Set width and min height. if (typeof opts.pnotify_width == "string") pnotify.css("width", opts.pnotify_width); + if (typeof opts.pnotify_min_height == "string") pnotify.container.css("min-height", opts.pnotify_min_height); - // The history variable controls whether the notice gets redisplayed - // by the history pull down. pnotify.pnotify_history = opts.pnotify_history; - // Add the notice to the notice array. + pnotify.hide(); + var body_data = body.data("pnotify"); - if (body_data == null || typeof body_data != "object") - body_data = []; - if (opts.pnotify_stack.push == "top") - body_data = $.merge([pnotify], body_data); - else - body_data = $.merge(body_data, [pnotify]); + if (typeof body_data != "object") + body_data = Array(); + body_data = $.merge(body_data, [pnotify]); body.data("pnotify", body_data); - // Run callback. if (opts.pnotify_after_init) opts.pnotify_after_init(pnotify); + pnotify.pnotify_display(); + if (opts.pnotify_history) { - // If there isn't a history pull down, create one. var body_history = body.data("pnotify_history"); if (typeof body_history == "undefined") { - body_history = $("
", { - "class": "rf-ny-hc", - "mouseleave": function(){ - body_history.animate({top: "-"+history_handle_top+"px"}, {duration: 100, queue: false}); - } - }) - .append($("
", {"class": "rf-ny-hh", "text": "Redisplay"})) - .append($("").addClass("rf-ny-hh").hover(function(){ + $(this).addClass("ui-state-hover"); + }, function(){ + $(this).removeClass("ui-state-hover"); + }).click(function(){ + $.each(body_data, function(){ + if (this.pnotify_history && this.pnotify_display) + this.pnotify_display(); + }); + })); + body_history.append($("").addClass("rf-ny-hl").hover(function(){ + $(this).addClass("ui-state-hover"); + }, function(){ + $(this).removeClass("ui-state-hover"); + }).click(function(){ + var i = 1; + while (!body_data[body_data.length - i] || !body_data[body_data.length - i].pnotify_history) { + if (body_data.length - i === 0) + return; + i++; } - }) - .appendTo(body_history); - - // Get the top of the handle. + if (body_data[body_data.length - i].pnotify_display) + body_data[body_data.length - i].pnotify_display(); + })); + + var handle = $("").addClass("rf-ny-hp").mouseenter(function(){ + body_history.animate({top: "0"}, {duration: 100, queue: false}); + }); + body_history.append(handle); history_handle_top = handle.offset().top + 2; - // Hide the history pull down up to the top of the handle. + + body_history.mouseleave(function(){ + body_history.animate({top: "-"+history_handle_top+"px"}, {duration: 100, queue: false}); + }); body_history.css({top: "-"+history_handle_top+"px"}); - // Save the history pull down. + body.data("pnotify_history", body_history); } } - // Mark the stack so it won't animate the new notice. - opts.pnotify_stack.animation = false; - - // Display the notice. - pnotify.pnotify_display(); - return pnotify; } }); - // Some useful regexes. - var re_on = /^on/; - var re_mouse_events = /^(dbl)?click$|^mouse(move|down|up|over|out|enter|leave)$|^contextmenu$/; - var re_ui_events = /^(focus|blur|select|change|reset)$|^key(press|down|up)$/; - var re_html_events = /^(scroll|resize|(un)?load|abort|error)$/; - // Fire a DOM event. - var dom_event = function(e, orig_e){ - var event_object; - e = e.toLowerCase(); - if (document.createEvent && this.dispatchEvent) { - // FireFox, Opera, Safari, Chrome - e = e.replace(re_on, ''); - if (e.match(re_mouse_events)) { - // This allows the click event to fire on the notice. There is - // probably a much better way to do it. - $(this).offset(); - event_object = document.createEvent("MouseEvents"); - event_object.initMouseEvent( - e, orig_e.bubbles, orig_e.cancelable, orig_e.view, orig_e.detail, - orig_e.screenX, orig_e.screenY, orig_e.clientX, orig_e.clientY, - orig_e.ctrlKey, orig_e.altKey, orig_e.shiftKey, orig_e.metaKey, orig_e.button, orig_e.relatedTarget - ); - } else if (e.match(re_ui_events)) { - event_object = document.createEvent("UIEvents"); - event_object.initUIEvent(e, orig_e.bubbles, orig_e.cancelable, orig_e.view, orig_e.detail); - } else if (e.match(re_html_events)) { - event_object = document.createEvent("HTMLEvents"); - event_object.initEvent(e, orig_e.bubbles, orig_e.cancelable); - } - if (!event_object) return; - this.dispatchEvent(event_object); - } else { - // Internet Explorer - if (!e.match(re_on)) e = "on"+e; - event_object = document.createEventObject(orig_e); - this.fireEvent(e, event_object); - } - }; - $.pnotify.defaults = { - // The notice's title. - pnotify_title: false, - // The notice's text. - pnotify_text: false, - // Additional classes to be added to the notice. (For custom styling.) - pnotify_addclass: "", - // Create a non-blocking notice. It lets the user click elements underneath it. - pnotify_nonblock: false, - // The opacity of the notice (if it's non-blocking) when the mouse is over it. - pnotify_nonblock_opacity: .2, - // Display a pull down menu to redisplay previous notices, and place the notice in the history. + // Display a pull down menu to redisplay previous notices, and place this notice in the history. pnotify_history: true, // Width of the notice. pnotify_width: "300px", @@ -711,25 +419,19 @@ pnotify_error_icon: "", // The animation to use when displaying and hiding the notice. "none", "show", "fade", and "slide" are built in to jQuery. Others require jQuery UI. Use an object with effect_in and effect_out to use different effects. pnotify_animation: "fade", - // Speed at which the notice animates in and out. "slow", "def" or "normal", "fast" or number of milliseconds. + // Speed at which the notice fades or animates in and out. "slow", "def" or "normal", "fast" or number of milliseconds. pnotify_animate_speed: "slow", - // Opacity of the notice. + // Opacity to fade to. pnotify_opacity: 1, - // Display a drop shadow. - pnotify_shadow: false, - // Provide a button for the user to manually close the notice. + // Provide a button for the user to manually close a notice. pnotify_closer: true, - // After a delay, remove the notice. + // After a delay, make the notice disappear. pnotify_hide: true, - // Delay in milliseconds before the notice is removed. + // Delay in milliseconds before the notice disappears. pnotify_delay: 8000, - // Reset the hide timer if the mouse moves over the notice. - pnotify_mouse_reset: true, - // Remove the notice's elements from the DOM after it is removed. + // Remove the notice from the DOM after it disappears. pnotify_remove: true, // Change new lines to br tags. - pnotify_insert_brs: true, - // The stack on which the notices will be placed. Also controls the direction the notices stack. - pnotify_stack: {"dir1": "down", "dir2": "left", "push": "bottom"} + pnotify_insert_brs: true }; })(jQuery); \ No newline at end of file diff --git a/src/main/templates/notify.jspx b/src/main/templates/notify.jspx deleted file mode 100644 index 45fe3d2..0000000 --- a/src/main/templates/notify.jspx +++ /dev/null @@ -1,57 +0,0 @@ - - - - - /org/richfaces/renderkit/html/scripts/jquery-1.4.2.js, - /org/richfaces/renderkit/html/scripts/jquery.pnotify.js - /org/richfaces/renderkit/html/css/jquery.pnotify.xcss - - -
- - - - -
- -- libgit2 0.24.0