January 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r16263 - in branches/enterprise/3.3.X/ui/fileUpload/src/main: templates/org/richfaces and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-01-12 10:50:39 -0500 (Tue, 12 Jan 2010) New Revision: 16263 Modified: branches/enterprise/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java branches/enterprise/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx Log: RFPL-228 porting RF-8053 to enterprise branch Modified: branches/enterprise/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java =================================================================== --- branches/enterprise/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-01-12 14:47:48 UTC (rev 16262) +++ branches/enterprise/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-01-12 15:50:39 UTC (rev 16263) @@ -469,6 +469,17 @@ } /** + * https://jira.jboss.org/jira/browse/RF-8053 - public hook to change action URL in portlet environment. + * @param context + * @return + */ + public String getActionUrl(FacesContext context){ + AjaxContext ajaxContext = org.ajax4jsf.context.AjaxContext.getCurrentInstance(context); + String ajaxActionUrl = ajaxContext.getAjaxActionURL(context); + return ajaxActionUrl; + } + + /** * Return accepted types map * * @param context Modified: branches/enterprise/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx =================================================================== --- branches/enterprise/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2010-01-12 14:47:48 UTC (rev 16262) +++ branches/enterprise/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2010-01-12 15:50:39 UTC (rev 16263) @@ -49,10 +49,6 @@ variables.setVariable("uploadLabel",labels.get("upload")); variables.setVariable("clearAllLabel",labels.get("clear_all")); - org.ajax4jsf.context.AjaxContext ajaxContext = org.ajax4jsf.context.AjaxContext.getCurrentInstance(context); - String ajaxActionUrl = ajaxContext.getAjaxActionURL(context); - - variables.setVariable("actionUrl", ajaxActionUrl); variables.setVariable("formId",getFormId(context, component)); variables.setVariable("containerId",getContainerId(context, component)); @@ -198,7 +194,7 @@ onfileuploadcomplete : #{this:getAsEventHandler(context, component, "onfileuploadcomplete")} }; - new FileUpload('#{clientId}','#{formId}','#{actionUrl}',#{this:getStopScript(context, component)}, #{this:getFileSizeScript(context, component)} ,'#{this:getProgressBarId(context, component)}', FileUpload.CLASSES, #{this:getLabelMarkup(context, component)}, #{maxCount}, events, #{component.attributes["disabled"]}, #{this:getAcceptedTypes(context, component)}, {'autoclear':#{component.attributes["autoclear"]},'autoUpload':#{component.attributes["immediateUpload"]},'noDuplicate':#{component.attributes["noDuplicate"]}, 'allowFlash':'#{allowFlash}', 'flashComponentUrl':'#{flashComponent}'},#{this:_getLabels(labels)},#{this:getChildrenParams(context, component)},'#{this:getSessionId(context, component)}'); + new FileUpload('#{clientId}','#{formId}','#{this:getActionUrl(context)}',#{this:getStopScript(context, component)}, #{this:getFileSizeScript(context, component)} ,'#{this:getProgressBarId(context, component)}', FileUpload.CLASSES, #{this:getLabelMarkup(context, component)}, #{maxCount}, events, #{component.attributes["disabled"]}, #{this:getAcceptedTypes(context, component)}, {'autoclear':#{component.attributes["autoclear"]},'autoUpload':#{component.attributes["immediateUpload"]},'noDuplicate':#{component.attributes["noDuplicate"]}, 'allowFlash':'#{allowFlash}', 'flashComponentUrl':'#{flashComponent}'},#{this:_getLabels(labels)},#{this:getChildrenParams(context, component)},'#{this:getSessionId(context, component)}'); </script> </span> <f:call name="utils.encodeEndFormIfNessesary" />

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16262 - branches/community/3.3.X/framework/impl/src/main/java-jsf20/org/richfaces/context.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-01-12 09:47:48 -0500 (Tue, 12 Jan 2010) New Revision: 16262 Modified: branches/community/3.3.X/framework/impl/src/main/java-jsf20/org/richfaces/context/PartialViewContextImpl.java Log: https://jira.jboss.org/jira/browse/RF-8204 Modified: branches/community/3.3.X/framework/impl/src/main/java-jsf20/org/richfaces/context/PartialViewContextImpl.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java-jsf20/org/richfaces/context/PartialViewContextImpl.java 2010-01-12 13:03:35 UTC (rev 16261) +++ branches/community/3.3.X/framework/impl/src/main/java-jsf20/org/richfaces/context/PartialViewContextImpl.java 2010-01-12 14:47:48 UTC (rev 16262) @@ -75,6 +75,16 @@ } @Override + public boolean isAjaxRequest() { + if (partialViewContext.isAjaxRequest()) { + return true; + } + + /* Hack for Sun RI implementation of StateManager/ResponseStateManager */ + return Boolean.TRUE.equals(getPartialViewContextIndicator(facesContext)); + } + + @Override public boolean isPartialRequest() { if (partialViewContext.isPartialRequest()) { return true; @@ -88,4 +98,5 @@ public void setPartialRequest(boolean isPartialRequest) { partialViewContext.setPartialRequest(isPartialRequest); } + }

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16261 - in root/examples-sandbox/trunk: javascripts-draft and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2010-01-12 08:03:35 -0500 (Tue, 12 Jan 2010) New Revision: 16261 Added: root/examples-sandbox/trunk/javascripts-draft/ root/examples-sandbox/trunk/javascripts-draft/position/ root/examples-sandbox/trunk/javascripts-draft/position/1.html root/examples-sandbox/trunk/javascripts-draft/position/jquery.position.js root/examples-sandbox/trunk/javascripts-draft/position/jquery.utils.js root/examples-sandbox/trunk/javascripts-draft/position/jquery/ root/examples-sandbox/trunk/javascripts-draft/position/jquery/jquery-1.3.2.js Log: position draft jQuery plugin and simple example Added: root/examples-sandbox/trunk/javascripts-draft/position/1.html =================================================================== --- root/examples-sandbox/trunk/javascripts-draft/position/1.html (rev 0) +++ root/examples-sandbox/trunk/javascripts-draft/position/1.html 2010-01-12 13:03:35 UTC (rev 16261) @@ -0,0 +1,18 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <script src="jquery/jquery-1.3.2.js" type="text/javascript"></script> + <script src="jquery.utils.js" type="text/javascript"></script> + <script src="jquery.position.js" type="text/javascript"></script> + </head> + <body> + <div id="aaa" style="background-color:red">aaa</div> + <div id="bbb" style="background-color:blue">bbb</div> + <div id="ccc" style="background-color:green">ccc</div> + <div id="tooltip" style="position: absolute; background-color: gray;">tooltip</div> + <script> + jQuery('#tooltip').position(jQuery('#aaa')); + jQuery('#bbb').bind("click",function(e){jQuery('#tooltip').position(e);}); + jQuery('#tooltip').position({left:10,top:10,width:0,height:0}); + </script> + </boby> +</html> \ No newline at end of file Added: root/examples-sandbox/trunk/javascripts-draft/position/jquery/jquery-1.3.2.js =================================================================== --- root/examples-sandbox/trunk/javascripts-draft/position/jquery/jquery-1.3.2.js (rev 0) +++ root/examples-sandbox/trunk/javascripts-draft/position/jquery/jquery-1.3.2.js 2010-01-12 13:03:35 UTC (rev 16261) @@ -0,0 +1,4412 @@ +/*! + * jQuery JavaScript Library v1.3.2 + * http://jquery.com/ + * + * Copyright (c) 2009 John Resig + * Dual licensed under the MIT and GPL licenses. + * http://docs.jquery.com/License + * + * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) + * Revision: 6246 + */ +(function(){ + +var + // Will speed up references to window, and allows munging its name. + window = this, + // Will speed up references to undefined, and allows munging its name. + undefined, + // Map over jQuery in case of overwrite + _jQuery = window.jQuery, + // Map over the $ in case of overwrite + _$ = window.$, + + jQuery = window.jQuery = window.j$ = function( selector, context ) { + // RF: added for RichFaces components + if (arguments[0] == arguments.callee) { + return arguments.callee; + } + // The jQuery object is actually just the init constructor 'enhanced' + return new jQuery.fn.init( selector, context ); + }, + + // A simple way to check for HTML strings or ID strings + // (both of which we optimize for) + quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/, + // Is it a simple selector + isSimple = /^.[^:#\[\.,]*$/; + +jQuery.fn = jQuery.prototype = { + init: function( selector, context ) { + // Make sure that a selection was provided + selector = selector || document; + + // Handle $(DOMElement) + if ( selector.nodeType ) { + this[0] = selector; + this.length = 1; + this.context = selector; + return this; + } + // Handle HTML strings + if ( typeof selector === "string" ) { + // Are we dealing with HTML string or an ID? + var match = quickExpr.exec( selector ); + + // Verify a match, and that no context was specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) + selector = jQuery.clean( [ match[1] ], context ); + + // HANDLE: $("#id") + else { + var elem = document.getElementById( match[3] ); + + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem && elem.id != match[3] ) + return jQuery().find( selector ); + + // Otherwise, we inject the element directly into the jQuery object + var ret = jQuery( elem || [] ); + ret.context = document; + ret.selector = selector; + return ret; + } + + // HANDLE: $(expr, [context]) + // (which is just equivalent to: $(content).find(expr) + } else + return jQuery( context ).find( selector ); + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) + return jQuery( document ).ready( selector ); + + // Make sure that old selector state is passed along + if ( selector.selector && selector.context ) { + this.selector = selector.selector; + this.context = selector.context; + } + + return this.setArray(jQuery.isArray( selector ) ? + selector : + jQuery.makeArray(selector)); + }, + + // Start with an empty selector + selector: "", + + // The current version of jQuery being used + jquery: "1.3.2", + + // The number of elements contained in the matched element set + size: function() { + return this.length; + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num === undefined ? + + // Return a 'clean' array + Array.prototype.slice.call( this ) : + + // Return just the object + this[ num ]; + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems, name, selector ) { + // Build a new jQuery matched element set + var ret = jQuery( elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + + ret.context = this.context; + + if ( name === "find" ) + ret.selector = this.selector + (this.selector ? " " : "") + selector; + else if ( name ) + ret.selector = this.selector + "." + name + "(" + selector + ")"; + + // Return the newly-formed element set + return ret; + }, + + // Force the current matched set of elements to become + // the specified array of elements (destroying the stack in the process) + // You should use pushStack() in order to do this, but maintain the stack + setArray: function( elems ) { + // Resetting the length to 0, then using the native Array push + // is a super-fast way to populate an object with array-like properties + this.length = 0; + Array.prototype.push.apply( this, elems ); + + return this; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + // Determine the position of an element within + // the matched set of elements + index: function( elem ) { + // Locate the position of the desired element + return jQuery.inArray( + // If it receives a jQuery object, the first element is used + elem && elem.jquery ? elem[0] : elem + , this ); + }, + + attr: function( name, value, type ) { + var options = name; + + // Look for the case where we're accessing a style value + if ( typeof name === "string" ) + if ( value === undefined ) + return this[0] && jQuery[ type || "attr" ]( this[0], name ); + + else { + options = {}; + options[ name ] = value; + } + + // Check to see if we're setting style values + return this.each(function(i){ + // Set all the styles + for ( name in options ) + jQuery.attr( + type ? + this.style : + this, + name, jQuery.prop( this, options[ name ], type, i, name ) + ); + }); + }, + + css: function( key, value ) { + // ignore negative width and height values + if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 ) + value = undefined; + return this.attr( key, value, "curCSS" ); + }, + + text: function( text ) { + if ( typeof text !== "object" && text != null ) + return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) ); + + var ret = ""; + + jQuery.each( text || this, function(){ + jQuery.each( this.childNodes, function(){ + if ( this.nodeType != 8 ) + ret += this.nodeType != 1 ? + this.nodeValue : + jQuery.fn.text( [ this ] ); + }); + }); + + return ret; + }, + + wrapAll: function( html ) { + if ( this[0] ) { + // The elements to wrap the target around + var wrap = jQuery( html, this[0].ownerDocument ).clone(); + + if ( this[0].parentNode ) + wrap.insertBefore( this[0] ); + + wrap.map(function(){ + var elem = this; + + while ( elem.firstChild ) + elem = elem.firstChild; + + return elem; + }).append(this); + } + + return this; + }, + + wrapInner: function( html ) { + return this.each(function(){ + jQuery( this ).contents().wrapAll( html ); + }); + }, + + wrap: function( html ) { + return this.each(function(){ + jQuery( this ).wrapAll( html ); + }); + }, + + append: function() { + return this.domManip(arguments, true, function(elem){ + if (this.nodeType == 1) + this.appendChild( elem ); + }); + }, + + prepend: function() { + return this.domManip(arguments, true, function(elem){ + if (this.nodeType == 1) + this.insertBefore( elem, this.firstChild ); + }); + }, + + before: function() { + return this.domManip(arguments, false, function(elem){ + this.parentNode.insertBefore( elem, this ); + }); + }, + + after: function() { + return this.domManip(arguments, false, function(elem){ + this.parentNode.insertBefore( elem, this.nextSibling ); + }); + }, + + end: function() { + return this.prevObject || jQuery( [] ); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: [].push, + sort: [].sort, + splice: [].splice, + + find: function( selector ) { + if ( this.length === 1 ) { + var ret = this.pushStack( [], "find", selector ); + ret.length = 0; + jQuery.find( selector, this[0], ret ); + return ret; + } else { + return this.pushStack( jQuery.unique(jQuery.map(this, function(elem){ + return jQuery.find( selector, elem ); + })), "find", selector ); + } + }, + + clone: function( events ) { + // Do the clone + var ret = this.map(function(){ + if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) { + // IE copies events bound via attachEvent when + // using cloneNode. Calling detachEvent on the + // clone will also remove the events from the orignal + // In order to get around this, we use innerHTML. + // Unfortunately, this means some modifications to + // attributes in IE that are actually only stored + // as properties will not be copied (such as the + // the name attribute on an input). + var html = this.outerHTML; + if ( !html ) { + var div = this.ownerDocument.createElement("div"); + div.appendChild( this.cloneNode(true) ); + html = div.innerHTML; + } + + return jQuery.clean([html.replace(/ jQuery\d+="(?:\d+|null)"/g, "").replace(/^\s*/, "")])[0]; + } else + return this.cloneNode(true); + }); + + // Copy the events from the original to the clone + if ( events === true ) { + var orig = this.find("*").andSelf(), i = 0; + + ret.find("*").andSelf().each(function(){ + if ( this.nodeName !== orig[i].nodeName ) + return; + + var events = jQuery.data( orig[i], "events" ); + + for ( var type in events ) { + for ( var handler in events[ type ] ) { + jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data ); + } + } + + i++; + }); + } + + // Return the cloned set + return ret; + }, + + filter: function( selector ) { + return this.pushStack( + jQuery.isFunction( selector ) && + jQuery.grep(this, function(elem, i){ + return selector.call( elem, i ); + }) || + + jQuery.multiFilter( selector, jQuery.grep(this, function(elem){ + return elem.nodeType === 1; + }) ), "filter", selector ); + }, + + closest: function( selector ) { + var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null, + closer = 0; + + return this.map(function(){ + var cur = this; + while ( cur && cur.ownerDocument ) { + if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) { + jQuery.data(cur, "closest", closer); + return cur; + } + cur = cur.parentNode; + closer++; + } + }); + }, + + not: function( selector ) { + if ( typeof selector === "string" ) + // test special case where just one selector is passed in + if ( isSimple.test( selector ) ) + return this.pushStack( jQuery.multiFilter( selector, this, true ), "not", selector ); + else + selector = jQuery.multiFilter( selector, this ); + + var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType; + return this.filter(function() { + return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector; + }); + }, + + add: function( selector ) { + return this.pushStack( jQuery.unique( jQuery.merge( + this.get(), + typeof selector === "string" ? + jQuery( selector ) : + jQuery.makeArray( selector ) + ))); + }, + + is: function( selector ) { + return !!selector && jQuery.multiFilter( selector, this ).length > 0; + }, + + hasClass: function( selector ) { + return !!selector && this.is( "." + selector ); + }, + + val: function( value ) { + if ( value === undefined ) { + var elem = this[0]; + + if ( elem ) { + if( jQuery.nodeName( elem, 'option' ) ) + return (elem.attributes.value || {}).specified ? elem.value : elem.text; + + // We need to handle select boxes special + if ( jQuery.nodeName( elem, "select" ) ) { + var index = elem.selectedIndex, + values = [], + options = elem.options, + one = elem.type == "select-one"; + + // Nothing was selected + if ( index < 0 ) + return null; + + // Loop through all the selected options + for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { + var option = options[ i ]; + + if ( option.selected ) { + // Get the specifc value for the option + value = jQuery(option).val(); + + // We don't need an array for one selects + if ( one ) + return value; + + // Multi-Selects return an array + values.push( value ); + } + } + + return values; + } + + // Everything else, we just grab the value + return (elem.value || "").replace(/\r/g, ""); + + } + + return undefined; + } + + if ( typeof value === "number" ) + value += ''; + + return this.each(function(){ + if ( this.nodeType != 1 ) + return; + + if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) ) + this.checked = (jQuery.inArray(this.value, value) >= 0 || + jQuery.inArray(this.name, value) >= 0); + + else if ( jQuery.nodeName( this, "select" ) ) { + var values = jQuery.makeArray(value); + + jQuery( "option", this ).each(function(){ + this.selected = (jQuery.inArray( this.value, values ) >= 0 || + jQuery.inArray( this.text, values ) >= 0); + }); + + if ( !values.length ) + this.selectedIndex = -1; + + } else + this.value = value; + }); + }, + + html: function( value ) { + return value === undefined ? + (this[0] ? + this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g, "") : + null) : + this.empty().append( value ); + }, + + replaceWith: function( value ) { + return this.after( value ).remove(); + }, + + eq: function( i ) { + return this.slice( i, +i + 1 ); + }, + + slice: function() { + return this.pushStack( Array.prototype.slice.apply( this, arguments ), + "slice", Array.prototype.slice.call(arguments).join(",") ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function(elem, i){ + return callback.call( elem, i, elem ); + })); + }, + + andSelf: function() { + return this.add( this.prevObject ); + }, + + domManip: function( args, table, callback ) { + if ( this[0] ) { + var fragment = (this[0].ownerDocument || this[0]).createDocumentFragment(), + scripts = jQuery.clean( args, (this[0].ownerDocument || this[0]), fragment ), + first = fragment.firstChild; + + if ( first ) + for ( var i = 0, l = this.length; i < l; i++ ) + callback.call( root(this[i], first), this.length > 1 || i > 0 ? + fragment.cloneNode(true) : fragment ); + + if ( scripts ) + jQuery.each( scripts, evalScript ); + } + + return this; + + function root( elem, cur ) { + return table && jQuery.nodeName(elem, "table") && jQuery.nodeName(cur, "tr") ? + (elem.getElementsByTagName("tbody")[0] || + elem.appendChild(elem.ownerDocument.createElement("tbody"))) : + elem; + } + } +}; + +// Give the init function the jQuery prototype for later instantiation +jQuery.fn.init.prototype = jQuery.fn; + +function evalScript( i, elem ) { + if ( elem.src ) + jQuery.ajax({ + url: elem.src, + async: false, + dataType: "script" + }); + + else + jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" ); + + if ( elem.parentNode ) + elem.parentNode.removeChild( elem ); +} + +function now(){ + return +new Date; +} + +jQuery.extend = jQuery.fn.extend = function() { + // copy reference to target object + var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + target = arguments[1] || {}; + // skip the boolean and the target + i = 2; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) + target = {}; + + // extend jQuery itself if only one argument is passed + if ( length == i ) { + target = this; + --i; + } + + for ( ; i < length; i++ ) + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) + // Extend the base object + for ( var name in options ) { + var src = target[ name ], copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) + continue; + + // Recurse if we're merging object values + if ( deep && copy && typeof copy === "object" && !copy.nodeType ) + target[ name ] = jQuery.extend( deep, + // Never move original objects, clone them + src || ( copy.length != null ? [ ] : { } ) + , copy ); + + // Don't bring in undefined values + else if ( copy !== undefined ) + target[ name ] = copy; + + } + + // Return the modified object + return target; +}; + +// exclude the following css properties to add px +var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, + // cache defaultView + defaultView = document.defaultView || {}, + toString = Object.prototype.toString; + +jQuery.extend({ + noConflict: function( deep ) { + window.$ = _$; + + if ( deep ) + window.jQuery = _jQuery; + + return jQuery; + }, + + // See test/unit/core.js for details concerning isFunction. + // Since version 1.3, DOM methods and functions like alert + // aren't supported. They return false on IE (#2968). + isFunction: function( obj ) { + return toString.call(obj) === "[object Function]"; + }, + + isArray: function( obj ) { + return toString.call(obj) === "[object Array]"; + }, + + // check if an element is in a (or is an) XML document + isXMLDoc: function( elem ) { + return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" || + !!elem.ownerDocument && jQuery.isXMLDoc( elem.ownerDocument ); + }, + + // Evalulates a script in a global context + globalEval: function( data ) { + if ( data && /\S/.test(data) ) { + // Inspired by code by Andrea Giammarchi + // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom... + var head = document.getElementsByTagName("head")[0] || document.documentElement, + script = document.createElement("script"); + + script.type = "text/javascript"; + if ( jQuery.support.scriptEval ) + script.appendChild( document.createTextNode( data ) ); + else + script.text = data; + + // Use insertBefore instead of appendChild to circumvent an IE6 bug. + // This arises when a base node is used (#2709). + head.insertBefore( script, head.firstChild ); + head.removeChild( script ); + } + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); + }, + + // args is for internal usage only + each: function( object, callback, args ) { + var name, i = 0, length = object.length; + + if ( args ) { + if ( length === undefined ) { + for ( name in object ) + if ( callback.apply( object[ name ], args ) === false ) + break; + } else + for ( ; i < length; ) + if ( callback.apply( object[ i++ ], args ) === false ) + break; + + // A special, fast, case for the most common use of each + } else { + if ( length === undefined ) { + for ( name in object ) + if ( callback.call( object[ name ], name, object[ name ] ) === false ) + break; + } else + for ( var value = object[0]; + i < length && callback.call( value, i, value ) !== false; value = object[++i] ){} + } + + return object; + }, + + prop: function( elem, value, type, i, name ) { + // Handle executable functions + if ( jQuery.isFunction( value ) ) + value = value.call( elem, i ); + + // Handle passing in a number to a CSS property + return typeof value === "number" && type == "curCSS" && !exclude.test( name ) ? + value + "px" : + value; + }, + + className: { + // internal only, use addClass("class") + add: function( elem, classNames ) { + jQuery.each((classNames || "").split(/\s+/), function(i, className){ + if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) ) + elem.className += (elem.className ? " " : "") + className; + }); + }, + + // internal only, use removeClass("class") + remove: function( elem, classNames ) { + if (elem.nodeType == 1) + elem.className = classNames !== undefined ? + jQuery.grep(elem.className.split(/\s+/), function(className){ + return !jQuery.className.has( classNames, className ); + }).join(" ") : + ""; + }, + + // internal only, use hasClass("class") + has: function( elem, className ) { + return elem && jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1; + } + }, + + // A method for quickly swapping in/out CSS properties to get correct calculations + swap: function( elem, options, callback ) { + var old = {}; + // Remember the old values, and insert the new ones + for ( var name in options ) { + old[ name ] = elem.style[ name ]; + elem.style[ name ] = options[ name ]; + } + + callback.call( elem ); + + // Revert the old values + for ( var name in options ) + elem.style[ name ] = old[ name ]; + }, + + css: function( elem, name, force, extra ) { + if ( name == "width" || name == "height" ) { + var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ]; + + function getWH() { + val = name == "width" ? elem.offsetWidth : elem.offsetHeight; + + if ( extra === "border" ) + return; + + jQuery.each( which, function() { + if ( !extra ) + val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; + if ( extra === "margin" ) + val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0; + else + val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; + }); + } + + if ( elem.offsetWidth !== 0 ) + getWH(); + else + jQuery.swap( elem, props, getWH ); + + return Math.max(0, Math.round(val)); + } + + return jQuery.curCSS( elem, name, force ); + }, + + curCSS: function( elem, name, force ) { + var ret, style = elem.style; + + // We need to handle opacity special in IE + if ( name == "opacity" && !jQuery.support.opacity ) { + ret = jQuery.attr( style, "opacity" ); + + return ret == "" ? + "1" : + ret; + } + + // Make sure we're using the right name for getting the float value + if ( name.match( /float/i ) ) + name = styleFloat; + + if ( !force && style && style[ name ] ) + ret = style[ name ]; + + else if ( defaultView.getComputedStyle ) { + + // Only "float" is needed here + if ( name.match( /float/i ) ) + name = "float"; + + name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); + + var computedStyle = defaultView.getComputedStyle( elem, null ); + + if ( computedStyle ) + ret = computedStyle.getPropertyValue( name ); + + // We should always get a number back from opacity + if ( name == "opacity" && ret == "" ) + ret = "1"; + + } else if ( elem.currentStyle ) { + var camelCase = name.replace(/\-(\w)/g, function(all, letter){ + return letter.toUpperCase(); + }); + + ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; + + // From the awesome hack by Dean Edwards + // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 + + // If we're not dealing with a regular pixel number + // but a number that has a weird ending, we need to convert it to pixels + if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { + // Remember the original values + var left = style.left, rsLeft = elem.runtimeStyle.left; + + // Put in the new values to get a computed value out + elem.runtimeStyle.left = elem.currentStyle.left; + style.left = ret || 0; + ret = style.pixelLeft + "px"; + + // Revert the changed values + style.left = left; + elem.runtimeStyle.left = rsLeft; + } + } + + return ret; + }, + + clean: function( elems, context, fragment ) { + context = context || document; + + // !context.createElement fails in IE with an error but returns typeof 'object' + if ( typeof context.createElement === "undefined" ) + context = context.ownerDocument || context[0] && context[0].ownerDocument || document; + + // If a single string is passed in and it's a single tag + // just do a createElement and skip the rest + if ( !fragment && elems.length === 1 && typeof elems[0] === "string" ) { + var match = /^<(\w+)\s*\/?>$/.exec(elems[0]); + if ( match ) + return [ context.createElement( match[1] ) ]; + } + + var ret = [], scripts = [], div = context.createElement("div"); + + jQuery.each(elems, function(i, elem){ + if ( typeof elem === "number" ) + elem += ''; + + if ( !elem ) + return; + + // Convert html string into DOM nodes + if ( typeof elem === "string" ) { + // Fix "XHTML"-style tags in all browsers + elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){ + return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ? + all : + front + "></" + tag + ">"; + }); + + // Trim whitespace, otherwise indexOf won't work as expected + var tags = elem.replace(/^\s+/, "").substring(0, 10).toLowerCase(); + + var wrap = + // option or optgroup + !tags.indexOf("<opt") && + [ 1, "<select multiple='multiple'>", "</select>" ] || + + !tags.indexOf("<leg") && + [ 1, "<fieldset>", "</fieldset>" ] || + + tags.match(/^<(thead|tbody|tfoot|colg|cap)/) && + [ 1, "<table>", "</table>" ] || + + !tags.indexOf("<tr") && + [ 2, "<table><tbody>", "</tbody></table>" ] || + + // <thead> matched above + (!tags.indexOf("<td") || !tags.indexOf("<th")) && + [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] || + + !tags.indexOf("<col") && + [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] || + + // IE can't serialize <link> and <script> tags normally + !jQuery.support.htmlSerialize && + [ 1, "div<div>", "</div>" ] || + + [ 0, "", "" ]; + + // Go to html and back, then peel off extra wrappers + div.innerHTML = wrap[1] + elem + wrap[2]; + + // Move to the right depth + while ( wrap[0]-- ) + div = div.lastChild; + + // Remove IE's autoinserted <tbody> from table fragments + if ( !jQuery.support.tbody ) { + + // String was a <table>, *may* have spurious <tbody> + var hasBody = /<tbody/i.test(elem), + tbody = !tags.indexOf("<table") && !hasBody ? + div.firstChild && div.firstChild.childNodes : + + // String was a bare <thead> or <tfoot> + wrap[1] == "<table>" && !hasBody ? + div.childNodes : + []; + + for ( var j = tbody.length - 1; j >= 0 ; --j ) + if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) + tbody[ j ].parentNode.removeChild( tbody[ j ] ); + + } + + // IE completely kills leading whitespace when innerHTML is used + if ( !jQuery.support.leadingWhitespace && /^\s/.test( elem ) ) + div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild ); + + elem = jQuery.makeArray( div.childNodes ); + } + + if ( elem.nodeType ) + ret.push( elem ); + else + ret = jQuery.merge( ret, elem ); + + }); + + if ( fragment ) { + for ( var i = 0; ret[i]; i++ ) { + if ( jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) { + scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] ); + } else { + if ( ret[i].nodeType === 1 ) + ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) ); + fragment.appendChild( ret[i] ); + } + } + + return scripts; + } + + return ret; + }, + + attr: function( elem, name, value ) { + // don't set attributes on text and comment nodes + if (!elem || elem.nodeType == 3 || elem.nodeType == 8) + return undefined; + + var notxml = !jQuery.isXMLDoc( elem ), + // Whether we are setting (or getting) + set = value !== undefined; + + // Try to normalize/fix the name + name = notxml && jQuery.props[ name ] || name; + + // Only do all the following if this is a node (faster for style) + // IE elem.getAttribute passes even for style + if ( elem.tagName ) { + + // These attributes require special treatment + var special = /href|src|style/.test( name ); + + // Safari mis-reports the default selected property of a hidden option + // Accessing the parent's selectedIndex property fixes it + if ( name == "selected" && elem.parentNode ) + elem.parentNode.selectedIndex; + + // If applicable, access the attribute via the DOM 0 way + if ( name in elem && notxml && !special ) { + if ( set ){ + // We can't allow the type property to be changed (since it causes problems in IE) + if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode ) + throw "type property can't be changed"; + + elem[ name ] = value; + } + + // browsers index elements by id/name on forms, give priority to attributes. + if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) + return elem.getAttributeNode( name ).nodeValue; + + // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabi... + if ( name == "tabIndex" ) { + var attributeNode = elem.getAttributeNode( "tabIndex" ); + return attributeNode && attributeNode.specified + ? attributeNode.value + : elem.nodeName.match(/(button|input|object|select|textarea)/i) + ? 0 + : elem.nodeName.match(/^(a|area)$/i) && elem.href + ? 0 + : undefined; + } + + return elem[ name ]; + } + + if ( !jQuery.support.style && notxml && name == "style" ) + return jQuery.attr( elem.style, "cssText", value ); + + if ( set ) + // convert the value to a string (all browsers do this but IE) see #1070 + elem.setAttribute( name, "" + value ); + + var attr = !jQuery.support.hrefNormalized && notxml && special + // Some attributes require a special call on IE + ? elem.getAttribute( name, 2 ) + : elem.getAttribute( name ); + + // Non-existent attributes return null, we normalize to undefined + return attr === null ? undefined : attr; + } + + // elem is actually elem.style ... set the style + + // IE uses filters for opacity + if ( !jQuery.support.opacity && name == "opacity" ) { + if ( set ) { + // IE has trouble with opacity if it does not have layout + // Force it by setting the zoom level + elem.zoom = 1; + + // Set the alpha filter to set the opacity + elem.filter = (elem.filter || "").replace( /alpha$[^)]*$/, "" ) + + (parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"); + } + + return elem.filter && elem.filter.indexOf("opacity=") >= 0 ? + (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '': + ""; + } + + name = name.replace(/-([a-z])/ig, function(all, letter){ + return letter.toUpperCase(); + }); + + if ( set ) + elem[ name ] = value; + + return elem[ name ]; + }, + + trim: function( text ) { + return (text || "").replace( /^\s+|\s+$/g, "" ); + }, + + makeArray: function( array ) { + var ret = []; + + if( array != null ){ + var i = array.length; + // The window, strings (and functions) also have 'length' + if( i == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval ) + ret[0] = array; + else + while( i ) + ret[--i] = array[i]; + } + + return ret; + }, + + inArray: function( elem, array ) { + for ( var i = 0, length = array.length; i < length; i++ ) + // Use === because on IE, window == document + if ( array[ i ] === elem ) + return i; + + return -1; + }, + + merge: function( first, second ) { + // We have to loop this way because IE & Opera overwrite the length + // expando of getElementsByTagName + var i = 0, elem, pos = first.length; + // Also, we need to make sure that the correct elements are being returned + // (IE returns comment nodes in a '*' query) + if ( !jQuery.support.getAll ) { + while ( (elem = second[ i++ ]) != null ) + if ( elem.nodeType != 8 ) + first[ pos++ ] = elem; + + } else + while ( (elem = second[ i++ ]) != null ) + first[ pos++ ] = elem; + + return first; + }, + + unique: function( array ) { + var ret = [], done = {}; + + try { + + for ( var i = 0, length = array.length; i < length; i++ ) { + var id = jQuery.data( array[ i ] ); + + if ( !done[ id ] ) { + done[ id ] = true; + ret.push( array[ i ] ); + } + } + + } catch( e ) { + ret = array; + } + + return ret; + }, + + grep: function( elems, callback, inv ) { + var ret = []; + + // Go through the array, only saving the items + // that pass the validator function + for ( var i = 0, length = elems.length; i < length; i++ ) + if ( !inv != !callback( elems[ i ], i ) ) + ret.push( elems[ i ] ); + + return ret; + }, + + map: function( elems, callback ) { + var ret = []; + + // Go through the array, translating each of the items to their + // new value (or values). + for ( var i = 0, length = elems.length; i < length; i++ ) { + var value = callback( elems[ i ], i ); + + if ( value != null ) + ret[ ret.length ] = value; + } + + return ret.concat.apply( [], ret ); + } +}); + +// Use of jQuery.browser is deprecated. +// It's included for backwards compatibility and plugins, +// although they should work to migrate away. + +var userAgent = navigator.userAgent.toLowerCase(); + +// Figure out what browser is being used +jQuery.browser = { + version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1], + safari: /webkit/.test( userAgent ), + opera: /opera/.test( userAgent ), + msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ), + mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent ) +}; + +jQuery.each({ + parent: function(elem){return elem.parentNode;}, + parents: function(elem){return jQuery.dir(elem,"parentNode");}, + next: function(elem){return jQuery.nth(elem,2,"nextSibling");}, + prev: function(elem){return jQuery.nth(elem,2,"previousSibling");}, + nextAll: function(elem){return jQuery.dir(elem,"nextSibling");}, + prevAll: function(elem){return jQuery.dir(elem,"previousSibling");}, + siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);}, + children: function(elem){return jQuery.sibling(elem.firstChild);}, + contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);} +}, function(name, fn){ + jQuery.fn[ name ] = function( selector ) { + var ret = jQuery.map( this, fn ); + + if ( selector && typeof selector == "string" ) + ret = jQuery.multiFilter( selector, ret ); + + return this.pushStack( jQuery.unique( ret ), name, selector ); + }; +}); + +jQuery.each({ + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function(name, original){ + jQuery.fn[ name ] = function( selector ) { + var ret = [], insert = jQuery( selector ); + + for ( var i = 0, l = insert.length; i < l; i++ ) { + var elems = (i > 0 ? this.clone(true) : this).get(); + jQuery.fn[ original ].apply( jQuery(insert[i]), elems ); + ret = ret.concat( elems ); + } + + return this.pushStack( ret, name, selector ); + }; +}); + +jQuery.each({ + removeAttr: function( name ) { + jQuery.attr( this, name, "" ); + if (this.nodeType == 1) + this.removeAttribute( name ); + }, + + addClass: function( classNames ) { + jQuery.className.add( this, classNames ); + }, + + removeClass: function( classNames ) { + jQuery.className.remove( this, classNames ); + }, + + toggleClass: function( classNames, state ) { + if( typeof state !== "boolean" ) + state = !jQuery.className.has( this, classNames ); + jQuery.className[ state ? "add" : "remove" ]( this, classNames ); + }, + + remove: function( selector ) { + if ( !selector || jQuery.filter( selector, [ this ] ).length ) { + // Prevent memory leaks + jQuery( "*", this ).add([this]).each(function(){ + jQuery.event.remove(this); + jQuery.removeData(this); + }); + if (this.parentNode) + this.parentNode.removeChild( this ); + } + }, + + empty: function() { + // Remove element nodes and prevent memory leaks + jQuery(this).children().remove(); + + // Remove any remaining nodes + while ( this.firstChild ) + this.removeChild( this.firstChild ); + } +}, function(name, fn){ + jQuery.fn[ name ] = function(){ + return this.each( fn, arguments ); + }; +}); + +// Helper function used by the dimensions and offset modules +function num(elem, prop) { + return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0; +} +var expando = jQuery.expando = "jQuery" + now(), uuid = 0, windowData = {}; + +jQuery.extend({ + cache: {}, + + data: function( elem, name, data ) { + elem = elem == window ? + windowData : + elem; + + var id = elem[ expando ]; + + // Compute a unique ID for the element + if ( !id ) + id = elem[ expando ] = ++uuid; + + // Only generate the data cache if we're + // trying to access or manipulate it + if ( name && !jQuery.cache[ id ] ) + jQuery.cache[ id ] = {}; + + // Prevent overriding the named cache with undefined values + if ( data !== undefined ) + jQuery.cache[ id ][ name ] = data; + + // Return the named cache data, or the ID for the element + return name ? + jQuery.cache[ id ][ name ] : + id; + }, + + removeData: function( elem, name ) { + elem = elem == window ? + windowData : + elem; + + var id = elem[ expando ]; + + // If we want to remove a specific section of the element's data + if ( name ) { + if ( jQuery.cache[ id ] ) { + // Remove the section of cache data + delete jQuery.cache[ id ][ name ]; + + // If we've removed all the data, remove the element's cache + name = ""; + + for ( name in jQuery.cache[ id ] ) + break; + + if ( !name ) + jQuery.removeData( elem ); + } + + // Otherwise, we want to remove all of the element's data + } else { + // Clean up the element expando + try { + delete elem[ expando ]; + } catch(e){ + // IE has trouble directly removing the expando + // but it's ok with using removeAttribute + if ( elem.removeAttribute ) + elem.removeAttribute( expando ); + } + + // Completely remove the data cache + delete jQuery.cache[ id ]; + } + }, + queue: function( elem, type, data ) { + if ( elem ){ + + type = (type || "fx") + "queue"; + + var q = jQuery.data( elem, type ); + + if ( !q || jQuery.isArray(data) ) + q = jQuery.data( elem, type, jQuery.makeArray(data) ); + else if( data ) + q.push( data ); + + } + return q; + }, + + dequeue: function( elem, type ){ + var queue = jQuery.queue( elem, type ), + fn = queue.shift(); + + if( !type || type === "fx" ) + fn = queue[0]; + + if( fn !== undefined ) + fn.call(elem); + } +}); + +jQuery.fn.extend({ + data: function( key, value ){ + var parts = key.split("."); + parts[1] = parts[1] ? "." + parts[1] : ""; + + if ( value === undefined ) { + var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + + if ( data === undefined && this.length ) + data = jQuery.data( this[0], key ); + + return data === undefined && parts[1] ? + this.data( parts[0] ) : + data; + } else + return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){ + jQuery.data( this, key, value ); + }); + }, + + removeData: function( key ){ + return this.each(function(){ + jQuery.removeData( this, key ); + }); + }, + queue: function(type, data){ + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + } + + if ( data === undefined ) + return jQuery.queue( this[0], type ); + + return this.each(function(){ + var queue = jQuery.queue( this, type, data ); + + if( type == "fx" && queue.length == 1 ) + queue[0].call(this); + }); + }, + dequeue: function(type){ + return this.each(function(){ + jQuery.dequeue( this, type ); + }); + } +});/*! + * Sizzle CSS Selector Engine - v0.9.3 + * Copyright 2009, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){ + +var chunker = /((?:$(?:\([^()]+$|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g, + done = 0, + toString = Object.prototype.toString; + +var Sizzle = function(selector, context, results, seed) { + results = results || []; + context = context || document; + + if ( context.nodeType !== 1 && context.nodeType !== 9 ) + return []; + + if ( !selector || typeof selector !== "string" ) { + return results; + } + + var parts = [], m, set, checkSet, check, mode, extra, prune = true; + + // Reset the position of the chunker regexp (start from head) + chunker.lastIndex = 0; + + while ( (m = chunker.exec(selector)) !== null ) { + parts.push( m[1] ); + + if ( m[2] ) { + extra = RegExp.rightContext; + break; + } + } + + if ( parts.length > 1 && origPOS.exec( selector ) ) { + if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { + set = posProcess( parts[0] + parts[1], context ); + } else { + set = Expr.relative[ parts[0] ] ? + [ context ] : + Sizzle( parts.shift(), context ); + + while ( parts.length ) { + selector = parts.shift(); + + if ( Expr.relative[ selector ] ) + selector += parts.shift(); + + set = posProcess( selector, set ); + } + } + } else { + var ret = seed ? + { expr: parts.pop(), set: makeArray(seed) } : + Sizzle.find( parts.pop(), parts.length === 1 && context.parentNode ? context.parentNode : context, isXML(context) ); + set = Sizzle.filter( ret.expr, ret.set ); + + if ( parts.length > 0 ) { + checkSet = makeArray(set); + } else { + prune = false; + } + + while ( parts.length ) { + var cur = parts.pop(), pop = cur; + + if ( !Expr.relative[ cur ] ) { + cur = ""; + } else { + pop = parts.pop(); + } + + if ( pop == null ) { + pop = context; + } + + Expr.relative[ cur ]( checkSet, pop, isXML(context) ); + } + } + + if ( !checkSet ) { + checkSet = set; + } + + if ( !checkSet ) { + throw "Syntax error, unrecognized expression: " + (cur || selector); + } + + if ( toString.call(checkSet) === "[object Array]" ) { + if ( !prune ) { + results.push.apply( results, checkSet ); + } else if ( context.nodeType === 1 ) { + for ( var i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) { + results.push( set[i] ); + } + } + } else { + for ( var i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && checkSet[i].nodeType === 1 ) { + results.push( set[i] ); + } + } + } + } else { + makeArray( checkSet, results ); + } + + if ( extra ) { + Sizzle( extra, context, results, seed ); + + if ( sortOrder ) { + hasDuplicate = false; + results.sort(sortOrder); + + if ( hasDuplicate ) { + for ( var i = 1; i < results.length; i++ ) { + if ( results[i] === results[i-1] ) { + results.splice(i--, 1); + } + } + } + } + } + + return results; +}; + +Sizzle.matches = function(expr, set){ + return Sizzle(expr, null, null, set); +}; + +Sizzle.find = function(expr, context, isXML){ + var set, match; + + if ( !expr ) { + return []; + } + + for ( var i = 0, l = Expr.order.length; i < l; i++ ) { + var type = Expr.order[i], match; + + if ( (match = Expr.match[ type ].exec( expr )) ) { + var left = RegExp.leftContext; + + if ( left.substr( left.length - 1 ) !== "\\" ) { + match[1] = (match[1] || "").replace(/\\/g, ""); + set = Expr.find[ type ]( match, context, isXML ); + if ( set != null ) { + expr = expr.replace( Expr.match[ type ], "" ); + break; + } + } + } + } + + if ( !set ) { + set = context.getElementsByTagName("*"); + } + + return {set: set, expr: expr}; +}; + +Sizzle.filter = function(expr, set, inplace, not){ + var old = expr, result = [], curLoop = set, match, anyFound, + isXMLFilter = set && set[0] && isXML(set[0]); + + while ( expr && set.length ) { + for ( var type in Expr.filter ) { + if ( (match = Expr.match[ type ].exec( expr )) != null ) { + var filter = Expr.filter[ type ], found, item; + anyFound = false; + + if ( curLoop == result ) { + result = []; + } + + if ( Expr.preFilter[ type ] ) { + match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); + + if ( !match ) { + anyFound = found = true; + } else if ( match === true ) { + continue; + } + } + + if ( match ) { + for ( var i = 0; (item = curLoop[i]) != null; i++ ) { + if ( item ) { + found = filter( item, match, i, curLoop ); + var pass = not ^ !!found; + + if ( inplace && found != null ) { + if ( pass ) { + anyFound = true; + } else { + curLoop[i] = false; + } + } else if ( pass ) { + result.push( item ); + anyFound = true; + } + } + } + } + + if ( found !== undefined ) { + if ( !inplace ) { + curLoop = result; + } + + expr = expr.replace( Expr.match[ type ], "" ); + + if ( !anyFound ) { + return []; + } + + break; + } + } + } + + // Improper expression + if ( expr == old ) { + if ( anyFound == null ) { + throw "Syntax error, unrecognized expression: " + expr; + } else { + break; + } + } + + old = expr; + } + + return curLoop; +}; + +var Expr = Sizzle.selectors = { + order: [ "ID", "NAME", "TAG" ], + match: { + ID: /#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/, + CLASS: /\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/, + NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/, + ATTR: /\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/, + TAG: /^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/, + CHILD: /:(only|nth|last|first)-child(?:$(even|odd|[\dn+-]*)$)?/, + POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:$(\d*)$)?(?=[^-]|$)/, + PSEUDO: /:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:$(['"]*)((?:\([^$]+\)|[^\2]*)+)\2\))?/ + }, + attrMap: { + "class": "className", + "for": "htmlFor" + }, + attrHandle: { + href: function(elem){ + return elem.getAttribute("href"); + } + }, + relative: { + "+": function(checkSet, part, isXML){ + var isPartStr = typeof part === "string", + isTag = isPartStr && !/\W/.test(part), + isPartStrNotTag = isPartStr && !isTag; + + if ( isTag && !isXML ) { + part = part.toUpperCase(); + } + + for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { + if ( (elem = checkSet[i]) ) { + while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} + + checkSet[i] = isPartStrNotTag || elem && elem.nodeName === part ? + elem || false : + elem === part; + } + } + + if ( isPartStrNotTag ) { + Sizzle.filter( part, checkSet, true ); + } + }, + ">": function(checkSet, part, isXML){ + var isPartStr = typeof part === "string"; + + if ( isPartStr && !/\W/.test(part) ) { + part = isXML ? part : part.toUpperCase(); + + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + if ( elem ) { + var parent = elem.parentNode; + checkSet[i] = parent.nodeName === part ? parent : false; + } + } + } else { + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + if ( elem ) { + checkSet[i] = isPartStr ? + elem.parentNode : + elem.parentNode === part; + } + } + + if ( isPartStr ) { + Sizzle.filter( part, checkSet, true ); + } + } + }, + "": function(checkSet, part, isXML){ + var doneName = done++, checkFn = dirCheck; + + if ( !part.match(/\W/) ) { + var nodeCheck = part = isXML ? part : part.toUpperCase(); + checkFn = dirNodeCheck; + } + + checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML); + }, + "~": function(checkSet, part, isXML){ + var doneName = done++, checkFn = dirCheck; + + if ( typeof part === "string" && !part.match(/\W/) ) { + var nodeCheck = part = isXML ? part : part.toUpperCase(); + checkFn = dirNodeCheck; + } + + checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML); + } + }, + find: { + ID: function(match, context, isXML){ + if ( typeof context.getElementById !== "undefined" && !isXML ) { + var m = context.getElementById(match[1]); + return m ? [m] : []; + } + }, + NAME: function(match, context, isXML){ + if ( typeof context.getElementsByName !== "undefined" ) { + var ret = [], results = context.getElementsByName(match[1]); + + for ( var i = 0, l = results.length; i < l; i++ ) { + if ( results[i].getAttribute("name") === match[1] ) { + ret.push( results[i] ); + } + } + + return ret.length === 0 ? null : ret; + } + }, + TAG: function(match, context){ + return context.getElementsByTagName(match[1]); + } + }, + preFilter: { + CLASS: function(match, curLoop, inplace, result, not, isXML){ + match = " " + match[1].replace(/\\/g, "") + " "; + + if ( isXML ) { + return match; + } + + for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { + if ( elem ) { + if ( not ^ (elem.className && (" " + elem.className + " ").indexOf(match) >= 0) ) { + if ( !inplace ) + result.push( elem ); + } else if ( inplace ) { + curLoop[i] = false; + } + } + } + + return false; + }, + ID: function(match){ + return match[1].replace(/\\/g, ""); + }, + TAG: function(match, curLoop){ + for ( var i = 0; curLoop[i] === false; i++ ){} + return curLoop[i] && isXML(curLoop[i]) ? match[1] : match[1].toUpperCase(); + }, + CHILD: function(match){ + if ( match[1] == "nth" ) { + // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' + var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec( + match[2] == "even" && "2n" || match[2] == "odd" && "2n+1" || + !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); + + // calculate the numbers (first)n+(last) including if they are negative + match[2] = (test[1] + (test[2] || 1)) - 0; + match[3] = test[3] - 0; + } + + // TODO: Move to normal caching system + match[0] = done++; + + return match; + }, + ATTR: function(match, curLoop, inplace, result, not, isXML){ + var name = match[1].replace(/\\/g, ""); + + if ( !isXML && Expr.attrMap[name] ) { + match[1] = Expr.attrMap[name]; + } + + if ( match[2] === "~=" ) { + match[4] = " " + match[4] + " "; + } + + return match; + }, + PSEUDO: function(match, curLoop, inplace, result, not){ + if ( match[1] === "not" ) { + // If we're dealing with a complex expression, or a simple one + if ( match[3].match(chunker).length > 1 || /^\w/.test(match[3]) ) { + match[3] = Sizzle(match[3], null, null, curLoop); + } else { + var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); + if ( !inplace ) { + result.push.apply( result, ret ); + } + return false; + } + } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { + return true; + } + + return match; + }, + POS: function(match){ + match.unshift( true ); + return match; + } + }, + filters: { + enabled: function(elem){ + return elem.disabled === false && elem.type !== "hidden"; + }, + disabled: function(elem){ + return elem.disabled === true; + }, + checked: function(elem){ + return elem.checked === true; + }, + selected: function(elem){ + // Accessing this property makes selected-by-default + // options in Safari work properly + elem.parentNode.selectedIndex; + return elem.selected === true; + }, + parent: function(elem){ + return !!elem.firstChild; + }, + empty: function(elem){ + return !elem.firstChild; + }, + has: function(elem, i, match){ + return !!Sizzle( match[3], elem ).length; + }, + header: function(elem){ + return /h\d/i.test( elem.nodeName ); + }, + text: function(elem){ + return "text" === elem.type; + }, + radio: function(elem){ + return "radio" === elem.type; + }, + checkbox: function(elem){ + return "checkbox" === elem.type; + }, + file: function(elem){ + return "file" === elem.type; + }, + password: function(elem){ + return "password" === elem.type; + }, + submit: function(elem){ + return "submit" === elem.type; + }, + image: function(elem){ + return "image" === elem.type; + }, + reset: function(elem){ + return "reset" === elem.type; + }, + button: function(elem){ + return "button" === elem.type || elem.nodeName.toUpperCase() === "BUTTON"; + }, + input: function(elem){ + return /input|select|textarea|button/i.test(elem.nodeName); + } + }, + setFilters: { + first: function(elem, i){ + return i === 0; + }, + last: function(elem, i, match, array){ + return i === array.length - 1; + }, + even: function(elem, i){ + return i % 2 === 0; + }, + odd: function(elem, i){ + return i % 2 === 1; + }, + lt: function(elem, i, match){ + return i < match[3] - 0; + }, + gt: function(elem, i, match){ + return i > match[3] - 0; + }, + nth: function(elem, i, match){ + return match[3] - 0 == i; + }, + eq: function(elem, i, match){ + return match[3] - 0 == i; + } + }, + filter: { + PSEUDO: function(elem, match, i, array){ + var name = match[1], filter = Expr.filters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + } else if ( name === "contains" ) { + return (elem.textContent || elem.innerText || "").indexOf(match[3]) >= 0; + } else if ( name === "not" ) { + var not = match[3]; + + for ( var i = 0, l = not.length; i < l; i++ ) { + if ( not[i] === elem ) { + return false; + } + } + + return true; + } + }, + CHILD: function(elem, match){ + var type = match[1], node = elem; + switch (type) { + case 'only': + case 'first': + while (node = node.previousSibling) { + if ( node.nodeType === 1 ) return false; + } + if ( type == 'first') return true; + node = elem; + case 'last': + while (node = node.nextSibling) { + if ( node.nodeType === 1 ) return false; + } + return true; + case 'nth': + var first = match[2], last = match[3]; + + if ( first == 1 && last == 0 ) { + return true; + } + + var doneName = match[0], + parent = elem.parentNode; + + if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) { + var count = 0; + for ( node = parent.firstChild; node; node = node.nextSibling ) { + if ( node.nodeType === 1 ) { + node.nodeIndex = ++count; + } + } + parent.sizcache = doneName; + } + + var diff = elem.nodeIndex - last; + if ( first == 0 ) { + return diff == 0; + } else { + return ( diff % first == 0 && diff / first >= 0 ); + } + } + }, + ID: function(elem, match){ + return elem.nodeType === 1 && elem.getAttribute("id") === match; + }, + TAG: function(elem, match){ + return (match === "*" && elem.nodeType === 1) || elem.nodeName === match; + }, + CLASS: function(elem, match){ + return (" " + (elem.className || elem.getAttribute("class")) + " ") + .indexOf( match ) > -1; + }, + ATTR: function(elem, match){ + var name = match[1], + result = Expr.attrHandle[ name ] ? + Expr.attrHandle[ name ]( elem ) : + elem[ name ] != null ? + elem[ name ] : + elem.getAttribute( name ), + value = result + "", + type = match[2], + check = match[4]; + + return result == null ? + type === "!=" : + type === "=" ? + value === check : + type === "*=" ? + value.indexOf(check) >= 0 : + type === "~=" ? + (" " + value + " ").indexOf(check) >= 0 : + !check ? + value && result !== false : + type === "!=" ? + value != check : + type === "^=" ? + value.indexOf(check) === 0 : + type === "$=" ? + value.substr(value.length - check.length) === check : + type === "|=" ? + value === check || value.substr(0, check.length + 1) === check + "-" : + false; + }, + POS: function(elem, match, i, array){ + var name = match[2], filter = Expr.setFilters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + } + } + } +}; + +var origPOS = Expr.match.POS; + +for ( var type in Expr.match ) { + Expr.match[ type ] = RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^$]*$)/.source ); +} + +var makeArray = function(array, results) { + array = Array.prototype.slice.call( array ); + + if ( results ) { + results.push.apply( results, array ); + return results; + } + + return array; +}; + +// Perform a simple check to determine if the browser is capable of +// converting a NodeList to an array using builtin methods. +try { + Array.prototype.slice.call( document.documentElement.childNodes ); + +// Provide a fallback method if it does not work +} catch(e){ + makeArray = function(array, results) { + var ret = results || []; + + if ( toString.call(array) === "[object Array]" ) { + Array.prototype.push.apply( ret, array ); + } else { + if ( typeof array.length === "number" ) { + for ( var i = 0, l = array.length; i < l; i++ ) { + ret.push( array[i] ); + } + } else { + for ( var i = 0; array[i]; i++ ) { + ret.push( array[i] ); + } + } + } + + return ret; + }; +} + +var sortOrder; + +if ( document.documentElement.compareDocumentPosition ) { + sortOrder = function( a, b ) { + var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1; + if ( ret === 0 ) { + hasDuplicate = true; + } + return ret; + }; +} else if ( "sourceIndex" in document.documentElement ) { + sortOrder = function( a, b ) { + var ret = a.sourceIndex - b.sourceIndex; + if ( ret === 0 ) { + hasDuplicate = true; + } + return ret; + }; +} else if ( document.createRange ) { + sortOrder = function( a, b ) { + var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange(); + aRange.selectNode(a); + aRange.collapse(true); + bRange.selectNode(b); + bRange.collapse(true); + var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange); + if ( ret === 0 ) { + hasDuplicate = true; + } + return ret; + }; +} + +// Check to see if the browser returns elements by name when +// querying by getElementById (and provide a workaround) +(function(){ + // We're going to inject a fake input element with a specified name + var form = document.createElement("form"), + id = "script" + (new Date).getTime(); + form.innerHTML = "<input name='" + id + "'/>"; + + // Inject it into the root element, check its status, and remove it quickly + var root = document.documentElement; + root.insertBefore( form, root.firstChild ); + + // The workaround has to do additional checks after a getElementById + // Which slows things down for other browsers (hence the branching) + if ( !!document.getElementById( id ) ) { + Expr.find.ID = function(match, context, isXML){ + if ( typeof context.getElementById !== "undefined" && !isXML ) { + var m = context.getElementById(match[1]); + return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : []; + } + }; + + Expr.filter.ID = function(elem, match){ + var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + return elem.nodeType === 1 && node && node.nodeValue === match; + }; + } + + root.removeChild( form ); +})(); + +(function(){ + // Check to see if the browser returns only elements + // when doing getElementsByTagName("*") + + // Create a fake element + var div = document.createElement("div"); + div.appendChild( document.createComment("") ); + + // Make sure no comments are found + if ( div.getElementsByTagName("*").length > 0 ) { + Expr.find.TAG = function(match, context){ + var results = context.getElementsByTagName(match[1]); + + // Filter out possible comments + if ( match[1] === "*" ) { + var tmp = []; + + for ( var i = 0; results[i]; i++ ) { + if ( results[i].nodeType === 1 ) { + tmp.push( results[i] ); + } + } + + results = tmp; + } + + return results; + }; + } + + // Check to see if an attribute returns normalized href attributes + div.innerHTML = "<a href='#'></a>"; + if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && + div.firstChild.getAttribute("href") !== "#" ) { + Expr.attrHandle.href = function(elem){ + return elem.getAttribute("href", 2); + }; + } +})(); + +if ( document.querySelectorAll ) (function(){ + var oldSizzle = Sizzle, div = document.createElement("div"); + div.innerHTML = "<p class='TEST'></p>"; + + // Safari can't handle uppercase or unicode characters when + // in quirks mode. + if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { + return; + } + + Sizzle = function(query, context, extra, seed){ + context = context || document; + + // Only use querySelectorAll on non-XML documents + // (ID selectors don't work in non-HTML documents) + if ( !seed && context.nodeType === 9 && !isXML(context) ) { + try { + return makeArray( context.querySelectorAll(query), extra ); + } catch(e){} + } + + return oldSizzle(query, context, extra, seed); + }; + + Sizzle.find = oldSizzle.find; + Sizzle.filter = oldSizzle.filter; + Sizzle.selectors = oldSizzle.selectors; + Sizzle.matches = oldSizzle.matches; +})(); + +if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){ + var div = document.createElement("div"); + div.innerHTML = "<div class='test e'></div><div class='test'></div>"; + + // Opera can't find a second classname (in 9.6) + if ( div.getElementsByClassName("e").length === 0 ) + return; + + // Safari caches class attributes, doesn't catch changes (in 3.2) + div.lastChild.className = "e"; + + if ( div.getElementsByClassName("e").length === 1 ) + return; + + Expr.order.splice(1, 0, "CLASS"); + Expr.find.CLASS = function(match, context, isXML) { + if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { + return context.getElementsByClassName(match[1]); + } + }; +})(); + +function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + var sibDir = dir == "previousSibling" && !isXML; + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + if ( elem ) { + if ( sibDir && elem.nodeType === 1 ){ + elem.sizcache = doneName; + elem.sizset = i; + } + elem = elem[dir]; + var match = false; + + while ( elem ) { + if ( elem.sizcache === doneName ) { + match = checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType === 1 && !isXML ){ + elem.sizcache = doneName; + elem.sizset = i; + } + + if ( elem.nodeName === cur ) { + match = elem; + break; + } + + elem = elem[dir]; + } + + checkSet[i] = match; + } + } +} + +function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + var sibDir = dir == "previousSibling" && !isXML; + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + if ( elem ) { + if ( sibDir && elem.nodeType === 1 ) { + elem.sizcache = doneName; + elem.sizset = i; + } + elem = elem[dir]; + var match = false; + + while ( elem ) { + if ( elem.sizcache === doneName ) { + match = checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType === 1 ) { + if ( !isXML ) { + elem.sizcache = doneName; + elem.sizset = i; + } + if ( typeof cur !== "string" ) { + if ( elem === cur ) { + match = true; + break; + } + + } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { + match = elem; + break; + } + } + + elem = elem[dir]; + } + + checkSet[i] = match; + } + } +} + +var contains = document.compareDocumentPosition ? function(a, b){ + return a.compareDocumentPosition(b) & 16; +} : function(a, b){ + return a !== b && (a.contains ? a.contains(b) : true); +}; + +var isXML = function(elem){ + return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" || + !!elem.ownerDocument && isXML( elem.ownerDocument ); +}; + +var posProcess = function(selector, context){ + var tmpSet = [], later = "", match, + root = context.nodeType ? [context] : context; + + // Position selectors must be done after the filter + // And so must :not(positional) so we move all PSEUDOs to the end + while ( (match = Expr.match.PSEUDO.exec( selector )) ) { + later += match[0]; + selector = selector.replace( Expr.match.PSEUDO, "" ); + } + + selector = Expr.relative[selector] ? selector + "*" : selector; + + for ( var i = 0, l = root.length; i < l; i++ ) { + Sizzle( selector, root[i], tmpSet ); + } + + return Sizzle.filter( later, tmpSet ); +}; + +// EXPOSE +jQuery.find = Sizzle; +jQuery.filter = Sizzle.filter; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.filters; + +Sizzle.selectors.filters.hidden = function(elem){ + return elem.offsetWidth === 0 || elem.offsetHeight === 0; +}; + +Sizzle.selectors.filters.visible = function(elem){ + return elem.offsetWidth > 0 || elem.offsetHeight > 0; +}; + +Sizzle.selectors.filters.animated = function(elem){ + return jQuery.grep(jQuery.timers, function(fn){ + return elem === fn.elem; + }).length; +}; + +jQuery.multiFilter = function( expr, elems, not ) { + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return Sizzle.matches(expr, elems); +}; + +jQuery.dir = function( elem, dir ){ + var matched = [], cur = elem[dir]; + while ( cur && cur != document ) { + if ( cur.nodeType == 1 ) + matched.push( cur ); + cur = cur[dir]; + } + return matched; +}; + +jQuery.nth = function(cur, result, dir, elem){ + result = result || 1; + var num = 0; + + for ( ; cur; cur = cur[dir] ) + if ( cur.nodeType == 1 && ++num == result ) + break; + + return cur; +}; + +jQuery.sibling = function(n, elem){ + var r = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType == 1 && n != elem ) + r.push( n ); + } + + return r; +}; + +return; + +window.Sizzle = Sizzle; + +})(); +/* + * A number of helper functions used for managing events. + * Many of the ideas behind this code originated from + * Dean Edwards' addEvent library. + */ +jQuery.event = { + + // Bind an event to an element + // Original by Dean Edwards + add: function(elem, types, handler, data) { + if ( elem.nodeType == 3 || elem.nodeType == 8 ) + return; + + // For whatever reason, IE has trouble passing the window object + // around, causing it to be cloned in the process + if ( elem.setInterval && elem != window ) + elem = window; + + // Make sure that the function being executed has a unique ID + if ( !handler.guid ) + handler.guid = this.guid++; + + // if data is passed, bind to handler + if ( data !== undefined ) { + // Create temporary function pointer to original handler + var fn = handler; + + // Create unique handler function, wrapped around original handler + handler = this.proxy( fn ); + + // Store data in unique handler + handler.data = data; + } + + // Init the element's event structure + var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}), + handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){ + // Handle the second event of a trigger and when + // an event is called after a page has unloaded + return typeof jQuery !== "undefined" && !jQuery.event.triggered ? + jQuery.event.handle.apply(arguments.callee.elem, arguments) : + undefined; + }); + // Add elem as a property of the handle function + // This is to prevent a memory leak with non-native + // event in IE. + handle.elem = elem; + + // Handle multiple events separated by a space + // jQuery(...).bind("mouseover mouseout", fn); + jQuery.each(types.split(/\s+/), function(index, type) { + // Namespaced event handlers + var namespaces = type.split("."); + type = namespaces.shift(); + handler.type = namespaces.slice().sort().join("."); + + // Get the current list of functions bound to this event + var handlers = events[type]; + + if ( jQuery.event.specialAll[type] ) + jQuery.event.specialAll[type].setup.call(elem, data, namespaces); + + // Init the event handler queue + if (!handlers) { + handlers = events[type] = {}; + + // Check for a special event handler + // Only use addEventListener/attachEvent if the special + // events handler returns false + if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem, data, namespaces) === false ) { + // Bind the global event handler to the element + if (elem.addEventListener) + elem.addEventListener(type, handle, false); + else if (elem.attachEvent) + elem.attachEvent("on" + type, handle); + } + } + + // Add the function to the element's handler list + handlers[handler.guid] = handler; + + // Keep track of which events have been used, for global triggering + jQuery.event.global[type] = true; + }); + + // Nullify elem to prevent memory leaks in IE + elem = null; + }, + + guid: 1, + global: {}, + + // Detach an event or set of events from an element + remove: function(elem, types, handler) { + // don't do events on text and comment nodes + if ( elem.nodeType == 3 || elem.nodeType == 8 ) + return; + + var events = jQuery.data(elem, "events"), ret, index; + + if ( events ) { + // Unbind all events for the element + if ( types === undefined || (typeof types === "string" && types.charAt(0) == ".") ) + for ( var type in events ) + this.remove( elem, type + (types || "") ); + else { + // types is actually an event object here + if ( types.type ) { + handler = types.handler; + types = types.type; + } + + // Handle multiple events seperated by a space + // jQuery(...).unbind("mouseover mouseout", fn); + jQuery.each(types.split(/\s+/), function(index, type){ + // Namespaced event handlers + var namespaces = type.split("."); + type = namespaces.shift(); + var namespace = RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)"); + + if ( events[type] ) { + // remove the given handler for the given type + if ( handler ) + delete events[type][handler.guid]; + + // remove all handlers for the given type + else + for ( var handle in events[type] ) + // Handle the removal of namespaced events + if ( namespace.test(events[type][handle].type) ) + delete events[type][handle]; + + if ( jQuery.event.specialAll[type] ) + jQuery.event.specialAll[type].teardown.call(elem, namespaces); + + // remove generic event handler if no more handlers exist + for ( ret in events[type] ) break; + if ( !ret ) { + if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem, namespaces) === false ) { + if (elem.removeEventListener) + elem.removeEventListener(type, jQuery.data(elem, "handle"), false); + else if (elem.detachEvent) + elem.detachEvent("on" + type, jQuery.data(elem, "handle")); + } + ret = null; + delete events[type]; + } + } + }); + } + + // Remove the expando if it's no longer used + for ( ret in events ) break; + if ( !ret ) { + var handle = jQuery.data( elem, "handle" ); + if ( handle ) handle.elem = null; + jQuery.removeData( elem, "events" ); + jQuery.removeData( elem, "handle" ); + } + } + }, + + // bubbling is internal + trigger: function( event, data, elem, bubbling ) { + // Event object or event type + var type = event.type || event; + + if( !bubbling ){ + event = typeof event === "object" ? + // jQuery.Event object + event[expando] ? event : + // Object literal + jQuery.extend( jQuery.Event(type), event ) : + // Just the event type (string) + jQuery.Event(type); + + if ( type.indexOf("!") >= 0 ) { + event.type = type = type.slice(0, -1); + event.exclusive = true; + } + + // Handle a global trigger + if ( !elem ) { + // Don't bubble custom events when global (to avoid too much overhead) + event.stopPropagation(); + // Only trigger if we've ever bound an event for it + if ( this.global[type] ) + jQuery.each( jQuery.cache, function(){ + if ( this.events && this.events[type] ) + jQuery.event.trigger( event, data, this.handle.elem ); + }); + } + + // Handle triggering a single element + + // don't do events on text and comment nodes + if ( !elem || elem.nodeType == 3 || elem.nodeType == 8 ) + return undefined; + + // Clean up in case it is reused + event.result = undefined; + event.target = elem; + + // Clone the incoming data, if any + data = jQuery.makeArray(data); + data.unshift( event ); + } + + event.currentTarget = elem; + + // Trigger the event, it is assumed that "handle" is a function + var handle = jQuery.data(elem, "handle"); + if ( handle ) + handle.apply( elem, data ); + + // Handle triggering native .onfoo handlers (and on links since we don't call .click() for links) + if ( (!elem[type] || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false ) + event.result = false; + + // Trigger the native events (except for clicks on links) + if ( !bubbling && elem[type] && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) { + this.triggered = true; + try { + elem[ type ](); + // prevent IE from throwing an error for some hidden elements + } catch (e) {} + } + + this.triggered = false; + + if ( !event.isPropagationStopped() ) { + var parent = elem.parentNode || elem.ownerDocument; + if ( parent ) + jQuery.event.trigger(event, data, parent, true); + } + }, + + handle: function(event) { + // returned undefined or false + var all, handlers; + + event = arguments[0] = jQuery.event.fix( event || window.event ); + event.currentTarget = this; + + // Namespaced event handlers + var namespaces = event.type.split("."); + event.type = namespaces.shift(); + + // Cache this now, all = true means, any handler + all = !namespaces.length && !event.exclusive; + + var namespace = RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)"); + + handlers = ( jQuery.data(this, "events") || {} )[event.type]; + + for ( var j in handlers ) { + var handler = handlers[j]; + + // Filter the functions by class + if ( all || namespace.test(handler.type) ) { + // Pass in a reference to the handler function itself + // So that we can later remove it + event.handler = handler; + event.data = handler.data; + + var ret = handler.apply(this, arguments); + + if( ret !== undefined ){ + event.result = ret; + if ( ret === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + + if( event.isImmediatePropagationStopped() ) + break; + + } + } + }, + + props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), + + fix: function(event) { + if ( event[expando] ) + return event; + + // store a copy of the original event object + // and "clone" to set read-only properties + var originalEvent = event; + event = jQuery.Event( originalEvent ); + + for ( var i = this.props.length, prop; i; ){ + prop = this.props[ --i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Fix target property, if necessary + if ( !event.target ) + event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either + + // check if target is a textnode (safari) + if ( event.target.nodeType == 3 ) + event.target = event.target.parentNode; + + // Add relatedTarget, if necessary + if ( !event.relatedTarget && event.fromElement ) + event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && event.clientX != null ) { + var doc = document.documentElement, body = document.body; + event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0); + event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0); + } + + // Add which for key events + if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) + event.which = event.charCode || event.keyCode; + + // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) + if ( !event.metaKey && event.ctrlKey ) + event.metaKey = event.ctrlKey; + + // Add which for click: 1 == left; 2 == middle; 3 == right + // Note: button is not normalized, so don't use it + if ( !event.which && event.button ) + event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) )); + + return event; + }, + + proxy: function( fn, proxy ){ + proxy = proxy || function(){ return fn.apply(this, arguments); }; + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++; + // So proxy can be declared as an argument + return proxy; + }, + + special: { + ready: { + // Make sure the ready event is setup + setup: bindReady, + teardown: function() {} + } + }, + + specialAll: { + live: { + setup: function( selector, namespaces ){ + jQuery.event.add( this, namespaces[0], liveHandler ); + }, + teardown: function( namespaces ){ + if ( namespaces.length ) { + var remove = 0, name = RegExp("(^|\\.)" + namespaces[0] + "(\\.|$)"); + + jQuery.each( (jQuery.data(this, "events").live || {}), function(){ + if ( name.test(this.type) ) + remove++; + }); + + if ( remove < 1 ) + jQuery.event.remove( this, namespaces[0], liveHandler ); + } + } + } + } +}; + +jQuery.Event = function( src ){ + // Allow instantiation without the 'new' keyword + if( !this.preventDefault ) + return new jQuery.Event(src); + + // Event object + if( src && src.type ){ + this.originalEvent = src; + this.type = src.type; + // Event type + }else + this.type = src; + + // timeStamp is buggy for some events on Firefox(#3843) + // So we won't rely on the native value + this.timeStamp = now(); + + // Mark it as fixed + this[expando] = true; +}; + +function returnFalse(){ + return false; +} +function returnTrue(){ + return true; +} + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-bind... +jQuery.Event.prototype = { + preventDefault: function() { + this.isDefaultPrevented = returnTrue; + + var e = this.originalEvent; + if( !e ) + return; + // if preventDefault exists run it on the original event + if (e.preventDefault) + e.preventDefault(); + // otherwise set the returnValue property of the original event to false (IE) + e.returnValue = false; + }, + stopPropagation: function() { + this.isPropagationStopped = returnTrue; + + var e = this.originalEvent; + if( !e ) + return; + // if stopPropagation exists run it on the original event + if (e.stopPropagation) + e.stopPropagation(); + // otherwise set the cancelBubble property of the original event to true (IE) + e.cancelBubble = true; + }, + stopImmediatePropagation:function(){ + this.isImmediatePropagationStopped = returnTrue; + this.stopPropagation(); + }, + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse +}; +// Checks if an event happened on an element within another element +// Used in jQuery.event.special.mouseenter and mouseleave handlers +var withinElement = function(event) { + // Check if mouse(over|out) are still within the same parent element + var parent = event.relatedTarget; + // Traverse up the tree + while ( parent && parent != this ) + try { parent = parent.parentNode; } + catch(e) { parent = this; } + + if( parent != this ){ + // set the correct event type + event.type = event.data; + // handle event if we actually just moused on to a non sub-element + jQuery.event.handle.apply( this, arguments ); + } +}; + +jQuery.each({ + mouseover: 'mouseenter', + mouseout: 'mouseleave' +}, function( orig, fix ){ + jQuery.event.special[ fix ] = { + setup: function(){ + jQuery.event.add( this, orig, withinElement, fix ); + }, + teardown: function(){ + jQuery.event.remove( this, orig, withinElement ); + } + }; +}); + +jQuery.fn.extend({ + bind: function( type, data, fn ) { + return type == "unload" ? this.one(type, data, fn) : this.each(function(){ + jQuery.event.add( this, type, fn || data, fn && data ); + }); + }, + + one: function( type, data, fn ) { + var one = jQuery.event.proxy( fn || data, function(event) { + jQuery(this).unbind(event, one); + return (fn || data).apply( this, arguments ); + }); + return this.each(function(){ + jQuery.event.add( this, type, one, fn && data); + }); + }, + + unbind: function( type, fn ) { + return this.each(function(){ + jQuery.event.remove( this, type, fn ); + }); + }, + + trigger: function( type, data ) { + return this.each(function(){ + jQuery.event.trigger( type, data, this ); + }); + }, + + triggerHandler: function( type, data ) { + if( this[0] ){ + var event = jQuery.Event(type); + event.preventDefault(); + event.stopPropagation(); + jQuery.event.trigger( event, data, this[0] ); + return event.result; + } + }, + + toggle: function( fn ) { + // Save reference to arguments for access in closure + var args = arguments, i = 1; + + // link all the functions, so any of them can unbind this click handler + while( i < args.length ) + jQuery.event.proxy( fn, args[i++] ); + + return this.click( jQuery.event.proxy( fn, function(event) { + // Figure out which function to execute + this.lastToggle = ( this.lastToggle || 0 ) % i; + + // Make sure that clicks stop + event.preventDefault(); + + // and execute the function + return args[ this.lastToggle++ ].apply( this, arguments ) || false; + })); + }, + + hover: function(fnOver, fnOut) { + return this.mouseenter(fnOver).mouseleave(fnOut); + }, + + ready: function(fn) { + // Attach the listeners + bindReady(); + + // If the DOM is already ready + if ( jQuery.isReady ) + // Execute the function immediately + fn.call( document, jQuery ); + + // Otherwise, remember the function for later + else + // Add the function to the wait list + jQuery.readyList.push( fn ); + + return this; + }, + + live: function( type, fn ){ + var proxy = jQuery.event.proxy( fn ); + proxy.guid += this.selector + type; + + jQuery(document).bind( liveConvert(type, this.selector), this.selector, proxy ); + + return this; + }, + + die: function( type, fn ){ + jQuery(document).unbind( liveConvert(type, this.selector), fn ? { guid: fn.guid + this.selector + type } : null ); + return this; + } +}); + +function liveHandler( event ){ + var check = RegExp("(^|\\.)" + event.type + "(\\.|$)"), + stop = true, + elems = []; + + jQuery.each(jQuery.data(this, "events").live || [], function(i, fn){ + if ( check.test(fn.type) ) { + var elem = jQuery(event.target).closest(fn.data)[0]; + if ( elem ) + elems.push({ elem: elem, fn: fn }); + } + }); + + elems.sort(function(a,b) { + return jQuery.data(a.elem, "closest") - jQuery.data(b.elem, "closest"); + }); + + jQuery.each(elems, function(){ + if ( this.fn.call(this.elem, event, this.fn.data) === false ) + return (stop = false); + }); + + return stop; +} + +function liveConvert(type, selector){ + return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "|")].join("."); +} + +jQuery.extend({ + isReady: false, + readyList: [], + // Handle when the DOM is ready + ready: function() { + // Make sure that the DOM is not already loaded + if ( !jQuery.isReady ) { + // Remember that the DOM is ready + jQuery.isReady = true; + + // If there are functions bound, to execute + if ( jQuery.readyList ) { + // Execute all of them + jQuery.each( jQuery.readyList, function(){ + this.call( document, jQuery ); + }); + + // Reset the list of functions + jQuery.readyList = null; + } + + // Trigger any bound ready events + jQuery(document).triggerHandler("ready"); + } + } +}); + +var readyBound = false; + +function bindReady(){ + if ( readyBound ) return; + readyBound = true; + + // Mozilla, Opera and webkit nightlies currently support this event + if ( document.addEventListener ) { + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", function(){ + document.removeEventListener( "DOMContentLoaded", arguments.callee, false ); + jQuery.ready(); + }, false ); + + // If IE event model is used + } else if ( document.attachEvent ) { + // ensure firing before onload, + // maybe late but safe also for iframes + document.attachEvent("onreadystatechange", function(){ + if ( document.readyState === "complete" ) { + document.detachEvent( "onreadystatechange", arguments.callee ); + jQuery.ready(); + } + }); + + // If IE and not an iframe + // continually check to see if the document is ready + if ( document.documentElement.doScroll && window == window.top ) (function(){ + if ( jQuery.isReady ) return; + + try { + // If IE is used, use the trick by Diego Perini + // http://javascript.nwbox.com/IEContentLoaded/ + document.documentElement.doScroll("left"); + } catch( error ) { + setTimeout( arguments.callee, 0 ); + return; + } + + // and execute any waiting functions + jQuery.ready(); + })(); + } + + // A fallback to window.onload, that will always work + jQuery.event.add( window, "load", jQuery.ready ); +} + +jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," + + "mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave," + + "change,select,submit,keydown,keypress,keyup,error").split(","), function(i, name){ + + // Handle event binding + jQuery.fn[name] = function(fn){ + return fn ? this.bind(name, fn) : this.trigger(name); + }; +}); + +// Prevent memory leaks in IE +// And prevent errors on refresh with events like mouseover in other browsers +// Window isn't included so as not to unbind existing unload events +jQuery( window ).bind( 'unload', function(){ + for ( var id in jQuery.cache ) + // Skip the window + if ( id != 1 && jQuery.cache[ id ].handle ) + jQuery.event.remove( jQuery.cache[ id ].handle.elem ); +}); +(function(){ + + jQuery.support = {}; + + var root = document.documentElement, + script = document.createElement("script"), + div = document.createElement("div"), + id = "script" + (new Date).getTime(); + + div.style.display = "none"; + div.innerHTML = ' <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>'; + + var all = div.getElementsByTagName("*"), + a = div.getElementsByTagName("a")[0]; + + // Can't get basic test support + if ( !all || !all.length || !a ) { + return; + } + + jQuery.support = { + // IE strips leading whitespace when .innerHTML is used + leadingWhitespace: div.firstChild.nodeType == 3, + + // Make sure that tbody elements aren't automatically inserted + // IE will insert them into empty tables + tbody: !div.getElementsByTagName("tbody").length, + + // Make sure that you can get all elements in an <object> element + // IE 7 always returns no results + objectAll: !!div.getElementsByTagName("object")[0] + .getElementsByTagName("*").length, + + // Make sure that link elements get serialized correctly by innerHTML + // This requires a wrapper element in IE + htmlSerialize: !!div.getElementsByTagName("link").length, + + // Get the style information from getAttribute + // (IE uses .cssText insted) + style: /red/.test( a.getAttribute("style") ), + + // Make sure that URLs aren't manipulated + // (IE normalizes it by default) + hrefNormalized: a.getAttribute("href") === "/a", + + // Make sure that element opacity exists + // (IE uses filter instead) + opacity: a.style.opacity === "0.5", + + // Verify style float existence + // (IE uses styleFloat instead of cssFloat) + cssFloat: !!a.style.cssFloat, + + // Will be defined later + scriptEval: false, + noCloneEvent: true, + boxModel: null + }; + + script.type = "text/javascript"; + try { + script.appendChild( document.createTextNode( "window." + id + "=1;" ) ); + } catch(e){} + + root.insertBefore( script, root.firstChild ); + + // Make sure that the execution of code works by injecting a script + // tag with appendChild/createTextNode + // (IE doesn't support this, fails, and uses .text instead) + if ( window[ id ] ) { + jQuery.support.scriptEval = true; + delete window[ id ]; + } + + root.removeChild( script ); + + if ( div.attachEvent && div.fireEvent ) { + div.attachEvent("onclick", function(){ + // Cloning a node shouldn't copy over any + // bound event handlers (IE does this) + jQuery.support.noCloneEvent = false; + div.detachEvent("onclick", arguments.callee); + }); + div.cloneNode(true).fireEvent("onclick"); + } + + // Figure out if the W3C box model works as expected + // document.body must exist before we can do this + jQuery(function(){ + var div = document.createElement("div"); + div.style.width = div.style.paddingLeft = "1px"; + + document.body.appendChild( div ); + jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2; + document.body.removeChild( div ).style.display = 'none'; + }); +})(); + +var styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat"; + +jQuery.props = { + "for": "htmlFor", + "class": "className", + "float": styleFloat, + cssFloat: styleFloat, + styleFloat: styleFloat, + readonly: "readOnly", + maxlength: "maxLength", + cellspacing: "cellSpacing", + rowspan: "rowSpan", + tabindex: "tabIndex" +}; +jQuery.fn.extend({ + // Keep a copy of the old load + _load: jQuery.fn.load, + + load: function( url, params, callback ) { + if ( typeof url !== "string" ) + return this._load( url ); + + var off = url.indexOf(" "); + if ( off >= 0 ) { + var selector = url.slice(off, url.length); + url = url.slice(0, off); + } + + // Default to a GET request + var type = "GET"; + + // If the second parameter was provided + if ( params ) + // If it's a function + if ( jQuery.isFunction( params ) ) { + // We assume that it's the callback + callback = params; + params = null; + + // Otherwise, build a param string + } else if( typeof params === "object" ) { + params = jQuery.param( params ); + type = "POST"; + } + + var self = this; + + // Request the remote document + jQuery.ajax({ + url: url, + type: type, + dataType: "html", + data: params, + complete: function(res, status){ + // If successful, inject the HTML into all the matched elements + if ( status == "success" || status == "notmodified" ) + // See if a selector was specified + self.html( selector ? + // Create a dummy div to hold the results + jQuery("<div/>") + // inject the contents of the document in, removing the scripts + // to avoid any 'Permission Denied' errors in IE + .append(res.responseText.replace(/<script(.|\s)*?\/script>/g, "")) + + // Locate the specified elements + .find(selector) : + + // If not, just inject the full result + res.responseText ); + + if( callback ) + self.each( callback, [res.responseText, status, res] ); + } + }); + return this; + }, + + serialize: function() { + return jQuery.param(this.serializeArray()); + }, + serializeArray: function() { + return this.map(function(){ + return this.elements ? jQuery.makeArray(this.elements) : this; + }) + .filter(function(){ + return this.name && !this.disabled && + (this.checked || /select|textarea/i.test(this.nodeName) || + /text|hidden|password|search/i.test(this.type)); + }) + .map(function(i, elem){ + var val = jQuery(this).val(); + return val == null ? null : + jQuery.isArray(val) ? + jQuery.map( val, function(val, i){ + return {name: elem.name, value: val}; + }) : + {name: elem.name, value: val}; + }).get(); + } +}); + +// Attach a bunch of functions for handling common AJAX events +jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){ + jQuery.fn[o] = function(f){ + return this.bind(o, f); + }; +}); + +var jsc = now(); + +jQuery.extend({ + + get: function( url, data, callback, type ) { + // shift arguments if data argument was ommited + if ( jQuery.isFunction( data ) ) { + callback = data; + data = null; + } + + return jQuery.ajax({ + type: "GET", + url: url, + data: data, + success: callback, + dataType: type + }); + }, + + getScript: function( url, callback ) { + return jQuery.get(url, null, callback, "script"); + }, + + getJSON: function( url, data, callback ) { + return jQuery.get(url, data, callback, "json"); + }, + + post: function( url, data, callback, type ) { + if ( jQuery.isFunction( data ) ) { + callback = data; + data = {}; + } + + return jQuery.ajax({ + type: "POST", + url: url, + data: data, + success: callback, + dataType: type + }); + }, + + ajaxSetup: function( settings ) { + jQuery.extend( jQuery.ajaxSettings, settings ); + }, + + ajaxSettings: { + url: location.href, + global: true, + type: "GET", + contentType: "application/x-www-form-urlencoded", + processData: true, + async: true, + /* + timeout: 0, + data: null, + username: null, + password: null, + */ + // Create the request object; Microsoft failed to properly + // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available + // This function can be overriden by calling jQuery.ajaxSetup + xhr:function(){ + return window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); + }, + accepts: { + xml: "application/xml, text/xml", + html: "text/html", + script: "text/javascript, application/javascript", + json: "application/json, text/javascript", + text: "text/plain", + _default: "*/*" + } + }, + + // Last-Modified header cache for next request + lastModified: {}, + + ajax: function( s ) { + // Extend the settings, but re-extend 's' so that it can be + // checked again later (in the test suite, specifically) + s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s)); + + var jsonp, jsre = /=\?(&|$)/g, status, data, + type = s.type.toUpperCase(); + + // convert data if not already a string + if ( s.data && s.processData && typeof s.data !== "string" ) + s.data = jQuery.param(s.data); + + // Handle JSONP Parameter Callbacks + if ( s.dataType == "jsonp" ) { + if ( type == "GET" ) { + if ( !s.url.match(jsre) ) + s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?"; + } else if ( !s.data || !s.data.match(jsre) ) + s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?"; + s.dataType = "json"; + } + + // Build temporary JSONP function + if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) { + jsonp = "jsonp" + jsc++; + + // Replace the =? sequence both in the query string and the data + if ( s.data ) + s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1"); + s.url = s.url.replace(jsre, "=" + jsonp + "$1"); + + // We need to make sure + // that a JSONP style response is executed properly + s.dataType = "script"; + + // Handle JSONP-style loading + window[ jsonp ] = function(tmp){ + data = tmp; + success(); + complete(); + // Garbage collect + window[ jsonp ] = undefined; + try{ delete window[ jsonp ]; } catch(e){} + if ( head ) + head.removeChild( script ); + }; + } + + if ( s.dataType == "script" && s.cache == null ) + s.cache = false; + + if ( s.cache === false && type == "GET" ) { + var ts = now(); + // try replacing _= if it is there + var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2"); + // if nothing was replaced, add timestamp to the end + s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : ""); + } + + // If data is available, append data to url for get requests + if ( s.data && type == "GET" ) { + s.url += (s.url.match(/\?/) ? "&" : "?") + s.data; + + // IE likes to send both get and post data, prevent this + s.data = null; + } + + // Watch for a new set of requests + if ( s.global && ! jQuery.active++ ) + jQuery.event.trigger( "ajaxStart" ); + + // Matches an absolute URL, and saves the domain + var parts = /^(\w+:)?\/\/([^\/?#]+)/.exec( s.url ); + + // If we're requesting a remote document + // and trying to load JSON or Script with a GET + if ( s.dataType == "script" && type == "GET" && parts + && ( parts[1] && parts[1] != location.protocol || parts[2] != location.host )){ + + var head = document.getElementsByTagName("head")[0]; + var script = document.createElement("script"); + script.src = s.url; + if (s.scriptCharset) + script.charset = s.scriptCharset; + + // Handle Script loading + if ( !jsonp ) { + var done = false; + + // Attach handlers for all browsers + script.onload = script.onreadystatechange = function(){ + if ( !done && (!this.readyState || + this.readyState == "loaded" || this.readyState == "complete") ) { + done = true; + success(); + complete(); + + // Handle memory leak in IE + script.onload = script.onreadystatechange = null; + head.removeChild( script ); + } + }; + } + + head.appendChild(script); + + // We handle everything using the script element injection + return undefined; + } + + var requestDone = false; + + // Create the request object + var xhr = s.xhr(); + + // Open the socket + // Passing null username, generates a login popup on Opera (#2865) + if( s.username ) + xhr.open(type, s.url, s.async, s.username, s.password); + else + xhr.open(type, s.url, s.async); + + // Need an extra try/catch for cross domain requests in Firefox 3 + try { + // Set the correct header, if data is being sent + if ( s.data ) + xhr.setRequestHeader("Content-Type", s.contentType); + + // Set the If-Modified-Since header, if ifModified mode. + if ( s.ifModified ) + xhr.setRequestHeader("If-Modified-Since", + jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" ); + + // Set header so the called script knows that it's an XMLHttpRequest + xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest"); + + // Set the Accepts header for the server, depending on the dataType + xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ? + s.accepts[ s.dataType ] + ", */*" : + s.accepts._default ); + } catch(e){} + + // Allow custom headers/mimetypes and early abort + if ( s.beforeSend && s.beforeSend(xhr, s) === false ) { + // Handle the global AJAX counter + if ( s.global && ! --jQuery.active ) + jQuery.event.trigger( "ajaxStop" ); + // close opended socket + xhr.abort(); + return false; + } + + if ( s.global ) + jQuery.event.trigger("ajaxSend", [xhr, s]); + + // Wait for a response to come back + var onreadystatechange = function(isTimeout){ + // The request was aborted, clear the interval and decrement jQuery.active + if (xhr.readyState == 0) { + if (ival) { + // clear poll interval + clearInterval(ival); + ival = null; + // Handle the global AJAX counter + if ( s.global && ! --jQuery.active ) + jQuery.event.trigger( "ajaxStop" ); + } + // The transfer is complete and the data is available, or the request timed out + } else if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) { + requestDone = true; + + // clear poll interval + if (ival) { + clearInterval(ival); + ival = null; + } + + status = isTimeout == "timeout" ? "timeout" : + !jQuery.httpSuccess( xhr ) ? "error" : + s.ifModified && jQuery.httpNotModified( xhr, s.url ) ? "notmodified" : + "success"; + + if ( status == "success" ) { + // Watch for, and catch, XML document parse errors + try { + // process the data (runs the xml through httpData regardless of callback) + data = jQuery.httpData( xhr, s.dataType, s ); + } catch(e) { + status = "parsererror"; + } + } + + // Make sure that the request was successful or notmodified + if ( status == "success" ) { + // Cache Last-Modified header, if ifModified mode. + var modRes; + try { + modRes = xhr.getResponseHeader("Last-Modified"); + } catch(e) {} // swallow exception thrown by FF if header is not available + + if ( s.ifModified && modRes ) + jQuery.lastModified[s.url] = modRes; + + // JSONP handles its own success callback + if ( !jsonp ) + success(); + } else + jQuery.handleError(s, xhr, status); + + // Fire the complete handlers + complete(); + + if ( isTimeout ) + xhr.abort(); + + // Stop memory leaks + if ( s.async ) + xhr = null; + } + }; + + if ( s.async ) { + // don't attach the handler to the request, just poll it instead + var ival = setInterval(onreadystatechange, 13); + + // Timeout checker + if ( s.timeout > 0 ) + setTimeout(function(){ + // Check to see if the request is still happening + if ( xhr && !requestDone ) + onreadystatechange( "timeout" ); + }, s.timeout); + } + + // Send the data + try { + xhr.send(s.data); + } catch(e) { + jQuery.handleError(s, xhr, null, e); + } + + // firefox 1.5 doesn't fire statechange for sync requests + if ( !s.async ) + onreadystatechange(); + + function success(){ + // If a local callback was specified, fire it and pass it the data + if ( s.success ) + s.success( data, status ); + + // Fire the global callback + if ( s.global ) + jQuery.event.trigger( "ajaxSuccess", [xhr, s] ); + } + + function complete(){ + // Process result + if ( s.complete ) + s.complete(xhr, status); + + // The request was completed + if ( s.global ) + jQuery.event.trigger( "ajaxComplete", [xhr, s] ); + + // Handle the global AJAX counter + if ( s.global && ! --jQuery.active ) + jQuery.event.trigger( "ajaxStop" ); + } + + // return XMLHttpRequest to allow aborting the request etc. + return xhr; + }, + + handleError: function( s, xhr, status, e ) { + // If a local callback was specified, fire it + if ( s.error ) s.error( xhr, status, e ); + + // Fire the global callback + if ( s.global ) + jQuery.event.trigger( "ajaxError", [xhr, s, e] ); + }, + + // Counter for holding the number of active queries + active: 0, + + // Determines if an XMLHttpRequest was successful or not + httpSuccess: function( xhr ) { + try { + // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450 + return !xhr.status && location.protocol == "file:" || + ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223; + } catch(e){} + return false; + }, + + // Determines if an XMLHttpRequest returns NotModified + httpNotModified: function( xhr, url ) { + try { + var xhrRes = xhr.getResponseHeader("Last-Modified"); + + // Firefox always returns 200. check Last-Modified date + return xhr.status == 304 || xhrRes == jQuery.lastModified[url]; + } catch(e){} + return false; + }, + + httpData: function( xhr, type, s ) { + var ct = xhr.getResponseHeader("content-type"), + xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0, + data = xml ? xhr.responseXML : xhr.responseText; + + if ( xml && data.documentElement.tagName == "parsererror" ) + throw "parsererror"; + + // Allow a pre-filtering function to sanitize the response + // s != null is checked to keep backwards compatibility + if( s && s.dataFilter ) + data = s.dataFilter( data, type ); + + // The filter can actually parse the response + if( typeof data === "string" ){ + + // If the type is "script", eval it in global context + if ( type == "script" ) + jQuery.globalEval( data ); + + // Get the JavaScript object, if JSON is used. + if ( type == "json" ) + data = window["eval"]("(" + data + ")"); + } + + return data; + }, + + // Serialize an array of form elements or a set of + // key/values into a query string + param: function( a ) { + var s = [ ]; + + function add( key, value ){ + s[ s.length ] = encodeURIComponent(key) + '=' + encodeURIComponent(value); + }; + + // If an array was passed in, assume that it is an array + // of form elements + if ( jQuery.isArray(a) || a.jquery ) + // Serialize the form elements + jQuery.each( a, function(){ + add( this.name, this.value ); + }); + + // Otherwise, assume that it's an object of key/value pairs + else + // Serialize the key/values + for ( var j in a ) + // If the value is an array then the key names need to be repeated + if ( jQuery.isArray(a[j]) ) + jQuery.each( a[j], function(){ + add( j, this ); + }); + else + add( j, jQuery.isFunction(a[j]) ? a[j]() : a[j] ); + + // Return the resulting serialization + return s.join("&").replace(/%20/g, "+"); + } + +}); +var elemdisplay = {}, + timerId, + fxAttrs = [ + // height animations + [ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ], + // width animations + [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ], + // opacity animations + [ "opacity" ] + ]; + +function genFx( type, num ){ + var obj = {}; + jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function(){ + obj[ this ] = type; + }); + return obj; +} + +jQuery.fn.extend({ + show: function(speed,callback){ + if ( speed ) { + return this.animate( genFx("show", 3), speed, callback); + } else { + for ( var i = 0, l = this.length; i < l; i++ ){ + var old = jQuery.data(this[i], "olddisplay"); + + this[i].style.display = old || ""; + + if ( jQuery.css(this[i], "display") === "none" ) { + var tagName = this[i].tagName, display; + + if ( elemdisplay[ tagName ] ) { + display = elemdisplay[ tagName ]; + } else { + var elem = jQuery("<" + tagName + " />").appendTo("body"); + + display = elem.css("display"); + if ( display === "none" ) + display = "block"; + + elem.remove(); + + elemdisplay[ tagName ] = display; + } + + jQuery.data(this[i], "olddisplay", display); + } + } + + // Set the display of the elements in a second loop + // to avoid the constant reflow + for ( var i = 0, l = this.length; i < l; i++ ){ + this[i].style.display = jQuery.data(this[i], "olddisplay") || ""; + } + + return this; + } + }, + + hide: function(speed,callback){ + if ( speed ) { + return this.animate( genFx("hide", 3), speed, callback); + } else { + for ( var i = 0, l = this.length; i < l; i++ ){ + var old = jQuery.data(this[i], "olddisplay"); + if ( !old && old !== "none" ) + jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display")); + } + + // Set the display of the elements in a second loop + // to avoid the constant reflow + for ( var i = 0, l = this.length; i < l; i++ ){ + this[i].style.display = "none"; + } + + return this; + } + }, + + // Save the old toggle function + _toggle: jQuery.fn.toggle, + + toggle: function( fn, fn2 ){ + var bool = typeof fn === "boolean"; + + return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ? + this._toggle.apply( this, arguments ) : + fn == null || bool ? + this.each(function(){ + var state = bool ? fn : jQuery(this).is(":hidden"); + jQuery(this)[ state ? "show" : "hide" ](); + }) : + this.animate(genFx("toggle", 3), fn, fn2); + }, + + fadeTo: function(speed,to,callback){ + return this.animate({opacity: to}, speed, callback); + }, + + animate: function( prop, speed, easing, callback ) { + var optall = jQuery.speed(speed, easing, callback); + + return this[ optall.queue === false ? "each" : "queue" ](function(){ + + var opt = jQuery.extend({}, optall), p, + hidden = this.nodeType == 1 && jQuery(this).is(":hidden"), + self = this; + + for ( p in prop ) { + if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) + return opt.complete.call(this); + + if ( ( p == "height" || p == "width" ) && this.style ) { + // Store display property + opt.display = jQuery.css(this, "display"); + + // Make sure that nothing sneaks out + opt.overflow = this.style.overflow; + } + } + + if ( opt.overflow != null ) + this.style.overflow = "hidden"; + + opt.curAnim = jQuery.extend({}, prop); + + jQuery.each( prop, function(name, val){ + var e = new jQuery.fx( self, opt, name ); + + if ( /toggle|show|hide/.test(val) ) + e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop ); + else { + var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/), + start = e.cur(true) || 0; + + if ( parts ) { + var end = parseFloat(parts[2]), + unit = parts[3] || "px"; + + // We need to compute starting value + if ( unit != "px" ) { + self.style[ name ] = (end || 1) + unit; + start = ((end || 1) / e.cur(true)) * start; + self.style[ name ] = start + unit; + } + + // If a +=/-= token was provided, we're doing a relative animation + if ( parts[1] ) + end = ((parts[1] == "-=" ? -1 : 1) * end) + start; + + e.custom( start, end, unit ); + } else + e.custom( start, val, "" ); + } + }); + + // For JS strict compliance + return true; + }); + }, + + stop: function(clearQueue, gotoEnd){ + var timers = jQuery.timers; + + if (clearQueue) + this.queue([]); + + this.each(function(){ + // go in reverse order so anything added to the queue during the loop is ignored + for ( var i = timers.length - 1; i >= 0; i-- ) + if ( timers[i].elem == this ) { + if (gotoEnd) + // force the next step to be the last + timers[i](true); + timers.splice(i, 1); + } + }); + + // start the next in the queue if the last step wasn't forced + if (!gotoEnd) + this.dequeue(); + + return this; + } + +}); + +// Generate shortcuts for custom animations +jQuery.each({ + slideDown: genFx("show", 1), + slideUp: genFx("hide", 1), + slideToggle: genFx("toggle", 1), + fadeIn: { opacity: "show" }, + fadeOut: { opacity: "hide" } +}, function( name, props ){ + jQuery.fn[ name ] = function( speed, callback ){ + return this.animate( props, speed, callback ); + }; +}); + +jQuery.extend({ + + speed: function(speed, easing, fn) { + var opt = typeof speed === "object" ? speed : { + complete: fn || !fn && easing || + jQuery.isFunction( speed ) && speed, + duration: speed, + easing: fn && easing || easing && !jQuery.isFunction(easing) && easing + }; + + opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration : + jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default; + + // Queueing + opt.old = opt.complete; + opt.complete = function(){ + if ( opt.queue !== false ) + jQuery(this).dequeue(); + if ( jQuery.isFunction( opt.old ) ) + opt.old.call( this ); + }; + + return opt; + }, + + easing: { + linear: function( p, n, firstNum, diff ) { + return firstNum + diff * p; + }, + swing: function( p, n, firstNum, diff ) { + return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum; + } + }, + + timers: [], + + fx: function( elem, options, prop ){ + this.options = options; + this.elem = elem; + this.prop = prop; + + if ( !options.orig ) + options.orig = {}; + } + +}); + +jQuery.fx.prototype = { + + // Simple function for setting a style value + update: function(){ + if ( this.options.step ) + this.options.step.call( this.elem, this.now, this ); + + (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this ); + + // Set display property to block for height/width animations + if ( ( this.prop == "height" || this.prop == "width" ) && this.elem.style ) + this.elem.style.display = "block"; + }, + + // Get the current size + cur: function(force){ + if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) + return this.elem[ this.prop ]; + + var r = parseFloat(jQuery.css(this.elem, this.prop, force)); + return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0; + }, + + // Start an animation from one number to another + custom: function(from, to, unit){ + this.startTime = now(); + this.start = from; + this.end = to; + this.unit = unit || this.unit || "px"; + this.now = this.start; + this.pos = this.state = 0; + + var self = this; + function t(gotoEnd){ + return self.step(gotoEnd); + } + + t.elem = this.elem; + + if ( t() && jQuery.timers.push(t) && !timerId ) { + timerId = setInterval(function(){ + var timers = jQuery.timers; + + for ( var i = 0; i < timers.length; i++ ) + if ( !timers[i]() ) + timers.splice(i--, 1); + + if ( !timers.length ) { + clearInterval( timerId ); + timerId = undefined; + } + }, 13); + } + }, + + // Simple 'show' function + show: function(){ + // Remember where we started, so that we can go back to it later + this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop ); + this.options.show = true; + + // Begin the animation + // Make sure that we start at a small width/height to avoid any + // flash of content + this.custom(this.prop == "width" || this.prop == "height" ? 1 : 0, this.cur()); + + // Start by showing the element + jQuery(this.elem).show(); + }, + + // Simple 'hide' function + hide: function(){ + // Remember where we started, so that we can go back to it later + this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop ); + this.options.hide = true; + + // Begin the animation + this.custom(this.cur(), 0); + }, + + // Each step of an animation + step: function(gotoEnd){ + var t = now(); + + if ( gotoEnd || t >= this.options.duration + this.startTime ) { + this.now = this.end; + this.pos = this.state = 1; + this.update(); + + this.options.curAnim[ this.prop ] = true; + + var done = true; + for ( var i in this.options.curAnim ) + if ( this.options.curAnim[i] !== true ) + done = false; + + if ( done ) { + if ( this.options.display != null ) { + // Reset the overflow + this.elem.style.overflow = this.options.overflow; + + // Reset the display + this.elem.style.display = this.options.display; + if ( jQuery.css(this.elem, "display") == "none" ) + this.elem.style.display = "block"; + } + + // Hide the element if the "hide" operation was done + if ( this.options.hide ) + jQuery(this.elem).hide(); + + // Reset the properties, if the item has been hidden or shown + if ( this.options.hide || this.options.show ) + for ( var p in this.options.curAnim ) + jQuery.attr(this.elem.style, p, this.options.orig[p]); + + // Execute the complete function + this.options.complete.call( this.elem ); + } + + return false; + } else { + var n = t - this.startTime; + this.state = n / this.options.duration; + + // Perform the easing function, defaults to swing + this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration); + this.now = this.start + ((this.end - this.start) * this.pos); + + // Perform the next step of the animation + this.update(); + } + + return true; + } + +}; + +jQuery.extend( jQuery.fx, { + speeds:{ + slow: 600, + fast: 200, + // Default speed + _default: 400 + }, + step: { + + opacity: function(fx){ + jQuery.attr(fx.elem.style, "opacity", fx.now); + }, + + _default: function(fx){ + if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) + fx.elem.style[ fx.prop ] = fx.now + fx.unit; + else + fx.elem[ fx.prop ] = fx.now; + } + } +}); +if ( document.documentElement["getBoundingClientRect"] ) + jQuery.fn.offset = function() { + if ( !this[0] ) return { top: 0, left: 0 }; + if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] ); + var box = this[0].getBoundingClientRect(), doc = this[0].ownerDocument, body = doc.body, docElem = doc.documentElement, + clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0, + top = box.top + (self.pageYOffset || jQuery.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop, + left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft; + return { top: top, left: left }; + }; +else + jQuery.fn.offset = function() { + if ( !this[0] ) return { top: 0, left: 0 }; + if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] ); + jQuery.offset.initialized || jQuery.offset.initialize(); + + var elem = this[0], offsetParent = elem.offsetParent, prevOffsetParent = elem, + doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement, + body = doc.body, defaultView = doc.defaultView, + prevComputedStyle = defaultView.getComputedStyle(elem, null), + top = elem.offsetTop, left = elem.offsetLeft, + isAbsolute = prevComputedStyle.position === "absolute"; //RF: added by rf-team + + while ( (elem = elem.parentNode) && elem !== body && elem !== docElem && prevComputedStyle.position !== "fixed" ) { + computedStyle = defaultView.getComputedStyle(elem, null); + + //RF: added by rf-team + if ( (!isAbsolute && prevComputedStyle.position === "static") /* add scroll for statically positioned elements */ || + prevComputedStyle.position === "relative" /* not sure we need this - have to test */ || + elem === offsetParent /* add scroll offset of offsetParent element */ ) { + top -= elem.scrollTop, left -= elem.scrollLeft; + isAbsolute = prevComputedStyle.position === "absolute"; + } + //RF: end + + if ( elem === offsetParent ) { + top += elem.offsetTop, left += elem.offsetLeft; + if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) ) + top += parseInt( computedStyle.borderTopWidth, 10) || 0, + left += parseInt( computedStyle.borderLeftWidth, 10) || 0; + prevOffsetParent = offsetParent, offsetParent = elem.offsetParent; + } + if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) + top += parseInt( computedStyle.borderTopWidth, 10) || 0, + left += parseInt( computedStyle.borderLeftWidth, 10) || 0; + prevComputedStyle = computedStyle; + } + + if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) + top += body.offsetTop, + left += body.offsetLeft; + + if ( prevComputedStyle.position === "fixed" ) + top += Math.max(docElem.scrollTop, body.scrollTop), + left += Math.max(docElem.scrollLeft, body.scrollLeft); + + + return { top: top, left: left }; + }; + +jQuery.offset = { + initialize: function() { + if ( this.initialized ) return; + var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, rules, prop, bodyMarginTop = body.style.marginTop, + html = '<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>'; + + rules = { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' }; + for ( prop in rules ) container.style[prop] = rules[prop]; + + container.innerHTML = html; + body.insertBefore(container, body.firstChild); + innerDiv = container.firstChild, checkDiv = innerDiv.firstChild, td = innerDiv.nextSibling.firstChild.firstChild; + + this.doesNotAddBorder = (checkDiv.offsetTop !== 5); + this.doesAddBorderForTableAndCells = (td.offsetTop === 5); + + innerDiv.style.overflow = 'hidden', innerDiv.style.position = 'relative'; + this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5); + + body.style.marginTop = '1px'; + this.doesNotIncludeMarginInBodyOffset = (body.offsetTop === 0); + body.style.marginTop = bodyMarginTop; + + body.removeChild(container); + this.initialized = true; + }, + + bodyOffset: function(body) { + jQuery.offset.initialized || jQuery.offset.initialize(); + var top = body.offsetTop, left = body.offsetLeft; + if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) + top += parseInt( jQuery.curCSS(body, 'marginTop', true), 10 ) || 0, + left += parseInt( jQuery.curCSS(body, 'marginLeft', true), 10 ) || 0; + return { top: top, left: left }; + } +}; + + +jQuery.fn.extend({ + position: function() { + var left = 0, top = 0, results; + + if ( this[0] ) { + // Get *real* offsetParent + var offsetParent = this.offsetParent(), + + // Get correct offsets + offset = this.offset(), + parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset(); + + // Subtract element margins + // note: when an element has margin: auto the offsetLeft and marginLeft + // are the same in Safari causing offset.left to incorrectly be 0 + offset.top -= num( this, 'marginTop' ); + offset.left -= num( this, 'marginLeft' ); + + // Add offsetParent borders + parentOffset.top += num( offsetParent, 'borderTopWidth' ); + parentOffset.left += num( offsetParent, 'borderLeftWidth' ); + + // Subtract the two offsets + results = { + top: offset.top - parentOffset.top, + left: offset.left - parentOffset.left + }; + } + + return results; + }, + + offsetParent: function() { + var offsetParent = this[0].offsetParent || document.body; + while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') ) + offsetParent = offsetParent.offsetParent; + return jQuery(offsetParent); + } +}); + + +// Create scrollLeft and scrollTop methods +jQuery.each( ['Left', 'Top'], function(i, name) { + var method = 'scroll' + name; + + jQuery.fn[ method ] = function(val) { + if (!this[0]) return null; + + return val !== undefined ? + + // Set the scroll offset + this.each(function() { + this == window || this == document ? + window.scrollTo( + !i ? val : jQuery(window).scrollLeft(), + i ? val : jQuery(window).scrollTop() + ) : + this[ method ] = val; + }) : + + // Return the scroll offset + this[0] == window || this[0] == document ? + self[ i ? 'pageYOffset' : 'pageXOffset' ] || + jQuery.boxModel && document.documentElement[ method ] || + document.body[ method ] : + this[0][ method ]; + }; +}); + +(function() { + var safariCompatMode; + var getCompatMode = function() { + var compatMode = document.compatMode; + if (!compatMode && jQuery.browser.safari) { + if (!safariCompatMode) { + //detect compatMode as described in http://code.google.com/p/doctype/wiki/ArticleCompatMode + var width = jQuery(document.createElement("div")).attr('style', 'position:absolute;width:0;height:0;width:1') + .css('width'); + safariCompatMode = compatMode = (width == '1px' ? 'BackCompat' : 'CSS1Compat'); + } else { + compatMode = safariCompatMode; + } + } + + return compatMode; + }; + + + // Create innerHeight, innerWidth, outerHeight and outerWidth methods + jQuery.each([ "Height", "Width" ], function(i, name){ + + var tl = i ? "Left" : "Top", // top or left + br = i ? "Right" : "Bottom", // bottom or right + lower = name.toLowerCase(); + + // innerHeight and innerWidth + jQuery.fn["inner" + name] = function(){ + return this[0] ? + jQuery.css( this[0], lower, false, "padding" ) : + null; + }; + + // outerHeight and outerWidth + jQuery.fn["outer" + name] = function(margin) { + return this[0] ? + jQuery.css( this[0], lower, false, margin ? "margin" : "border" ) : + null; + }; + + var type = name.toLowerCase(); + + jQuery.fn[ type ] = function( size ) { + // Get window width or height + return this[0] == window ? + // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode + getCompatMode() == "CSS1Compat" && document.documentElement[ "client" + name ] || + document.body[ "client" + name ] : + + // Get document width or height + this[0] == document ? + // Either scroll[Width/Height] or offset[Width/Height], whichever is greater + Math.max( + document.documentElement["client" + name], + document.body["scroll" + name], document.documentElement["scroll" + name], + document.body["offset" + name], document.documentElement["offset" + name] + ) : + + // Get or set width or height on the element + size === undefined ? + // Get width or height on the element + (this.length ? jQuery.css( this[0], type ) : null) : + + // Set the width or height on the element (default to pixels if value is unitless) + this.css( type, typeof size === "string" ? size : size + "px" ); + }; + + }); +}()); +})(); Added: root/examples-sandbox/trunk/javascripts-draft/position/jquery.position.js =================================================================== --- root/examples-sandbox/trunk/javascripts-draft/position/jquery.position.js (rev 0) +++ root/examples-sandbox/trunk/javascripts-draft/position/jquery.position.js 2010-01-12 13:03:35 UTC (rev 16261) @@ -0,0 +1,201 @@ +(function($) { + $.fn.position = function(source, params) { + var stype = typeof source; + if (stype == "object" || stype == "string") { + var rect = {}; + if (source.type) { + rect = getPointerRect(source); + } else if (stype == "string" || source.nodeType || source instanceof jQuery) { + stype = "element"; + rect = getElementRect(source); + } else { + rect = source; + } + + var params = params || {}; + var options = $.extend({}, defaults, $.Richfaces.position.types[params.type || defaults.type] ); + return this.each(function() { + element = $(this); + //alert(rect.left+" "+rect.top+" "+rect.width+" "+rect.height); + position(rect, element, options); + }); + } + }; + + var defaults = { + type: "TOOLTIP", + collision: "", + offset: [0,0] + }; + + if (!$.Richfaces) { + $.Richfaces = {}; + } + + $.Richfaces.position = {}; + + $.Richfaces.position.types = { + // horisontal constants: L-left, R-right, C-center, A-auto + // vertical constants: T-top, B-bottom, M-middle, A-auto + // for auto: list of joinPoint-Direction pairs + TOOLTIP:{from:"LB", to:"AA", auto:["LB-LB", "LT-LT", "RB-RB", "RT-RT"]}, + DROPDOWN:{from:"RB", to:"AA",auto:["RB-LB", "RT-LT", "LB-RB", "LT-RT"]} + }; + + function cropPx(value) { + if (typeof value == "string") { + if (!isNaN(value)) { + return parseInt(value); + } + } + return NaN; + }; + + function getPointerRect (event) { + var e = jQuery.event.fix(event); + return {width: 0, height: 0, left: e.pageX, top: e.pageY}; + }; + + function getElementRect (element) { + var jqe = jQuery(element); + var offset = jqe.offset(); + return {width: jqe.width(), height: jqe.height(), left: offset.left, top: offset.top}; + }; + + function checkCollision (elementRect, windowRect) { + // return 0 if elementRect in windowRect without collision + if (elementRect.left >= windowRect.left && + elementRect.top >= windowRect.top && + elementRect.right <= windowRect.right && + elementRect.bottom <= windowRect.bottom) + return 0; + // return collision squire + var rect = {left: (elementRect.left>windowRect.left ? elementRect.left : windowRect.left), + top: (elementRect.top>windowRect.top ? elementRect.top : windowRect.top), + right: (elementRect.right<windowRect.right ? elementRect.right : windowRect.right), + bottom: (elementRect.bottom<windowRect.bottom ? elementRect.bottom : windowRect.bottom)}; + return (rect.right-rect.left) * (rect.bottom-rect.top); + }; + + function calculateAutoPosition (baseRect, rectOffset, windowRect, elementDim, options) { + var ox, oy; + var theBest = {square:0}; + var rect; + var s; + for (var i = 0; i<options.auto.length; i++) { + rect = getAutoPositionRect(baseRect, rectOffset, elementDim, options.auto[i]); + ox = rect.left; oy = rect.top; + s = Richfaces.Calendar.checkCollision(rect, windowRect); + if (s!=0) { + if (ox>=0 && oy>=0 && theBest.square<s) theBest = {x:ox, y:oy, square:s}; + } else break; + } + if (s!=0 && (ox<0 || oy<0 || theBest.square>s)) { + ox=theBest.x; oy=theBest.y + } + + /* + // jointPoint: bottom-right, direction: bottom-left + var basex = baseRect.left - rectOffset.left; + var basey = baseRect.top + rectOffset.top; + var rect = {right: basex + baseRect.width, top: basey + baseRect.height}; + rect.left = rect.right - elementDim.width; + rect.bottom = rect.top + elementDim.height; + ox = rect.left; oy = rect.top; + var s = Richfaces.Calendar.checkCollision(rect, windowRect); + if (s!=0) + { + if (ox>=0 && oy>=0 && theBest.square<s) theBest = {x:ox, y:oy, square:s}; + // jointPoint: top-right, direction: top-left + basex = baseRect.left - rectOffset.left; + basey = baseRect.top - rectOffset.top; + rect = {right: basex + baseRect.width, bottom: basey}; + rect.left = rect.right - elementDim.width; + rect.top = rect.bottom - elementDim.height; + ox = rect.left; oy = rect.top; + s = Richfaces.Calendar.checkCollision(rect, windowRect); + if (s!=0) + { + if (ox>=0 && oy>=0 && theBest.square<s) theBest = {x:ox, y:oy, square:s}; + // jointPoint: bottom-left, direction: bottom-right + basex = baseRect.left + rectOffset.left; + basey = baseRect.top + rectOffset.top; + rect = {left: basex, top: basey + baseRect.height}; + rect.right = rect.left + elementDim.width; + rect.bottom = rect.top + elementDim.height; + ox = rect.left; oy = rect.top; + s = Richfaces.Calendar.checkCollision(rect, windowRect); + if (s!=0) + { + if (ox>=0 && oy>=0 && theBest.square<s) theBest = {x:ox, y:oy, square:s}; + // jointPoint: top-left, direction: top-right + basex = baseRect.left + rectOffset.left; + basey = baseRect.top + rectOffset.top; + rect = {left: basex, bottom: basey}; + rect.right = rect.left + elementDim.width; + rect.top = rect.bottom - elementDim.height; + ox = rect.left; oy = rect.top; + s = Richfaces.Calendar.checkCollision(rect, windowRect); + if (s!=0) + { + // the best way selection + if (ox<0 || oy<0 || theBest.square>s) {ox=theBest.x; oy=theBest.y} + } + } + } + }*/ + + return {left:ox, top:oy}; + } + + function position (rect, element, options) { + var width = element.width(); + var height = element.height(); + + var left = cropPx(element.css('left')); + if (isNaN(left)) { + left = 0; + element.css('left', '0px'); + } + + var top = cropPx(element.css('top')); + if (isNaN(top)) { + top = 0; + element.css('top', '0px'); + } + + var elementOffset = element.offset(); + + var jqw = jQuery(window); + var winRect = {left:jqw.scrollLeft(), top:jqw.scrollTop(), width:jqw.width(), height:jqw.height()} + + /*var winWidth = jqw.width(); + var winLeft = jqw.scrollLeft(); + + var winHeight = jqw.height(); + var winTop = jqw.scrollTop();*/ + + calculateAutoPosition(rect, options.offset, winRect, {width:width, height:height}); + + /*var newLeft; + if (rect.left + width > winRect.left + winRect.width && rect.left + rect.width - width >= winRect.left) { + newLeft = rect.left + rect.width - width; + } else { + newLeft = rect.left; + } + + var newTop; + if (rect.top + rect.height + height > winRect.top + winRect.height && rect.top - height >= winRect.top) { + newTop = rect.top - height; + } else { + newTop = rect.top + rect.height; + }*/ + + left += newLeft - elementOffset.left; + top += newTop - elementOffset.top; + + element.css('left', (left + 'px')).css('top', (top + 'px')); + }; + +})(jQuery); + Added: root/examples-sandbox/trunk/javascripts-draft/position/jquery.utils.js =================================================================== --- root/examples-sandbox/trunk/javascripts-draft/position/jquery.utils.js (rev 0) +++ root/examples-sandbox/trunk/javascripts-draft/position/jquery.utils.js 2010-01-12 13:03:35 UTC (rev 16261) @@ -0,0 +1,83 @@ +if (!window.Richfaces) { + window.Richfaces = {}; +} + +Richfaces.jQuery = {}; + +(function(_r$, jQuery) { + var PX_REGEX = /^\s*[^\s]*px\s*$/; + + var parseToPx = function(value) { + if (value) { + if (PX_REGEX.test(value)) { + try { + return parseInt(value.replace(PX_REGEX, ""), 10); + } catch (e) { } + } + } + + return NaN; + }; + + _r$.position = function(rect, element) { + var jqe = jQuery(element); + var width = jqe.width(); + var height = jqe.height(); + + var left = parseToPx(jqe.css('left')); + if (isNaN(left)) { + left = 0; + jqe.css('left', '0px'); + } + + var top = parseToPx(jqe.css('top')); + if (isNaN(top)) { + top = 0; + jqe.css('top', '0px'); + } + + var elementOffset = jqe.offset(); + + var jqw = jQuery(window); + + var winWidth = jqw.width(); + var winLeft = jqw.scrollLeft(); + + var winHeight = jqw.height(); + var winTop = jqw.scrollTop(); + + var newLeft; + if (rect.left + width > winLeft + winWidth && rect.left + rect.width - width >= winLeft) { + newLeft = rect.left + rect.width - width; + } else { + newLeft = rect.left; + } + + var newTop; + if (rect.top + rect.height + height > winTop + winHeight && rect.top - height >= winTop) { + newTop = rect.top - height; + } else { + newTop = rect.top + rect.height; + } + + left += newLeft - elementOffset.left; + top += newTop - elementOffset.top; + + jqe.css('left', (left + 'px')).css('top', (top + 'px')); + }; + + _r$.getPointerRectangle = function(event) { + var e = jQuery.event.fix(event); + + return {width: 0, height: 0, left: e.pageX, top: e.pageY}; + }; + + _r$.getElementRectangle = function(element) { + var jqe = jQuery(element); + var offset = jqe.offset(); + + return {width: jqe.width(), height: jqe.height(), left: offset.left, top: offset.top}; + }; + +}(Richfaces.jQuery, jQuery)); +

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16260 - in root/cdk/trunk: plugins/generator and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-01-11 20:19:54 -0500 (Mon, 11 Jan 2010) New Revision: 16260 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterAdapter.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.java Modified: root/cdk/trunk/plugins/generator/pom.xml root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/FacesComponentProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConverterModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java root/cdk/trunk/pom.xml Log: https://jira.jboss.org/jira/browse/RF-7725 Modified: root/cdk/trunk/plugins/generator/pom.xml =================================================================== --- root/cdk/trunk/plugins/generator/pom.xml 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/pom.xml 2010-01-12 01:19:54 UTC (rev 16260) @@ -23,7 +23,7 @@ <dependency> <groupId>com.google.collections</groupId> <artifactId>google-collections</artifactId> - <version>1.0-rc3</version> + <version>1.0</version> </dependency> </dependencies> </dependencyManagement> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -23,17 +23,20 @@ package org.richfaces.cdk.apt; +import java.lang.annotation.Annotation; + import javax.lang.model.element.TypeElement; import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkProcessingException; +import org.richfaces.cdk.annotations.Behavior; /** * <p class="changed_added_4_0"></p> * @author asmirnov(a)exadel.com * */ -public class BehaviorProcessor implements CdkAnnotationProcessor { +public class BehaviorProcessor extends ProcessorBase implements CdkAnnotationProcessor { /* (non-Javadoc) * @see org.richfaces.cdk.apt.CdkAnnotationProcessor#process(javax.lang.model.element.TypeElement) @@ -44,13 +47,10 @@ } - /* (non-Javadoc) - * @see org.richfaces.cdk.CdkWorker#init(org.richfaces.cdk.CdkContext) - */ @Override - public void init(CdkContext context) { - // TODO Auto-generated method stub - + public Class<? extends Annotation> getProcessedAnnotation() { + return Behavior.class; } + } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -23,6 +23,8 @@ package org.richfaces.cdk.apt; +import java.lang.annotation.Annotation; + import javax.lang.model.element.TypeElement; import org.richfaces.cdk.CdkProcessingException; @@ -41,5 +43,7 @@ * @throws CdkProcessingException */ public void process(TypeElement element) throws CdkProcessingException; + + public Class<? extends Annotation> getProcessedAnnotation(); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -23,29 +23,28 @@ package org.richfaces.cdk.apt; -import java.lang.annotation.Annotation; -import java.util.Collections; -import java.util.Set; - -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.RoundEnvironment; -import javax.faces.component.FacesComponent; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.TypeElement; - +import com.google.common.collect.ImmutableList; import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkProcessingException; import org.richfaces.cdk.CdkWorker; import org.richfaces.cdk.ModelValidator; import org.richfaces.cdk.StandardOutputs; import org.richfaces.cdk.StandardSources; -import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.annotations.Behavior; import org.richfaces.cdk.annotations.Component; +import org.richfaces.cdk.annotations.Converter; import org.richfaces.cdk.util.Pair; -import com.google.common.collect.ImmutableList; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.faces.component.FacesComponent; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.TypeElement; +import java.lang.annotation.Annotation; +import java.util.Collections; +import java.util.Set; /** * <p class="changed_added_4_0"> @@ -60,9 +59,11 @@ private static final Set<String> ANY_ANNOTATION = Collections.singleton("*"); - private static final ImmutableList<Pair<? extends Class<? extends Annotation>, ? extends Class<? extends CdkAnnotationProcessor>>> PROCESSORS = ImmutableList - .of(Pair.of(Component.class, ComponentProcessor.class), Pair.of(FacesComponent.class, - FacesComponentProcessor.class), Pair.of(Behavior.class, BehaviorProcessor.class)); + private static final ImmutableList<? extends Class<? extends CdkAnnotationProcessor>> PROCESSORS = ImmutableList + .of(ComponentProcessor.class, + FacesComponentProcessor.class, + BehaviorProcessor.class, + ConverterProcessor.class); /** * <p class="changed_added_4_0"> @@ -79,6 +80,7 @@ * current CDK context * @throws CdkException */ + @Override public void init(CdkContext context) throws CdkException { this.context = context; } @@ -90,8 +92,8 @@ getContext().setWorker(SourceUtils.class, sourceUtils); if (!roundEnv.processingOver()) { // Process annotations. - for (Pair<? extends Class<? extends Annotation>, ? extends Class<? extends CdkAnnotationProcessor>> process : PROCESSORS) { - processAnnotation(process.getFirst(), process.getSecond()); + for (Class<? extends CdkAnnotationProcessor> process : PROCESSORS) { + processAnnotation(process); } // parse non-java sources getContext().getBuilderFor(StandardSources.FACES_CONFIGS).build(); @@ -108,11 +110,11 @@ return false; } - protected void processAnnotation(Class<? extends Annotation> annotation, - Class<? extends CdkAnnotationProcessor> processor) { - Set<? extends TypeElement> annotatedWith = getContext().getWorker(SourceUtils.class).getClassesAnnotatedWith( - annotation); + protected void processAnnotation(Class<? extends CdkAnnotationProcessor> processor) { CdkAnnotationProcessor cdkAnnotationProcessor = getContext().getWorker(processor); + Set<? extends TypeElement> annotatedWith = getContext().getWorker(SourceUtils.class) + .getClassesAnnotatedWith(cdkAnnotationProcessor.getProcessedAnnotation()); + for (TypeElement typeElement : annotatedWith) { try { cdkAnnotationProcessor.process(typeElement); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -25,6 +25,7 @@ package org.richfaces.cdk.apt; +import java.lang.annotation.Annotation; import java.util.List; import java.util.Map; import java.util.Set; @@ -37,7 +38,6 @@ import javax.lang.model.type.MirroredTypesException; import javax.lang.model.type.TypeMirror; -import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.NamingConventions; import org.richfaces.cdk.annotations.Attribute; @@ -59,7 +59,6 @@ import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor; import org.richfaces.cdk.model.ClassDescription; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.DescriptionGroup; import org.richfaces.cdk.model.Property; import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.FacetModel; @@ -79,8 +78,7 @@ * */ @SupportedAnnotationTypes({"javax.faces.component.FacesComponent", Component.NAME}) -public class ComponentProcessor implements CdkAnnotationProcessor { - private CdkContext context; +public class ComponentProcessor extends ProcessorBase implements CdkAnnotationProcessor { public void process(TypeElement componentElement) { ComponentLibrary library = getLibrary(); // Process class-level annotations. @@ -105,7 +103,7 @@ } private NamingConventions getNamingConventions() { - return context.getWorker(NamingConventions.class); + return getContext().getWorker(NamingConventions.class); } @@ -114,7 +112,7 @@ // Component family setComponeneFamily(componentElement, component); - setComponentDescription(componentElement, component); + setDescription(componentElement, component); processFacets(componentElement, component); // process Events. @@ -126,7 +124,7 @@ } private void processFacets(TypeElement componentElement, ComponentModel component) { - SourceUtils sourceUtils = context.getWorker(SourceUtils.class); + SourceUtils sourceUtils = getContext().getWorker(SourceUtils.class); Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Facet.class, componentElement); // TODO - encapsulate attribute builder into utility class. @@ -169,44 +167,6 @@ } } - private void setComponentDescription(TypeElement componentElement, ComponentModel component) { - - SourceUtils sourceUtils = context.getWorker(SourceUtils.class); - // JavaDoc comments - component.setDescription(sourceUtils.getDocComment(componentElement)); - - Icon icon = componentElement.getAnnotation(Icon.class); - - if (null != icon) { - setIcon(component, icon); - } - - DisplayName displayName = componentElement.getAnnotation(DisplayName.class); - - if (null != displayName) { - component.setDisplayname(displayName.value()); - } - } - - /** - * <p class="changed_added_4_0"></p> - * @param component - * @param icon - */ - private void setIcon(DescriptionGroup component, Icon icon) { - DescriptionGroup.Icon iconValue = new DescriptionGroup.Icon(); - - if (icon.small().length() > 0) { - iconValue.setSmallIcon(icon.small()); - } - - if (icon.large().length() > 0) { - iconValue.setLargeIcon(icon.large()); - } - - component.setIcon(iconValue); - } - private void setComponeneFamily(TypeElement componentElement, ComponentModel component) { Family family = componentElement.getAnnotation(Family.class); @@ -216,7 +176,7 @@ component.setFamily(family.value()); } else { // static final COMPONENT_FAMILY string constant. - Object value = context.getWorker(SourceUtils.class).getConstant(componentElement, "COMPONENT_FAMILY"); + Object value = getContext().getWorker(SourceUtils.class).getConstant(componentElement, "COMPONENT_FAMILY"); if (null != value) { component.setFamily(value.toString()); } @@ -280,7 +240,7 @@ } } - SourceUtils sourceUtils = context.getWorker(SourceUtils.class); + SourceUtils sourceUtils = getContext().getWorker(SourceUtils.class); sourceUtils.visitSupertypes(componentElement.asType(), new SuperTypeVisitor() { @Override @@ -383,7 +343,7 @@ } private Map<String, Property> parseProperties(String attributesConfig) { - return context.getWorker(FragmentParser.class).parseProperties(CdkEntityResolver.URN_ATTRIBUTES +attributesConfig+".xml"); + return getContext().getWorker(FragmentParser.class).parseProperties(CdkEntityResolver.URN_ATTRIBUTES +attributesConfig+".xml"); } private void setBehaviorEvent(Property attribute, EventName eventName) { @@ -396,12 +356,8 @@ } } - public ComponentLibrary getLibrary() { - return context.getLibrary(); - } - @Override - public void init(CdkContext context) { - this.context = context; + public Class<? extends Annotation> getProcessedAnnotation() { + return Component.class; } } Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -0,0 +1,58 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.apt; + +import java.lang.annotation.Annotation; + +import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkProcessingException; +import org.richfaces.cdk.annotations.Converter; +import org.richfaces.cdk.annotations.DisplayName; +import org.richfaces.cdk.annotations.Icon; +import org.richfaces.cdk.model.ConverterModel; + +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.element.TypeElement; + +/** + * @author akolonitsky + * @since Jan 4, 2010 + */ +@SupportedAnnotationTypes({"javax.faces.component.FacesComponent", Converter.NAME}) +public class ConverterProcessor extends ProcessorBase implements CdkAnnotationProcessor { + + @Override + public void process(TypeElement element) throws CdkProcessingException { + Converter converter = element.getAnnotation(Converter.class); + ConverterModel converterModel = new ConverterModel(); + converterModel.setConverterId(converter.id()); + converterModel.setConverterForClass(converter.forClass()); + setDescription(element, converterModel); + getLibrary().getConverters().add(converterModel); + } + + @Override + public Class<? extends Annotation> getProcessedAnnotation() { + return Converter.class; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/FacesComponentProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/FacesComponentProcessor.java 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/FacesComponentProcessor.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -23,6 +23,8 @@ package org.richfaces.cdk.apt; +import java.lang.annotation.Annotation; + import javax.faces.component.FacesComponent; import javax.lang.model.element.TypeElement; @@ -38,4 +40,9 @@ FacesComponent facesComponent = componentElement.getAnnotation(FacesComponent.class); return facesComponent.value(); } + @Override + public Class<? extends Annotation> getProcessedAnnotation() { + return FacesComponent.class; + } + } Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -0,0 +1,71 @@ +package org.richfaces.cdk.apt; + +import javax.lang.model.element.TypeElement; + +import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkWorker; +import org.richfaces.cdk.annotations.DisplayName; +import org.richfaces.cdk.annotations.Icon; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.DescriptionGroup; + +public class ProcessorBase implements CdkWorker { + + private CdkContext context; + + /** + * <p class="changed_added_4_0"></p> + * @param component + * @param icon + */ + protected void setIcon(DescriptionGroup component, Icon icon) { + DescriptionGroup.Icon iconValue = new DescriptionGroup.Icon(); + + if (icon.small().length() > 0) { + iconValue.setSmallIcon(icon.small()); + } + + if (icon.large().length() > 0) { + iconValue.setLargeIcon(icon.large()); + } + + component.setIcon(iconValue); + } + + public ComponentLibrary getLibrary() { + return getContext().getLibrary(); + } + + @Override + public void init(CdkContext context) { + this.context=context; + } + + /** + * <p class="changed_added_4_0"></p> + * @return the context + */ + protected CdkContext getContext() { + return context; + } + + protected void setDescription(TypeElement element, DescriptionGroup component) { + + SourceUtils sourceUtils = getContext().getWorker(SourceUtils.class); + // JavaDoc comments + component.setDescription(sourceUtils.getDocComment(element)); + + Icon icon = element.getAnnotation(Icon.class); + + if (null != icon) { + setIcon(component, icon); + } + + DisplayName displayName = element.getAnnotation(DisplayName.class); + + if (null != displayName) { + component.setDisplayname(displayName.value()); + } + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -0,0 +1,194 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.apt; + +import org.richfaces.cdk.CdkContext; +import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.NamingConventions; +import org.richfaces.cdk.annotations.Component; +import org.richfaces.cdk.annotations.DisplayName; +import org.richfaces.cdk.annotations.EventName; +import org.richfaces.cdk.annotations.Family; +import org.richfaces.cdk.annotations.Icon; +import org.richfaces.cdk.annotations.Renderer; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.DescriptionGroup; +import org.richfaces.cdk.model.Property; +import org.richfaces.cdk.model.RendererModel; +import org.richfaces.cdk.xmlconfig.CdkEntityResolver; +import org.richfaces.cdk.xmlconfig.FragmentParser; + +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.element.TypeElement; + +import java.lang.annotation.Annotation; +import java.util.Map; + +/** + * @author akolonitsky + * @since Dec 30, 2009 + */ +@SupportedAnnotationTypes({"javax.faces.component.FacesComponent", Renderer.NAME}) +public class RendererProcessor extends ProcessorBase implements CdkAnnotationProcessor { + + + public void process(TypeElement rendererElement) { + ComponentLibrary library = getLibrary(); + + // Process class-level annotations. Calculate type for base UI component class. + String explicitType = getComponentType(rendererElement); + + // Because component type is a primary key for components collection, we have to infer explicit value here. + String type = getNamingConventions() + .inferComponentType(explicitType, rendererElement.getQualifiedName().toString()); + + RendererModel renderer = new RendererModel(); + renderer.setType(new RendererModel.Type(type)); + + // Should that component be generated ? +// setClassNames(rendererElement, renderer); + setRendererProperties(rendererElement, renderer); + + //library.getComponents().add(renderer); + } + + protected String getComponentType(TypeElement componentElement) { + return componentElement.getAnnotation(Component.class).value(); + } + + private NamingConventions getNamingConventions() { + return getContext().getWorker(NamingConventions.class); + } + + + private void setRendererProperties(TypeElement componentElement, RendererModel renderer) + throws CdkException { + + // Component family + setRendererFamily(componentElement, renderer); + setRendererDescription(componentElement, renderer); +// processFacets(componentElement, renderer); + + // process Events. +// setEvents(componentElement, renderer); + // TODO - process renderers ( @Renderer and @RendererTemplate attribute. + // TODO - process @Test annotations. + // Process attributes. +// processAttributes(componentElement, component); + } + + private void setRendererDescription(TypeElement componentElement, RendererModel component) { + + SourceUtils sourceUtils = getContext().getWorker(SourceUtils.class); + // JavaDoc comments + component.setDescription(sourceUtils.getDocComment(componentElement)); + + Icon icon = componentElement.getAnnotation(Icon.class); + + if (null != icon) { + setIcon(component, icon); + } + + DisplayName displayName = componentElement.getAnnotation(DisplayName.class); + + if (null != displayName) { + component.setDisplayname(displayName.value()); + } + } + + private void setRendererFamily(TypeElement rendererElement, RendererModel renderer) { + Family family = rendererElement.getAnnotation(Family.class); + + if (null != family) { + + // @Family annotation + renderer.setFamily(family.value()); + } else { + // static final COMPONENT_FAMILY string constant. + Object value = getContext().getWorker(SourceUtils.class).getConstant(rendererElement, "COMPONENT_FAMILY"); + if (null != value) { + renderer.setFamily(value.toString()); + } + } + } + + +// private void setEvents(TypeElement componentElement, org.richfaces.cdk.model.Renderer component) { +// Fires fires = componentElement.getAnnotation(Fires.class); +// +// if (null != fires) { +// try { +// for (Class<? extends FacesEvent> eventClass : fires.value()) { +// component.addEvent(eventClass.getName()); +// } +// } catch (MirroredTypesException mirror) { +// for (TypeMirror eventType : mirror.getTypeMirrors()) { +// component.addEvent(eventType.toString()); +// // TODO - check does component already implement eventSource interface +// } +// } catch (MirroredTypeException mirror) { +// component.addEvent(mirror.getTypeMirror().toString()); +// } +// } +// } +// +// private void setClassNames(TypeElement componentElement, org.richfaces.cdk.model.Renderer renderer) { +// Generate generate = componentElement.getAnnotation(Generate.class); +// +// // Set generated and base class names. +// ClassDescription baseClass = new ClassDescription(componentElement.getQualifiedName().toString()); +// +// if (null != generate) { +// renderer.setRendererClass(new ClassDescription(generate.value())); +// renderer.setBaseClass(baseClass); +// renderer.setGenerate(true); +// } else if (componentElement.getModifiers().contains(Modifier.ABSTRACT)) { +// +// // Final component class will be set by validator. +// renderer.setBaseClass(baseClass); +// renderer.setGenerate(true); +// } else { +// renderer.setRendererClass(baseClass); +// renderer.setGenerate(false); +// } +// } + + private Map<String, Property> parseProperties(String attributesConfig) { + return getContext().getWorker(FragmentParser.class).parseProperties(CdkEntityResolver.URN_ATTRIBUTES +attributesConfig+".xml"); + } + + private void setBehaviorEvent(Property attribute, EventName eventName) { + if (null != eventName) { + org.richfaces.cdk.model.EventName event = new org.richfaces.cdk.model.EventName(); + + event.setName(eventName.value()); + event.setDefaultEvent(eventName.defaultEvent()); + attribute.getEventNames().add(event); + } + } + + @Override + public Class<? extends Annotation> getProcessedAnnotation() { + return Renderer.class; + } + +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -96,14 +96,12 @@ */ public Set<? extends TypeElement> getClassesAnnotatedWith( Class<? extends Annotation> annotation) { - Set<TypeElement> classes = Sets.newHashSet(); Set<? extends Element> annotatedWith = roundEnvironment.getElementsAnnotatedWith(annotation); + Set<TypeElement> classes = Sets.newHashSetWithExpectedSize(annotatedWith.size()); for (Element element : annotatedWith) { if (ElementKind.CLASS.equals(element.getKind())) { - TypeElement classElement = (TypeElement) element; - - classes.add(classElement); + classes.add((TypeElement) element); } } @@ -314,7 +312,7 @@ } - public void visitSupertypes(TypeMirror type, SuperTypeVisitor visitor){ + public void visitSupertypes(TypeMirror type, SuperTypeVisitor visitor) { List<? extends TypeMirror> supertypes = this.processingEnv.getTypeUtils().directSupertypes(type); for (TypeMirror typeMirror : supertypes) { visitSupertypes(typeMirror, visitor); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConverterModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConverterModel.java 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ConverterModel.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -30,34 +30,50 @@ * @author asmirnov(a)exadel.com * */ -//@SuppressWarnings("serial") -public class ConverterModel implements ModelElement<ConverterModel> { +public class ConverterModel extends ModelElementBase implements ModelElement<ConverterModel> { private static final long serialVersionUID = -6238591637703737886L; - private String id; + private String converterId; - private Class<?> forClass; + private Class<?> converterClass; + private Class<?> converterForClass; + public ConverterModel() { } - public String getId() { - return id; + public ConverterModel(String converterId, Class<?> converterClass) { + this.converterId = converterId; + this.converterClass = converterClass; } - public void setId(String id) { - this.id = id; + public String getConverterId() { + return converterId; } - public Class<?> getForClass() { - return forClass; + public void setConverterId(String converterId) { + this.converterId = converterId; } - public void setForClass(Class<?> forClass) { - this.forClass = forClass; + @Merge(false) + public Class<?> getConverterForClass() { + return converterForClass; } + public void setConverterForClass(Class<?> converterForClass) { + this.converterForClass = converterForClass; + } + + @Merge(false) + public Class<?> getConverterClass() { + return converterClass; + } + + public void setConverterClass(Class<?> converterClass) { + this.converterClass = converterClass; + } + @Override public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException { return visitor.visit(this, param); @@ -65,10 +81,12 @@ @Override public void merge(ConverterModel other) { + ComponentLibrary.merge(this, other); + } @Override public boolean same(ConverterModel other) { - return false; /*null != getType() && getType().equals(other.getType());*/ + return null != getConverterId() && getConverterId().equals(other.getConverterId()); } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ModelElementBase.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -2,6 +2,12 @@ import javax.xml.bind.annotation.XmlElement; +/** + * <p class="changed_added_4_0">Base class for the most JSF components taht have description + * attributes and support extensions in faces-config.</p> + * @author asmirnov(a)exadel.com + * + */ public class ModelElementBase implements DescriptionGroup, Extensible<ConfigExtension> { /** Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FacesConfigParser.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -69,6 +69,7 @@ ComponentLibrary facesConfig = ADAPTER.unmarshal(unmarshal); library.getComponents().addAll(facesConfig.getComponents()); library.getRenderKits().putAll(facesConfig.getRenderKits()); + library.getConverters().addAll(facesConfig.getConverters()); // TODO - merge changes into library. // library.getRenderers().addAll(unmarshal.getRenderers()); // library.getValidators().addAll(unmarshal.getValidators); Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterAdapter.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterAdapter.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterAdapter.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -0,0 +1,41 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +import org.richfaces.cdk.model.ConverterModel; + +/** + * @author akolonitsky + * @since Jan 10, 2010 + */ +public class ConverterAdapter extends AdapterBase<ConverterBean, ConverterModel>{ + + @Override + protected Class<? extends ConverterBean> getBeanClass(ConverterModel model) { + return ConverterBean.class; + } + + @Override + protected Class<? extends ConverterModel> getModelClass(ConverterBean bean) { + return ConverterModel.class; + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterAdapter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -0,0 +1,79 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.model; + +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ConfigExtension; + +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlElement; + +/** + * @author akolonitsky + * @since Jan 6, 2010 + */ +public class ConverterBean extends ExtensibleBean<ConfigExtension> { + + private String converterId; + + private String converterForClass; + + private String converterClass; + + @XmlElement(name = "converter-id", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) + public String getConverterId() { + return converterId; + } + + public void setConverterId(String converterId) { + this.converterId = converterId; + } + + @XmlElement(name = "converter-for-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) + public String getConverterForClass() { + return converterForClass; + } + + public void setConverterForClass(String converterForClass) { + this.converterForClass = converterForClass; + } + + @XmlElement(name = "converter-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) + public String getConverterClass() { + return converterClass; + } + + public void setConverterClass(String converterClass) { + this.converterClass = converterClass; + } + + @XmlElement(name = "converter-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) + @Override + public ConfigExtension getExtension() { + return super.getExtension(); + } + + @Override + public void setExtension(ConfigExtension extension) { + super.setExtension(extension); + } +} Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -36,6 +36,7 @@ import org.richfaces.cdk.model.ConfigExtension; import org.richfaces.cdk.model.EventModel; import org.richfaces.cdk.model.Extensible; +import org.richfaces.cdk.model.ConverterModel; import com.google.common.collect.Lists; @@ -50,12 +51,20 @@ @XmlElement(name = "component", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @XmlJavaTypeAdapter(ComponentAdapter.class) private List<ComponentModel> components = Lists.newArrayList(); + @XmlElement(name = "render-kit", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) private List<RenderKitBean> renderKits = Lists.newArrayList(); + + @XmlElement(name = "converter", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) + @XmlJavaTypeAdapter(ConverterAdapter.class) + private List<ConverterModel> converters = Lists.newArrayList(); + @XmlAttribute private String version = "2.0"; + @XmlAttribute(name="metadata-complete") private boolean metadataComplete; + @XmlElement(name = "faces-config-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) private FacesConfigExtension extension; @@ -129,6 +138,14 @@ this.renderKits = renderKits; } + public List<ConverterModel> getConverters() { + return converters; + } + + public void setConverters(List<ConverterModel> converters) { + this.converters = converters; + } + /** * <p class="changed_added_4_0"></p> * Added: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.java 2010-01-12 01:19:54 UTC (rev 16260) @@ -0,0 +1,76 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.cdk.xmlconfig.testmodel; + +import org.junit.Test; +import org.richfaces.cdk.CdkContextBase; +import org.richfaces.cdk.model.ComponentLibrary; +import org.richfaces.cdk.model.ComponentModel; +import org.richfaces.cdk.model.RenderKitModel; +import org.richfaces.cdk.model.RendererModel; +import org.richfaces.cdk.model.ConverterModel; +import org.richfaces.cdk.xmlconfig.JAXBBinding; +import org.richfaces.cdk.xmlconfig.FacesConfigGenerator; +import org.richfaces.cdk.xmlconfig.JaxbTestBase; +import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter; + +import javax.xml.transform.stream.StreamResult; +import java.io.StringWriter; + +/** + * @author akolonitsky + * @since Jan 10, 2010 + */ +public class ConverterBeanTest extends JaxbTestBase { + + @Test + public void testMarshalResultStringT() throws Exception { + CdkContextBase contextBase = new CdkContextBase(createClassLoader()); + JAXBBinding jaxbBinding = new JAXBBinding(); + + jaxbBinding.init(contextBase); + + ComponentLibrary library = new ComponentLibrary(); + + // add component + ComponentModel component = new ComponentModel( new ComponentModel.Type("foo.bar")); + library.getComponents().add(component); + + // add render kit + RenderKitModel renderKit = library.addRenderKit("HTML"); + + // add renderer + RendererModel renderer = new RendererModel(new RendererModel.Type("foo.Renderer")); + renderKit.getRenderers().add(renderer); + + // add converter + ConverterModel converterModel = new ConverterModel("my_converter", Object.class); + library.getConverters().add(converterModel); + + StringWriter writer = new StringWriter(); + StreamResult result = new StreamResult(writer); + FacesConfigAdapter adapter = new FacesConfigAdapter(); + + jaxbBinding.marshal(result, FacesConfigGenerator.FACES_SCHEMA_LOCATION, adapter.marshal(library)); + System.out.println(writer.toString()); + } +} Property changes on: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: root/cdk/trunk/pom.xml =================================================================== --- root/cdk/trunk/pom.xml 2010-01-11 20:36:57 UTC (rev 16259) +++ root/cdk/trunk/pom.xml 2010-01-12 01:19:54 UTC (rev 16260) @@ -136,7 +136,7 @@ <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> </configuration> - <phase>process-sources</phase> + <phase>verify</phase> <goals> <goal>check</goal> </goals>

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16259 - branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-01-11 15:36:57 -0500 (Mon, 11 Jan 2010) New Revision: 16259 Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateValidator.java branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectValidator.java Log: https://jira.jboss.org/jira/browse/RF-8213 Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java =================================================================== --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java 2010-01-11 14:07:55 UTC (rev 16258) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/BeanValidator.java 2010-01-11 20:36:57 UTC (rev 16259) @@ -73,8 +73,10 @@ Collection<String> messages = extractMessages(violations); if(null != parent){ Collection<String> parentMessages = parent.validateGraph(context, value, profiles); - if(null != messages){ - messages.addAll(parentMessages); + if (null != messages) { + if (null != parentMessages) { + messages.addAll(parentMessages); + } } else { messages = parentMessages; } Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateValidator.java =================================================================== --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateValidator.java 2010-01-11 14:07:55 UTC (rev 16258) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/HibernateValidator.java 2010-01-11 20:36:57 UTC (rev 16259) @@ -96,7 +96,9 @@ if(null != parent){ Collection<String> parentMessages = parent.validateGraph(context, value, profiles); if(null != validationMessages){ - validationMessages.addAll(parentMessages); + if (null != parentMessages) { + validationMessages.addAll(parentMessages); + } } else { validationMessages = parentMessages; } Modified: branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectValidator.java =================================================================== --- branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectValidator.java 2010-01-11 14:07:55 UTC (rev 16258) +++ branches/community/3.3.X/ui/beanValidator/src/main/java/org/richfaces/validator/ObjectValidator.java 2010-01-11 20:36:57 UTC (rev 16259) @@ -141,8 +141,10 @@ } if(null != parent){ Collection<String> parentMessages = parent.validate(context, target, value, profiles); - if(null != validationMessages){ - validationMessages.addAll(parentMessages); + if (null != validationMessages) { + if (null != parentMessages) { + validationMessages.addAll(parentMessages); + } } else { validationMessages = parentMessages; }

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16258 - in root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces: component/html and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2010-01-11 09:07:55 -0500 (Mon, 11 Jan 2010) New Revision: 16258 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/SortingFilteringVisualModelImpl.java Log: SortMode Enum instaed of String Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-01-11 14:05:32 UTC (rev 16257) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-01-11 14:07:55 UTC (rev 16258) @@ -8,6 +8,7 @@ import org.ajax4jsf.model.DataComponentState; import org.richfaces.component.state.DataTableState; +import org.richfaces.model.SortMode; import org.richfaces.model.visual.DataTableVisualModel; import org.richfaces.model.visual.SortingFilteringVisualModel; import org.richfaces.model.visual.impl.DataTableVisualModelImpl; @@ -22,7 +23,7 @@ private DataTableVisualModel visualModel; - private String sortMode; + private SortMode sortMode; private Collection<String> sortPriority; @@ -99,11 +100,11 @@ return sortingFilteringVisualModel; } - public void setSortMode(String sortMode) { + public void setSortMode(SortMode sortMode) { this.sortMode = sortMode; } - public String getSortMode() { + public SortMode getSortMode() { return getVisualModel().getSortingFilteringVisualModel().getSortMode(); } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-01-11 14:05:32 UTC (rev 16257) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-01-11 14:07:55 UTC (rev 16258) @@ -4,6 +4,8 @@ import javax.faces.component.UIComponent; +import org.richfaces.model.SortMode; + public abstract class UIDataTableBase extends UISequence implements Row { public Iterator<UIComponent> columns() { @@ -33,9 +35,9 @@ return true; } - public abstract String getSortMode(); + public abstract SortMode getSortMode(); - public abstract void setSortMode(String sortMode); + public abstract void setSortMode(SortMode sortMode); public abstract String getTableSkinClass(); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java 2010-01-11 14:05:32 UTC (rev 16257) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java 2010-01-11 14:07:55 UTC (rev 16258) @@ -1,6 +1,7 @@ package org.richfaces.component.html; import org.richfaces.component.UISubTable; +import org.richfaces.model.SortMode; public class HtmlSubTable extends UISubTable { @@ -10,13 +11,13 @@ } @Override - public String getSortMode() { + public SortMode getSortMode() { // TODO Auto-generated method stub return null; } @Override - public void setSortMode(String sortMode) { + public void setSortMode(SortMode sortMode) { // TODO Auto-generated method stub } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/SortingFilteringVisualModelImpl.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/SortingFilteringVisualModelImpl.java 2010-01-11 14:05:32 UTC (rev 16257) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/impl/SortingFilteringVisualModelImpl.java 2010-01-11 14:07:55 UTC (rev 16258) @@ -2,15 +2,16 @@ import java.util.Collection; +import org.richfaces.model.SortMode; import org.richfaces.model.visual.SortingFilteringVisualModel; public class SortingFilteringVisualModelImpl implements SortingFilteringVisualModel { - private String sortMode; + private SortMode sortMode; private Collection<String> sortPriority; - public String getSortMode() { + public SortMode getSortMode() { return sortMode; } @@ -18,7 +19,7 @@ return sortPriority; } - public void setSortMode(String sortMode) { + public void setSortMode(SortMode sortMode) { this.sortMode = sortMode; }

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16257 - root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2010-01-11 09:05:32 -0500 (Mon, 11 Jan 2010) New Revision: 16257 Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java Log: use sortMode Enum instead of String Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java 2010-01-11 14:04:25 UTC (rev 16256) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java 2010-01-11 14:05:32 UTC (rev 16257) @@ -2,12 +2,13 @@ import java.util.Collection; +import org.richfaces.model.SortMode; + public interface SortingFilteringVisualModel { - //TODO nick - make this Enum - public String getSortMode(); + public SortMode getSortMode(); - public void setSortMode(String sortMode); + public void setSortMode(SortMode sortMode); public Collection<String> getSortPriority();

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16256 - root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2010-01-11 09:04:25 -0500 (Mon, 11 Jan 2010) New Revision: 16256 Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/SortMode.java Log: Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/SortMode.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/SortMode.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/SortMode.java 2010-01-11 14:04:25 UTC (rev 16256) @@ -0,0 +1,6 @@ +package org.richfaces.model; + +public enum SortMode { + single, + multi +}

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16255 - in root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces: component/html and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2010-01-11 08:42:30 -0500 (Mon, 11 Jan 2010) New Revision: 16255 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumnGroup.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/RowHolder.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java Log: refactor ... Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -1,25 +1,77 @@ package org.richfaces.component; +import javax.el.MethodExpression; + import org.richfaces.model.Ordering; public abstract class UIColumn extends javax.faces.component.UIColumn implements Column { + + public abstract void setRowspan(int rowspan); + public abstract int getRowspan(); - private Ordering sortOrder; + public abstract void setColspan(int colspan); + public abstract int getColspan(); - public abstract int getRowspan(); + public abstract void setSortEvent(String sortEvent); + public abstract String getSortEvent(); + + //TODO: anton - add get/set sortIcon Asc/Desc/Unsort methods to the dataTable + public abstract void setSortIconAsc(String sortIcon); + public abstract String getSortIconAsc(); + + public abstract void setSortIconDesc(String sortIcon); + public abstract String getSortIconDesc(); + + public abstract void setSortIconUnsort(String sortIcon); + public abstract String getSortIconUnsort(); + - public abstract void setRowspan(int rowspan); + + /** + * SortOrder is an enumeration of the possible sort orderings. + * + * @param sortOrder + */ + + //TODO nick - use annotation from Swing? + //TODO anton - do you mean using javax.swing.SortOrder instead org.richfaces.model.Orderinbg??? + public abstract void setSortOrder(Ordering sortOrder); + public abstract Ordering getSortOrder(); + + /** + * expression used for column sorting. + * literal value is treated as property of data object + * EL-expression is evaluated on every data row + * @param sortExpression + */ + //TODO nick - use ValueExpression + public abstract void setSortExpression(String sortExpression); + public abstract String getSortExpression(); + + - public abstract int getColspan(); + //TODO nick - "filterExpression" is missing + + public abstract void setFilterMethod(MethodExpression methodExpression); + public abstract MethodExpression getFilterMethod(); - public abstract void setColspan(int colspan); + //TODO nick - make this java.lang.Object. Use case: Long or Enum used as filtering criteria + public abstract void setFilterValue(String filterValue); + public abstract String getFilterValue(); - //TODO nick - implement in the proper way - public Ordering getSortOrder() { - return null; - } + public abstract void setSelfSorted(boolean selfSorted); + public abstract boolean isSelfSorted(); - public void setSortOrder(Ordering sortOrder) { - - } + /** + * Out this column on new row + * @parameter + * @return the acceptClass + */ + public abstract boolean isBreakBefore(); + + /** + * @param newBreakBefore the value to set + */ + public abstract void setBreakBefore(boolean breakBefore); + } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumnGroup.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -44,10 +44,6 @@ return new ColumnsIterator(this); } - public boolean isBreakBefore() { - return true; - } - public void setBreakBefore(boolean newBreakBefore) { throw new IllegalStateException("Property 'breakBefore' for subtable is read-only"); } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -17,7 +17,6 @@ @Override protected Iterator<UIComponent> dataChildren() { - return new DataIterator(this); } @@ -30,10 +29,14 @@ } @Override - public boolean getRendersChildren() { + public boolean getRendersChildren() { return true; - } + } + public abstract String getSortMode(); + + public abstract void setSortMode(String sortMode); + public abstract String getTableSkinClass(); public abstract String getFirstRowSkinClass(); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumn.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -8,7 +8,7 @@ public class HtmlColumn extends UIColumn { enum PropertyKeys { - breakBefore, rowspan, colspan + breakBefore, rowspan, colspan, sortEvent, sortOrder, selfSorted, sortBy, sortIconAsc, sortIconDesc, sortIconUnsort } public static final String COMPONENT_TYPE = "org.richfaces.Column"; @@ -41,12 +41,34 @@ getStateHelper().put(PropertyKeys.rowspan, Integer.valueOf(rowspan)); } + @Override + public String getSortEvent() { + //TODO: anton - pass correct event name to the client ... + return (String)getStateHelper().eval(PropertyKeys.sortEvent, "click"); + } + + @Override + public Ordering getSortOrder() { + return (Ordering) getStateHelper().eval(PropertyKeys.sortOrder,Ordering.DESCENDING); + } + + @Override + public void setSortEvent(String sortEvent) { + getStateHelper().put(PropertyKeys.sortEvent, sortEvent); + } + + @Override + public void setSortOrder(Ordering sortOrder) { + getStateHelper().put(PropertyKeys.sortOrder, sortOrder); + } + public MethodExpression getFilterMethod() { // TODO Auto-generated method stub return null; } public String getFilterValue() { + // TODO Auto-generated method stub return null; } @@ -55,16 +77,15 @@ return null; } - public Ordering getSortOrder() { - // TODO Auto-generated method stub - return null; - } - public boolean isSelfSorted() { - // TODO Auto-generated method stub - return false; + return (Boolean)getStateHelper().eval(PropertyKeys.selfSorted, true); } + + public void setSelfSorted(boolean selfSorted) { + getStateHelper().put(PropertyKeys.selfSorted, selfSorted); + } + public boolean isSortable() { // TODO Auto-generated method stub return false; @@ -72,31 +93,60 @@ public void setFilterMethod(MethodExpression methodExpression) { // TODO Auto-generated method stub - + } public void setFilterValue(String filterValue) { // TODO Auto-generated method stub + + } + public void setSortExpression(String sortExpression) { + // TODO Auto-generated method stub + } - public void setSelfSorted(boolean selfSorted) { + public void setSortable(boolean sortable) { // TODO Auto-generated method stub + + } + public Object getSortBy() { + return getStateHelper().eval(PropertyKeys.sortBy); } - public void setSortExpression(String sortExpression) { - // TODO Auto-generated method stub + public void setSortBy(Object sortBy) { + getStateHelper().put(PropertyKeys.sortBy, sortBy); + } + @Override + public String getSortIconAsc() { + return (String)getStateHelper().get(PropertyKeys.sortIconAsc); } - public void setSortOrder(Ordering sortOrder) { - // TODO Auto-generated method stub + @Override + public String getSortIconDesc() { + return (String)getStateHelper().get(PropertyKeys.sortIconDesc); + } + @Override + public String getSortIconUnsort() { + return (String)getStateHelper().get(PropertyKeys.sortIconUnsort); } - public void setSortable(boolean sortable) { - // TODO Auto-generated method stub + @Override + public void setSortIconAsc(String sortIcon) { + getStateHelper().put(PropertyKeys.sortIconAsc, sortIcon); } + @Override + public void setSortIconDesc(String sortIcon) { + getStateHelper().put(PropertyKeys.sortIconDesc, sortIcon); + } + + @Override + public void setSortIconUnsort(String sortIcon) { + getStateHelper().put(PropertyKeys.sortIconUnsort, sortIcon); + } + } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumnGroup.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumnGroup.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlColumnGroup.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -1,72 +1,9 @@ package org.richfaces.component.html; -import javax.el.MethodExpression; - import org.richfaces.component.UIColumnGroup; -import org.richfaces.model.Ordering; public class HtmlColumnGroup extends UIColumnGroup { - public MethodExpression getFilterMethod() { - // TODO Auto-generated method stub - return null; - } - - public String getFilterValue() { - // TODO Auto-generated method stub - return null; - } - - public String getSortExpression() { - // TODO Auto-generated method stub - return null; - } - - public Ordering getSortOrder() { - // TODO Auto-generated method stub - return null; - } - - public boolean isSelfSorted() { - // TODO Auto-generated method stub - return false; - } - - public boolean isSortable() { - // TODO Auto-generated method stub - return false; - } - - public void setFilterMethod(MethodExpression methodExpression) { - // TODO Auto-generated method stub - - } - - public void setFilterValue(String filterValue) { - // TODO Auto-generated method stub - - } - - public void setSelfSorted(boolean selfSorted) { - // TODO Auto-generated method stub - - } - - public void setSortExpression(String sortExpression) { - // TODO Auto-generated method stub - - } - - public void setSortOrder(Ordering sortOrder) { - // TODO Auto-generated method stub - - } - - public void setSortable(boolean sortable) { - // TODO Auto-generated method stub - - } - @Override public String getFamily() { return COMPONENT_FAMILY; Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -1,50 +1,24 @@ package org.richfaces.component.html; -import javax.el.MethodExpression; - import org.richfaces.component.UISubTable; -import org.richfaces.model.Ordering; public class HtmlSubTable extends UISubTable { - public MethodExpression getFilterMethod() { - return null; + @Override + public String getFamily() { + return COMPONENT_FAMILY; } - public String getFilterValue() { + @Override + public String getSortMode() { + // TODO Auto-generated method stub return null; } - public Ordering getSortOrder() { - return null; - } - - public boolean isSelfSorted() { - return false; - } - - public boolean isSortable() { - return false; - } - - public void setFilterMethod(MethodExpression methodExpression) { - } - - public void setFilterValue(String filterValue) { - } - - public void setSelfSorted(boolean selfSorted) { - } - - public void setSortOrder(Ordering sortOrder) { - } - - public void setSortable(boolean sortable) { - } - @Override - public String getFamily() { - return COMPONENT_FAMILY; + public void setSortMode(String sortMode) { + // TODO Auto-generated method stub + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -51,7 +51,7 @@ try { encodeRow(holder); } catch (IOException e) { - // TODO: seems we need add throws IOException ??? + // TODO: anton - seems we need add throws IOException ??? } holder.nextRow(); return DataVisitResult.CONTINUE; Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -91,8 +91,8 @@ count = currentLength; } currentLength = 0; - } else if (component instanceof Column) { - Column column = (Column) component; + } else if (component instanceof org.richfaces.component.UIColumn) { + org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) component; // For new row, save length of previsous. if (column.isBreakBefore()) { if (currentLength > count) { @@ -168,8 +168,11 @@ public void encodeTableEnd(ResponseWriter writer, FacesContext context, UIDataTableBase component) throws IOException { writer.endElement(HTML.TABLE_ELEMENT); + encodeClientScript(writer, context, component); } + public abstract void encodeClientScript(ResponseWriter writer, FacesContext context, UIDataTableBase component) throws IOException; + public void encodeTableBodyStart(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException { writer.startElement(HTML.TBOBY_ELEMENT, dataTable); @@ -319,7 +322,7 @@ } - protected void encodeColumnFacet(FacesContext context, ResponseWriter writer, UIDataTableBase dataTableBase, String facetName, int colCount, String cellClass) throws IOException { + protected void encodeColumnFacet(FacesContext context, ResponseWriter writer, UIDataTableBase dataTableBase, String facetName, int colCount, String cellClass) throws IOException { int tColCount = 0; String id = dataTableBase.getClientId(context); @@ -396,6 +399,5 @@ public abstract HeaderEncodeStrategy getHeaderEncodeStrategy(UIComponent column, String tableFacetName); - public abstract boolean containsThead(); } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -1,6 +1,7 @@ package org.richfaces.renderkit; import java.io.IOException; +import java.util.HashMap; import java.util.Iterator; import javax.faces.application.ResourceDependencies; @@ -10,12 +11,14 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.richfaces.component.Row; import org.richfaces.component.UIDataTable; import org.richfaces.component.UIDataTableBase; import org.richfaces.component.UISubTable; import org.richfaces.component.util.FormUtil; +import org.richfaces.model.Ordering; @ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), @@ -56,7 +59,7 @@ @Override public RowHolder createRowHolder(FacesContext context, UIComponent component) { - return new RowHolder(context, component.getClientId(context), (UIDataTable)component); + return new RowHolder(context, (UIDataTable)component); } public void encodeRow(RowHolderBase holder) throws IOException { @@ -165,23 +168,22 @@ protected class RichHeaderEncodeStrategy implements HeaderEncodeStrategy { - public void encodeBegin(FacesContext context, ResponseWriter writer, UIComponent column, String facetName) - throws IOException { + public void encodeBegin(FacesContext context, ResponseWriter writer, UIComponent component, String facetName) throws IOException { - org.richfaces.component.UIColumn col = (org.richfaces.component.UIColumn) column; + org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) component; + + writer.writeAttribute("id", column.getClientId(context), null); - String columnClientId = col.getClientId(context); - String clientId = columnClientId + facetName; - writer.writeAttribute("id", clientId, null); - boolean sortableColumn = isSortable(col); - - if (sortableColumn && col.isSelfSorted()) { - FormUtil.throwEnclFormReqExceptionIfNeed(context, column.getParent()); - writer.writeAttribute(HTML.ONCLICK_ATTRIBUTE, createFunction(context, col) , null); - writer.writeAttribute(HTML.STYLE_ATTRIBUTE, "cursor: pointer;", null); + boolean sortableColumn = isSortable(column); + + if (sortableColumn && column.isSelfSorted()) { +// FormUtil.throwEnclFormReqExceptionIfNeed(context, column.getParent()); +// TODO: anton - add "selfSorted = true" behavior; +// writer.writeAttribute(HTML.ONCLICK_ATTRIBUTE, createFunction(context, col) , null); +// writer.writeAttribute(HTML.STYLE_ATTRIBUTE, "cursor: pointer;", null); } - writer.startElement(HTML.DIV_ELEM, column); +// writer.startElement(HTML.DIV_ELEM, column); // writer.writeAttribute(HTML.ID_ATTRIBUTE, clientId + SORT_DIV, null); if (sortableColumn) { @@ -190,20 +192,75 @@ } } - public void encodeEnd(FacesContext context, ResponseWriter writer, UIComponent column, String facetName) - throws IOException { + public void encodeEnd(FacesContext context, ResponseWriter writer, UIComponent component, String facetName) throws IOException { + + org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) component; + + if(isSortable(column)) { + + boolean enableAsc=false, enableDesc = false, enableUnsort = false; + + if(Ordering.ASCENDING.equals(column.getSortOrder())) { + enableAsc = true; + } else if(Ordering.DESCENDING.equals(column.getSortOrder())){ + enableDesc = true; + } else { + enableUnsort = true; + } + + encodeSortControls(context, writer, column, enableAsc, enableDesc, enableUnsort); + } + + writer.endElement(HTML.SPAN_ELEM); + } - } + public void encodeSortControls(FacesContext context, ResponseWriter writer, org.richfaces.component.UIColumn column, boolean enableAsc, boolean enableDesc, boolean enableUnsort) throws IOException { + + String sortIconAsc = column.getSortIconAsc(); + String sortIconDesc = column.getSortIconDesc(); + String sortIconUnsort = column.getSortIconUnsort(); + + //TODO: anton - add styles attribute for sortControls + + //encode asc control + writer.startElement(HTML.IMG_ELEMENT, column); + writer.writeAttribute(HTML.ID_ATTRIBUTE, column.getClientId(context) + ":" + Ordering.ASCENDING, null); + writer.writeAttribute(HTML.ALT_ATTRIBUTE, "", null); + writer.writeAttribute(HTML.SRC_ATTRIBUTE, sortIconAsc, null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "extdt-header-sort-img", null); + + if(!enableAsc) { + writer.writeAttribute(HTML.STYLE_ATTRIBUTE, "display: none;", null); + } + + writer.endElement(HTML.IMG_ELEMENT); + + //encode desc control + writer.startElement(HTML.IMG_ELEMENT, column); + writer.writeAttribute(HTML.ID_ATTRIBUTE, column.getClientId(context) + ":" + Ordering.DESCENDING, null); + writer.writeAttribute(HTML.ALT_ATTRIBUTE, "", null); + writer.writeAttribute(HTML.SRC_ATTRIBUTE, sortIconDesc, null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "extdt-header-sort-img", null); + + if(!enableDesc) { + writer.writeAttribute(HTML.STYLE_ATTRIBUTE, "display: none;", null); + } + writer.endElement(HTML.IMG_ELEMENT); - public boolean isSortable(UIColumn column) { - return (column.getAttributes().get("sortBy") != null); + //encode unsorted control + writer.startElement(HTML.IMG_ELEMENT, column); + writer.writeAttribute(HTML.ID_ATTRIBUTE, column.getClientId(context) + ":" + Ordering.UNSORTED, null); + writer.writeAttribute(HTML.ALT_ATTRIBUTE, "", null); + writer.writeAttribute(HTML.SRC_ATTRIBUTE, sortIconUnsort, null); + writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "extdt-header-sort-img", null); + + if(!enableUnsort) { + writer.writeAttribute(HTML.STYLE_ATTRIBUTE, "display: none;", null); + } + + writer.endElement(HTML.IMG_ELEMENT); } - - public String createFunction(FacesContext context, org.richfaces.component.UIColumn column) { - //build script - return null; - } - + } protected class SimpleHeaderEncodeStrategy implements HeaderEncodeStrategy { @@ -223,4 +280,51 @@ public boolean containsThead() { return true; } + + public boolean isSortable(UIColumn column) { + return (column.getAttributes().get("sortBy") != null); + } + + @Override + public void encodeClientScript(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException { + + writer.startElement(HTML.SCRIPT_ELEM, dataTable); + writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null); + + JSFunction function = new JSFunction("new RichFaces.ui.DataTable"); + function.addParameter(dataTable.getClientId(context)); + + HashMap<String, Object> options = new HashMap<String, Object>(); + options.put("sortMode", dataTable.getSortMode()); + + + HashMap<String, Object> columnsOption = new HashMap<String, Object>(); + + Iterator<UIComponent> columns = dataTable.columns(); + while (columns.hasNext()) { + + UIComponent component = (UIComponent) columns.next(); + HashMap<String, Object> columnOption = new HashMap<String, Object>(); + + if(component instanceof org.richfaces.component.UIColumn) { + org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn)component; + columnsOption.put(column.getClientId(context), columnOption); + + HashMap<String, Object> sorting = new HashMap<String, Object>(); + sorting.put("sortOrder", column.getSortOrder()); + sorting.put("sortEvent", column.getSortEvent()); + sorting.put("sortable", isSortable(column)); + columnOption.put("sorting", sorting); + } + + + } + + options.put("columns", columnsOption); + + function.addParameter(options); + + writer.writeText(function.toScript(), null); + writer.endElement(HTML.SCRIPT_ELEM); + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -389,4 +389,10 @@ public HeaderEncodeStrategy getHeaderEncodeStrategy(UIComponent column, String tableFacetName) { return null; } + + @Override + public void encodeClientScript(ResponseWriter writer, FacesContext context, UIDataTableBase component) { + // TODO Auto-generated method stub + + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/RowHolder.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/RowHolder.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/RowHolder.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -1,5 +1,6 @@ package org.richfaces.renderkit; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import org.richfaces.component.Row; @@ -21,11 +22,15 @@ return this.row; } - public RowHolder(FacesContext context, String dataTableId, Row row) { - this(context, row, 0, true); - this.dataTableId = dataTableId; + public RowHolder(FacesContext context,String dataTableId, Row row) { + this(context, row, 0, true, dataTableId); + } + public RowHolder(FacesContext context, Row row) { + this(context, row, 0, true, ((UIComponent)row).getClientId(context)); + } + public String getDataTableId() { return dataTableId; } @@ -34,11 +39,12 @@ this.dataTableId = dataTableId; } - public RowHolder(FacesContext context, Row row, int processCell, boolean isRowStart) { + public RowHolder(FacesContext context, Row row, int processCell, boolean isRowStart, String dataTableId) { super(context); this.row = row; this.processCell = processCell; this.isRowStart = isRowStart; + this.dataTableId = dataTableId; } public int getProcessCell() { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-01-11 13:40:25 UTC (rev 16254) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-01-11 13:42:30 UTC (rev 16255) @@ -42,7 +42,7 @@ @Override public RowHolderBase createRowHolder(FacesContext context, UIComponent component) { - return new RowHolder(context, component.getClientId(context), (UISubTable)component); + return new RowHolder(context, (UISubTable)component); } @Override @@ -77,4 +77,10 @@ // TODO implement column header facet return null; } + + @Override + public void encodeClientScript(ResponseWriter writer, FacesContext context, UIDataTableBase component) { + // TODO Auto-generated method stub + + } }

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16254 - in root/examples-sandbox/trunk/components/tables/src/main: java/org/richfaces/demo/model and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2010-01-11 08:40:25 -0500 (Mon, 11 Jan 2010) New Revision: 16254 Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/model/Company.java root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml Log: Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java 2010-01-11 13:35:55 UTC (rev 16253) +++ root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/DataBean.java 2010-01-11 13:40:25 UTC (rev 16254) @@ -9,6 +9,7 @@ import org.richfaces.demo.utils.EmployeeUtils; import org.richfaces.event.ToggleEvent; import org.richfaces.model.visual.DataTableVisualModel; +import org.richfaces.model.visual.SubTableVisualModel; @ManagedBean(name="dataBean") @SessionScoped @@ -17,14 +18,14 @@ private List<Employee> employeeList; private boolean state = true; - private DataTableVisualModel visualModel; + private DataTableVisualModel dataTableVisualModel; - public DataTableVisualModel getVisualModel() { - return visualModel; + public DataTableVisualModel getDataTableVisualModel() { + return dataTableVisualModel; } - public void setVisualModel(DataTableVisualModel visualModel) { - this.visualModel = visualModel; + public void setDataTableVisualModel(DataTableVisualModel dataTableVisualModel) { + this.dataTableVisualModel = dataTableVisualModel; } public void setEmployeeList(List<Employee> employeeList) { @@ -38,10 +39,6 @@ return employeeList; } - public void processToggle(ToggleEvent event) { - System.out.println("DataBean.processToggle()"); - } - public boolean isState() { return state; } Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/model/Company.java =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/model/Company.java 2010-01-11 13:35:55 UTC (rev 16253) +++ root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/model/Company.java 2010-01-11 13:40:25 UTC (rev 16254) @@ -1,6 +1,8 @@ package org.richfaces.demo.model; +import org.richfaces.model.visual.SubTableVisualModel; + public class Company { private String name; @@ -9,7 +11,16 @@ private String phone; + SubTableVisualModel model; + public SubTableVisualModel getModel() { + return model; + } + + public void setModel(SubTableVisualModel model) { + this.model = model; + } + public Company(String name) { this.name = name; } Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2010-01-11 13:35:55 UTC (rev 16253) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2010-01-11 13:40:25 UTC (rev 16254) @@ -13,7 +13,7 @@ <h:body> <h:form id="form1"> - <rich:dataTable var="record" value="#{dataBean.employeeList}" rows="20" > + <rich:dataTable var="record" value="#{dataBean.employeeList}" rows="20" sortMode="single" visualModel="#{dataBean.dataTableVisualModel}"> <f:facet name="caption"> <h:outputText id="captioFacet1" value="Caption Facet" /> </f:facet> @@ -24,7 +24,7 @@ <rich:column colspan="2"><h:outputText id="headerFacet14" value="header column 3"></h:outputText></rich:column> </rich:colGroup> </f:facet> - <rich:column id="column_name"> + <rich:column id="column_name" sortBy="test1" sortIconAsc="resources/images/asc.gif" sortIconDesc="resources/images/desc.gif" sortIconUnsort="resources/images/unsort.gif"> <f:facet name="header"> <h:outputText id="columnHeader1" value="Column Header Facet"/> </f:facet> @@ -32,11 +32,14 @@ <rich:toggleControl forId="expandedSubTable" expandControl="resources/images/+.gif" collapseControl="resources/images/-.gif" /> <h:outputText value="#{record.name}" /> <f:facet name="footer"> - <h:outputText id="columnFooter1" value="Column Footer Facet"/> + <h:outputText id="columnFooter1" value="Column Footer Facet 1"/> </f:facet> </rich:column> - <rich:column id="column_title"> + <rich:column id="column_title" sortBy="test2" sortIconAsc="resources/images/asc.gif" sortIconDesc="resources/images/desc.gif" sortIconUnsort="resources/images/unsort.gif"> + <f:facet name="header"> + <h:outputText id="columnHeader2" value="Column Header Facet 2"/> + </f:facet> <h:outputText value="#{record.title}" /> </rich:column> @@ -46,7 +49,7 @@ - <rich:subTable id="expandedSubTable" var="company" value="#{record.company}" rows="20" switchType="server" expanded="true" toggleListener="#{record.toggle}"> + <rich:subTable id="expandedSubTable" var="company" value="#{record.company}" rows="20" switchType="ajax" expanded="true"> <f:facet name="header"> <rich:colGroup id="headerFacet1" > <rich:column><h:outputText id="headerFacet12" value="company"> </h:outputText></rich:column> @@ -77,7 +80,7 @@ </f:facet> </rich:dataTable> - <h:commandLink value="test" /> + <h:commandButton value="submit" /> </h:form> </h:body> </html>

14 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits January 2010