Author: nbelaevski Date: 2009-07-07 13:31:52 -0400 (Tue, 07 Jul 2009) New Revision: 14816 Added: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/jquery.utils.js branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/resource/ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/resource/TestResource2.resource-marker Modified: branches/jsf2.0/framework/impl/src/main/resources/META-INF/resources-config.xml branches/jsf2.0/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/form.js branches/jsf2.0/framework/impl/src/main/resources/org/ajax4jsf/messages.properties branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages.properties branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_de.properties branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_en.properties branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_pl.properties branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/events.js branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js Log: Reintegrated community/3.3.x into JSF 2.0 branch Modified: branches/jsf2.0/framework/impl/src/main/resources/META-INF/resources-config.xml =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/META-INF/resources-config.xml 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/META-INF/resources-config.xml 2009-07-07 17:31:52 UTC (rev 14816) @@ -2,10 +2,10 @@ <resource-config> <resource class="org.ajax4jsf.javascript.AjaxScript"> <name>org.ajax4jsf.javascript.AjaxScript</name> - </resource> - <resource class="org.ajax4jsf.javascript.SmartPositionScript"> - <name>org.ajax4jsf.javascript.SmartPositionScript</name> </resource> + <resource class="org.ajax4jsf.javascript.SmartPositionScript"> + <name>org.ajax4jsf.javascript.SmartPositionScript</name> + </resource> <resource class="org.ajax4jsf.javascript.AjaxScript"> <name>ajax.js</name> </resource> @@ -25,24 +25,24 @@ <path>org/ajax4jsf/framework.pack.js</path> <renderer class="org.ajax4jsf.resource.CompressedScriptRenderer"/> </resource> - <resource > - <name>org/ajax4jsf/renderers/ajax/scripts/form.js</name> - <path>/org/ajax4jsf/javascript/scripts/form.js</path> - <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - <resource class="org.richfaces.renderkit.html.GradientA"> - <name>org.richfaces.renderkit.html.GradientA</name> - </resource> + <resource > + <name>org/ajax4jsf/renderers/ajax/scripts/form.js</name> + <path>/org/ajax4jsf/javascript/scripts/form.js</path> + <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> + </resource> + <resource class="org.richfaces.renderkit.html.GradientA"> + <name>org.richfaces.renderkit.html.GradientA</name> + </resource> <resource class="org.richfaces.renderkit.html.CustomizeableGradient"> <name>org.richfaces.renderkit.html.CustomizeableGradient</name> </resource> - <resource class="org.richfaces.renderkit.html.images.SliderArrowImage"> - <name>org.richfaces.renderkit.html.images.SliderArrowImage</name> - </resource> + <resource class="org.richfaces.renderkit.html.images.SliderArrowImage"> + <name>org.richfaces.renderkit.html.images.SliderArrowImage</name> + </resource> <resource class="org.richfaces.renderkit.html.BaseGradient"> <name>org.richfaces.renderkit.html.BaseGradient</name> </resource> - + <resource> <name>jquery.js</name> <path>org/richfaces/renderkit/html/scripts/jquery/jquery.js</path> @@ -82,21 +82,27 @@ <name>scriptaculous/sound.js</name> <path>org/richfaces/renderkit/html/scripts/scriptaculous/sound.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> - + </resource> + <resource> <name>scriptaculous/unittest.js</name> <path>org/richfaces/renderkit/html/scripts/scriptaculous/unittest.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> - + <resource> <name>org/richfaces/renderkit/html/scripts/jquery.jcarousel.js</name> <path>org/richfaces/renderkit/html/scripts/jquery.jcarousel.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> </resource> - + <resource> + <name>org/richfaces/renderkit/html/scripts/jquery.utils.js</name> + <path>org/richfaces/renderkit/html/scripts/jquery.utils.js</path> + <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> + </resource> + + <resource> <name>org/ajax4jsf/javascript/scripts/AJAX.js</name> <path>org/ajax4jsf/javascript/scripts/AJAX.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> @@ -130,5 +136,5 @@ <name>org/richfaces/renderkit/html/scripts/skinning.js</name> <path>org/richfaces/renderkit/html/scripts/skinning.js</path> <renderer class="org.ajax4jsf.resource.ScriptRenderer"/> - </resource> + </resource> </resource-config> Modified: branches/jsf2.0/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/form.js =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/form.js 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/form.js 2009-07-07 17:31:52 UTC (rev 14816) @@ -34,7 +34,14 @@ input.id=param; input.name=param; input.value=parameters[param]; - form.appendChild(input); + + if (param === "javax.faces.portletbridge.STATE_ID" /* fix for fileUpload in portlets */ + && form.firstChild) { + + form.insertBefore(input, form.firstChild); + } else { + form.appendChild(input); + } } } } Modified: branches/jsf2.0/framework/impl/src/main/resources/org/ajax4jsf/messages.properties =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/ajax4jsf/messages.properties 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/org/ajax4jsf/messages.properties 2009-07-07 17:31:52 UTC (rev 14816) @@ -180,8 +180,9 @@ NULL_SKIN_NAME_ERROR=Name for current Skin calculated as null CREATE_SKIN_INFO=Create new Skin instance for name {0} DEFAULT_PROPERTIES_NOT_FOUND_ERROR=Default properties for skin not found in {0} -SKIN_PROPERTIES_IO_ERROR=Attempt to load Skin property file caused IOError +SKIN_PROPERTIES_IO_ERROR=Attempt to load property file caused IOError SKIN_NOT_FOUND_ERROR=Skin with name {0} not found +THEME_NOT_FOUND_ERROR=Theme with name {0} not found ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR=Attempt to access to skin property as array ACESSING_SKIN_PROPERTY_ERROR=Attempt to access to skin property not as string parameter SKIN_PROPERTIES_READ_ONLY_ERROR=Skin properties is read-only @@ -257,4 +258,5 @@ HIGHLIGHT_LIBRARY_NOT_FOUND="In order to use highlight attribute of the rich:insert component, add jhighlight.jar from https://jhighlight.dev.java.net/ into application." INVALID_VALUE="Component {0} has invalid value expression {1}" DATASCROLLER_PAGE_MISSING=Datascroller {0}: The requested page #{1} isn''t found in the model containing {2} pages. Paging is reset to page #{3} -DATASCROLLER_PAGES_DIFFERENT=Datascroller components attached to component: {0} have different values of ''page'' attribute : {1} \ No newline at end of file +DATASCROLLER_PAGES_DIFFERENT=Datascroller components attached to component\: {0} have different values of ''page'' attribute \: {1} +COMPONENT_CONVERSION_ERROR=Component {0}\: conversion error occurred for value {1} \ No newline at end of file Modified: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages.properties =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages.properties 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages.properties 2009-07-07 17:31:52 UTC (rev 14816) @@ -1,9 +1,10 @@ # components -org.richfaces.component.UIExtendedDataTable.Menu.Columns=Columns de -org.richfaces.component.UIExtendedDataTable.Menu.SortAscending=Sort Ascending de -org.richfaces.component.UIExtendedDataTable.Menu.SortDescending=Sort Descending de -org.richfaces.component.UIExtendedDataTable.Menu.GroupByColumn=Group by this column de -org.richfaces.component.UIExtendedDataTable.Menu.DisableGrouping=Disable Grouping de +org.richfaces.component.UIExtendedDataTable.Menu.Columns=Columns +org.richfaces.component.UIExtendedDataTable.Menu.SortAscending=Sort Ascending +org.richfaces.component.UIExtendedDataTable.Menu.SortDescending=Sort Descending +org.richfaces.component.UIExtendedDataTable.Menu.GroupByColumn=Group by this column +org.richfaces.component.UIExtendedDataTable.Menu.DisableGrouping=Disable Grouping +org.richfaces.component.UIExtendedDataTable.NoData=No data # converters Modified: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_de.properties =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_de.properties 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_de.properties 2009-07-07 17:31:52 UTC (rev 14816) @@ -1,9 +1,10 @@ # components -org.richfaces.component.UIExtendedDataTable.Menu.Columns=Columns de -org.richfaces.component.UIExtendedDataTable.Menu.SortAscending=Sort Ascending de -org.richfaces.component.UIExtendedDataTable.Menu.SortDescending=Sort Descending de -org.richfaces.component.UIExtendedDataTable.Menu.GroupByColumn=Group by this column de -org.richfaces.component.UIExtendedDataTable.Menu.DisableGrouping=Disable Grouping de +org.richfaces.component.UIExtendedDataTable.Menu.Columns=Spalten +org.richfaces.component.UIExtendedDataTable.Menu.SortAscending=Absteigend sortieren +org.richfaces.component.UIExtendedDataTable.Menu.SortDescending=Aufsteigend sortieren +org.richfaces.component.UIExtendedDataTable.Menu.GroupByColumn=Gruppierung anhand der Spalte +org.richfaces.component.UIExtendedDataTable.Menu.DisableGrouping=Gruppierung aufheben +org.richfaces.component.UIExtendedDataTable.NoData=Keine Daten # converters Modified: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_en.properties =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_en.properties 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_en.properties 2009-07-07 17:31:52 UTC (rev 14816) @@ -4,6 +4,7 @@ org.richfaces.component.UIExtendedDataTable.Menu.SortDescending=Sort Descending org.richfaces.component.UIExtendedDataTable.Menu.GroupByColumn=Group by this column org.richfaces.component.UIExtendedDataTable.Menu.DisableGrouping=Disable Grouping +org.richfaces.component.UIExtendedDataTable.NoData=No data # converters Modified: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_pl.properties =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_pl.properties 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/component/messages_pl.properties 2009-07-07 17:31:52 UTC (rev 14816) @@ -4,6 +4,7 @@ org.richfaces.component.UIExtendedDataTable.Menu.SortDescending=Sortuj malej\u0105co org.richfaces.component.UIExtendedDataTable.Menu.GroupByColumn=Grupuj po kolumnie org.richfaces.component.UIExtendedDataTable.Menu.DisableGrouping=Wy\u0142\u0105cz grupowanie +org.richfaces.component.UIExtendedDataTable.NoData=Brak danych # converters Modified: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2009-07-07 17:31:52 UTC (rev 14816) @@ -19,12 +19,22 @@ this.onupBound = this.onup.bindAsEventListener(this); }, - activate: function(event) { + activate: function(event) { Event.observe(document, "mousemove", this.onmoveBound); Event.observe(document, "mouseup", this.onupBound); if (event.type == "mousemove") { this.onmoveBound(event); } + // prevent text selection in IE + this.onSelectStartHandler = document.onselectstart; + this.onDragStartHandler = document.ondragstart; + + document.onselectstart = function () { return false; }; + document.ondragstart = function () { DnD.ieReleaseCapture(); return false; }; + + if (document.releaseCapture) { + Event.observe(document, "mousemove", DnD.ieReleaseCapture); + } }, onmove: function(event) { @@ -58,6 +68,13 @@ deactivate: function() { Event.stopObserving(document, "mousemove", this.onmoveBound); Event.stopObserving(document, "mouseup", this.onupBound); + + document.onselectstart = this.onSelectStartHandler; + document.ondragstart = this.onDragStartHandler; + + if (document.releaseCapture) { + Event.stopObserving(document, "mousemove", DnD.ieReleaseCapture); + } } }; @@ -179,10 +196,12 @@ } }, + isDragEnabled: function() { + return !!this.getContentType(); + }, + startDrag : function(event) { - var contentType = this.getContentType(); - - if (contentType) { + if (this.isDragEnabled()) { if(this.grabbingCursor) { if(this.grabCursor && this.grabCursor.visible) { this.grabCursor.hideCursor(); @@ -205,18 +224,7 @@ Event.observe(document, "mousemove", this.dragTrigger); this.lastDragX = Event.pointerX(event); - this.lastDragY = Event.pointerY(event); - - // prevent text selection in IE - this.onSelectStartHandler = document.onselectstart; - this.onDragStartHandler = document.ondragstart; - - document.onselectstart = function () { return false; }; - document.ondragstart = function () { DnD.ieReleaseCapture(); return false; }; - - if (document.releaseCapture) { - Event.observe(document, "mousemove", DnD.ieReleaseCapture); - } + this.lastDragY = Event.pointerY(event); } }, @@ -261,13 +269,6 @@ this.lastDragX = undefined; this.lastDragY = undefined; - document.onselectstart = this.onSelectStartHandler; - document.ondragstart = this.onDragStartHandler; - - if (document.releaseCapture) { - Event.stopObserving(document, "mousemove", DnD.ieReleaseCapture); - } - if (this.endDragListener) { this.endDragListener.deactivate(); } Modified: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/events.js =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/events.js 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/events.js 2009-07-07 17:31:52 UTC (rev 14816) @@ -117,12 +117,21 @@ return { event: eventObj, + fire: function() { if (component.fireEvent) { component.fireEvent("on" + type, this.event); } else { component.dispatchEvent(this.event); } + }, + + destroy: function() { + if (props) { + for (var name in props) { + this.event[name] = undefined; + } + } } }; } Copied: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/jquery.utils.js (from rev 14238, trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/jquery.utils.js) =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/jquery.utils.js (rev 0) +++ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/jquery.utils.js 2009-07-07 17:31:52 UTC (rev 14816) @@ -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)); + Modified: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js 2009-07-07 17:31:52 UTC (rev 14816) @@ -1,7 +1,9 @@ { var mediaName = "rich-extended-skinning"; - var skipNavigator = window.opera || navigator.userAgent.indexOf('AppleWebKit/') > -1; + var userAgent = navigator.userAgent; + + var skipNavigator = window.opera || (userAgent.indexOf('AppleWebKit/') > -1 && userAgent.indexOf('Chrome/') == -1); if (!skipNavigator) { var resetMedia = function(elt) { Copied: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js (from rev 14238, trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js) =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js (rev 0) +++ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js 2009-07-07 17:31:52 UTC (rev 14816) @@ -0,0 +1,519 @@ +/* + * jQuery UI 1.7.1 + * + * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI + */ +;jQuery.ui || (function($) { + +var _remove = $.fn.remove, + isFF2 = $.browser.mozilla && (parseFloat($.browser.version) < 1.9); + +//Helper functions and ui object +$.ui = { + version: "1.7.1", + + // $.ui.plugin is deprecated. Use the proxy pattern instead. + plugin: { + add: function(module, option, set) { + var proto = $.ui[module].prototype; + for(var i in set) { + proto.plugins[i] = proto.plugins[i] || []; + proto.plugins[i].push([option, set[i]]); + } + }, + call: function(instance, name, args) { + var set = instance.plugins[name]; + if(!set || !instance.element[0].parentNode) { return; } + + for (var i = 0; i < set.length; i++) { + if (instance.options[set[i][0]]) { + set[i][1].apply(instance.element, args); + } + } + } + }, + + contains: function(a, b) { + return document.compareDocumentPosition + ? a.compareDocumentPosition(b) & 16 + : a !== b && a.contains(b); + }, + + hasScroll: function(el, a) { + + //If overflow is hidden, the element might have extra content, but the user wants to hide it + if ($(el).css('overflow') == 'hidden') { return false; } + + var scroll = (a && a == 'left') ? 'scrollLeft' : 'scrollTop', + has = false; + + if (el[scroll] > 0) { return true; } + + // TODO: determine which cases actually cause this to happen + // if the element doesn't have the scroll set, see if it's possible to + // set the scroll + el[scroll] = 1; + has = (el[scroll] > 0); + el[scroll] = 0; + return has; + }, + + isOverAxis: function(x, reference, size) { + //Determines when x coordinate is over "b" element axis + return (x > reference) && (x < (reference + size)); + }, + + isOver: function(y, x, top, left, height, width) { + //Determines when x, y coordinates is over "b" element + return $.ui.isOverAxis(y, top, height) && $.ui.isOverAxis(x, left, width); + }, + + keyCode: { + BACKSPACE: 8, + CAPS_LOCK: 20, + COMMA: 188, + CONTROL: 17, + DELETE: 46, + DOWN: 40, + END: 35, + ENTER: 13, + ESCAPE: 27, + HOME: 36, + INSERT: 45, + LEFT: 37, + NUMPAD_ADD: 107, + NUMPAD_DECIMAL: 110, + NUMPAD_DIVIDE: 111, + NUMPAD_ENTER: 108, + NUMPAD_MULTIPLY: 106, + NUMPAD_SUBTRACT: 109, + PAGE_DOWN: 34, + PAGE_UP: 33, + PERIOD: 190, + RIGHT: 39, + SHIFT: 16, + SPACE: 32, + TAB: 9, + UP: 38 + } +}; + +// WAI-ARIA normalization +if (isFF2) { + var attr = $.attr, + removeAttr = $.fn.removeAttr, + ariaNS = "http://www.w3.org/2005/07/aaa", + ariaState = /^aria-/, + ariaRole = /^wairole:/; + + $.attr = function(elem, name, value) { + var set = value !== undefined; + + return (name == 'role' + ? (set + ? attr.call(this, elem, name, "wairole:" + value) + : (attr.apply(this, arguments) || "").replace(ariaRole, "")) + : (ariaState.test(name) + ? (set + ? elem.setAttributeNS(ariaNS, + name.replace(ariaState, "aaa:"), value) + : attr.call(this, elem, name.replace(ariaState, "aaa:"))) + : attr.apply(this, arguments))); + }; + + $.fn.removeAttr = function(name) { + return (ariaState.test(name) + ? this.each(function() { + this.removeAttributeNS(ariaNS, name.replace(ariaState, "")); + }) : removeAttr.call(this, name)); + }; +} + +//jQuery plugins +$.fn.extend({ + remove: function() { + // Safari has a native remove event which actually removes DOM elements, + // so we have to use triggerHandler instead of trigger (#3037). + $("*", this).add(this).each(function() { + $(this).triggerHandler("remove"); + }); + return _remove.apply(this, arguments ); + }, + + enableSelection: function() { + return this + .attr('unselectable', 'off') + .css('MozUserSelect', '') + .unbind('selectstart.ui'); + }, + + disableSelection: function() { + return this + .attr('unselectable', 'on') + .css('MozUserSelect', 'none') + .bind('selectstart.ui', function() { return false; }); + }, + + scrollParent: function() { + var scrollParent; + if(($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) { + scrollParent = this.parents().filter(function() { + return (/(relative|absolute|fixed)/).test($.curCSS(this,'position',1)) && (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1)); + }).eq(0); + } else { + scrollParent = this.parents().filter(function() { + return (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1)); + }).eq(0); + } + + return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent; + } +}); + + +//Additional selectors +$.extend($.expr[':'], { + data: function(elem, i, match) { + return !!$.data(elem, match[3]); + }, + + focusable: function(element) { + var nodeName = element.nodeName.toLowerCase(), + tabIndex = $.attr(element, 'tabindex'); + return (/input|select|textarea|button|object/.test(nodeName) + ? !element.disabled + : 'a' == nodeName || 'area' == nodeName + ? element.href || !isNaN(tabIndex) + : !isNaN(tabIndex)) + // the element and all of its ancestors must be visible + // the browser may report that the area is hidden + && !$(element)['area' == nodeName ? 'parents' : 'closest'](':hidden').length; + }, + + tabbable: function(element) { + var tabIndex = $.attr(element, 'tabindex'); + return (isNaN(tabIndex) || tabIndex >= 0) && $(element).is(':focusable'); + } +}); + + +// $.widget is a factory to create jQuery plugins +// taking some boilerplate code out of the plugin code +function getter(namespace, plugin, method, args) { + function getMethods(type) { + var methods = $[namespace][plugin][type] || []; + return (typeof methods == 'string' ? methods.split(/,?\s+/) : methods); + } + + var methods = getMethods('getter'); + if (args.length == 1 && typeof args[0] == 'string') { + methods = methods.concat(getMethods('getterSetter')); + } + return ($.inArray(method, methods) != -1); +} + +$.widget = function(name, prototype) { + var namespace = name.split(".")[0]; + name = name.split(".")[1]; + + // create plugin method + $.fn[name] = function(options) { + var isMethodCall = (typeof options == 'string'), + args = Array.prototype.slice.call(arguments, 1); + + // prevent calls to internal methods + if (isMethodCall && options.substring(0, 1) == '_') { + return this; + } + + // handle getter methods + if (isMethodCall && getter(namespace, name, options, args)) { + var instance = $.data(this[0], name); + return (instance ? instance[options].apply(instance, args) + : undefined); + } + + // handle initialization and non-getter methods + return this.each(function() { + var instance = $.data(this, name); + + // constructor + (!instance && !isMethodCall && + $.data(this, name, new $[namespace][name](this, options))._init()); + + // method call + (instance && isMethodCall && $.isFunction(instance[options]) && + instance[options].apply(instance, args)); + }); + }; + + // create widget constructor + $[namespace] = $[namespace] || {}; + $[namespace][name] = function(element, options) { + var self = this; + + this.namespace = namespace; + this.widgetName = name; + this.widgetEventPrefix = $[namespace][name].eventPrefix || name; + this.widgetBaseClass = namespace + '-' + name; + + this.options = $.extend({}, + $.widget.defaults, + $[namespace][name].defaults, + $.metadata && $.metadata.get(element)[name], + options); + + this.element = $(element) + .bind('setData.' + name, function(event, key, value) { + if (event.target == element) { + return self._setData(key, value); + } + }) + .bind('getData.' + name, function(event, key) { + if (event.target == element) { + return self._getData(key); + } + }) + .bind('remove', function() { + return self.destroy(); + }); + }; + + // add widget prototype + $[namespace][name].prototype = $.extend({}, $.widget.prototype, prototype); + + // TODO: merge getter and getterSetter properties from widget prototype + // and plugin prototype + $[namespace][name].getterSetter = 'option'; +}; + +$.widget.prototype = { + _init: function() {}, + destroy: function() { + this.element.removeData(this.widgetName) + .removeClass(this.widgetBaseClass + '-disabled' + ' ' + this.namespace + '-state-disabled') + .removeAttr('aria-disabled'); + }, + + option: function(key, value) { + var options = key, + self = this; + + if (typeof key == "string") { + if (value === undefined) { + return this._getData(key); + } + options = {}; + options[key] = value; + } + + $.each(options, function(key, value) { + self._setData(key, value); + }); + }, + _getData: function(key) { + return this.options[key]; + }, + _setData: function(key, value) { + this.options[key] = value; + + if (key == 'disabled') { + this.element + [value ? 'addClass' : 'removeClass']( + this.widgetBaseClass + '-disabled' + ' ' + + this.namespace + '-state-disabled') + .attr("aria-disabled", value); + } + }, + + enable: function() { + this._setData('disabled', false); + }, + disable: function() { + this._setData('disabled', true); + }, + + _trigger: function(type, event, data) { + var callback = this.options[type], + eventName = (type == this.widgetEventPrefix + ? type : this.widgetEventPrefix + type); + + event = $.Event(event); + event.type = eventName; + + // copy original event properties over to the new event + // this would happen if we could call $.event.fix instead of $.Event + // but we don't have a way to force an event to be fixed multiple times + if (event.originalEvent) { + for (var i = $.event.props.length, prop; i;) { + prop = $.event.props[--i]; + event[prop] = event.originalEvent[prop]; + } + } + + this.element.trigger(event, data); + + return !($.isFunction(callback) && callback.call(this.element[0], event, data) === false + || event.isDefaultPrevented()); + } +}; + +$.widget.defaults = { + disabled: false +}; + + +/** Mouse Interaction Plugin **/ + +$.ui.mouse = { + _mouseInit: function() { + var self = this; + + this.element + .bind('mousedown.'+this.widgetName, function(event) { + return self._mouseDown(event); + }) + .bind('click.'+this.widgetName, function(event) { + if(self._preventClickEvent) { + self._preventClickEvent = false; + event.stopImmediatePropagation(); + return false; + } + }); + + // Prevent text selection in IE + if ($.browser.msie) { + this._mouseUnselectable = this.element.attr('unselectable'); + this.element.attr('unselectable', 'on'); + } + + this.started = false; + }, + + // TODO: make sure destroying one instance of mouse doesn't mess with + // other instances of mouse + _mouseDestroy: function() { + this.element.unbind('.'+this.widgetName); + + // Restore text selection in IE + ($.browser.msie + && this.element.attr('unselectable', this._mouseUnselectable)); + }, + + _mouseDown: function(event) { + // don't let more than one widget handle mouseStart + // TODO: figure out why we have to use originalEvent + event.originalEvent = event.originalEvent || {}; + if (event.originalEvent.mouseHandled) { return; } + + // we may have missed mouseup (out of window) + (this._mouseStarted && this._mouseUp(event)); + + this._mouseDownEvent = event; + + var self = this, + btnIsLeft = (event.which == 1), + elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).parents().add(event.target).filter(this.options.cancel).length : false); + if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) { + return true; + } + + this.mouseDelayMet = !this.options.delay; + if (!this.mouseDelayMet) { + this._mouseDelayTimer = setTimeout(function() { + self.mouseDelayMet = true; + }, this.options.delay); + } + + if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) { + this._mouseStarted = (this._mouseStart(event) !== false); + if (!this._mouseStarted) { + event.preventDefault(); + return true; + } + } + + // these delegates are required to keep context + this._mouseMoveDelegate = function(event) { + return self._mouseMove(event); + }; + this._mouseUpDelegate = function(event) { + return self._mouseUp(event); + }; + $(document) + .bind('mousemove.'+this.widgetName, this._mouseMoveDelegate) + .bind('mouseup.'+this.widgetName, this._mouseUpDelegate); + + // preventDefault() is used to prevent the selection of text here - + // however, in Safari, this causes select boxes not to be selectable + // anymore, so this fix is needed + ($.browser.safari || event.preventDefault()); + + event.originalEvent.mouseHandled = true; + return true; + }, + + _mouseMove: function(event) { + // IE mouseup check - mouseup happened when mouse was out of window + if ($.browser.msie && !event.button) { + return this._mouseUp(event); + } + + if (this._mouseStarted) { + this._mouseDrag(event); + return event.preventDefault(); + } + + if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) { + this._mouseStarted = + (this._mouseStart(this._mouseDownEvent, event) !== false); + (this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event)); + } + + return !this._mouseStarted; + }, + + _mouseUp: function(event) { + $(document) + .unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate) + .unbind('mouseup.'+this.widgetName, this._mouseUpDelegate); + + if (this._mouseStarted) { + this._mouseStarted = false; + this._preventClickEvent = (event.target == this._mouseDownEvent.target); + this._mouseStop(event); + } + + return false; + }, + + _mouseDistanceMet: function(event) { + return (Math.max( + Math.abs(this._mouseDownEvent.pageX - event.pageX), + Math.abs(this._mouseDownEvent.pageY - event.pageY) + ) >= this.options.distance + ); + }, + + _mouseDelayMet: function(event) { + return this.mouseDelayMet; + }, + + // These are placeholder methods, to be overriden by extending plugin + _mouseStart: function(event) {}, + _mouseDrag: function(event) {}, + _mouseStop: function(event) {}, + _mouseCapture: function(event) { return true; } +}; + +$.ui.mouse.defaults = { + cancel: null, + distance: 1, + delay: 0 +}; + +})(jQuery); Modified: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js =================================================================== --- branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2009-07-07 17:19:37 UTC (rev 14815) +++ branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2009-07-07 17:31:52 UTC (rev 14816) @@ -123,38 +123,38 @@ Richfaces.evalMacro = function(template, object) { - var value=""; + var _value_=""; // variable evaluation if (Richfaces.VARIABLE_NAME_PATTERN.test(template)) { if (template.indexOf('.')==-1) { - value = object[template]; - if (!value) value=window[template]; + _value_ = object[template]; + if (!_value_) _value_=window[template]; } // object's variable evaluation else { - value = Richfaces.getObjectValue(template, object); - if (!value) value=Richfaces.getObjectValue(template, window); + _value_ = Richfaces.getObjectValue(template, object); + if (!_value_) _value_=Richfaces.getObjectValue(template, window); } - if (value && typeof value=='function') value = value(object); - if (!value) value=""; + if (_value_ && typeof _value_=='function') _value_ = _value_(object); + if (!_value_) _value_=""; } //js string evaluation else { try { if (Richfaces.browser.isObjectEval) { - value = object.eval(template); + _value_ = object.eval(template); } else with (object) { - value = eval(template) ; + _value_ = eval(template) ; } - if (typeof value == 'function') { - value = value(object); + if (typeof _value_ == 'function') { + _value_ = _value_(object); } } catch (e) { LOG.warn("Exception: "+e.Message + "\n[" + template + "]"); } } - return value; + return _value_; } Richfaces.evalSimpleMacro = function(template, object) { @@ -181,6 +181,7 @@ isSafari: /Safari/.test(navigator.userAgent), isOpera: !!window.opera, isObjectEval: (Richfaces.eval!=undefined), + isFF2: (!window.opera && /Firefox\s*[\/]2[\.]/.test(navigator.userAgent)), isFF3: (!window.opera && /Firefox\s*[\/]3[\.]/.test(navigator.userAgent)) }; @@ -442,4 +443,77 @@ element.removeAttributeNode(node); } } -}; \ No newline at end of file +}; + +Richfaces.mergeObjects = function() { + var target = arguments[0]; + if (target) { + for (var i = 1; i < arguments.length; i++) { + var source = arguments[i]; + if (source) { + for (var name in source) { + if (!target[name]) { + target[name] = source[name]; + } + } + } + } + } +}; + +Richfaces.invokeEvent = function(eventFunc, element, eventName, memo) { + var result; + if (eventFunc) { + element = $(element); + if (element == document && document.createEvent && !element.dispatchEvent) + element = document.documentElement; + + var event; + if (document.createEvent) { + event = document.createEvent("HTMLEvents"); + event.initEvent("dataavailable", true, true); + } else { + event = document.createEventObject(); + event.eventType = "ondataavailable"; + } + + event.eventName = eventName; + event.rich = {component:this}; + event.memo = memo || { }; + try { + result = eventFunc.call(element,event); + } + catch (e) { LOG.warn("Exception: "+e.Message + "\n[on"+eventName + "]"); } + } + if (result!=false) result = true; + return result; +}; + +Richfaces.setupScrollEventHandlers = function(element, handler) { + + var elements = [] + + element = element.parentNode; + while (element && element!=window.document.body) + { + if (element.offsetWidth!=element.scrollWidth || element.offsetHeight!=element.scrollHeight) + { + elements.push(element); + Event.observe(element, "scroll", handler, false); + } + element = element.parentNode; + } + + return elements; +}; + +Richfaces.removeScrollEventHandlers = function(elements, handler) { + if (elements) + { + for (var i=0;i<elements.length;i++) + { + Event.stopObserving(elements[i], "scroll", handler, false); + } + elements = null; + } +}; Added: branches/jsf2.0/framework/impl/src/main/resources/org/richfaces/resource/TestResource2.resource-marker ===================================================================