Author: alexsmirnov
Date: 2010-10-07 16:17:49 -0400 (Thu, 07 Oct 2010)
New Revision: 19496
Modified:
branches/RF-8742/
branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces-event.js
branches/RF-8742/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js
Log:
Merged revisions 19491 via svnmerge from
https://svn.jboss.org/repos/richfaces/trunk
.......
r19491 | pyaschenko | 2010-10-07 09:20:20 -0700 (Thu, 07 Oct 2010) | 1 line
https://jira.jboss.org/browse/RF-9439
.......
Property changes on: branches/RF-8742
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-19481
+ /trunk:1-19495
Modified:
branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces-event.js
===================================================================
---
branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-10-07
17:43:46 UTC (rev 19495)
+++
branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces-event.js 2010-10-07
20:17:49 UTC (rev 19496)
@@ -184,6 +184,25 @@
return $(document.getElementById(id)).unbind(eventType, fn);
},
+ // TODO add jsdocs and qunits
+ bindScrollEventHandlers: function(element, handler, component) {
+ var elements = [];
+ element = richfaces.getDomElement(element).parentNode;
+ while (element && element!=window.document.body)
+ {
+ if (element.offsetWidth!=element.scrollWidth ||
element.offsetHeight!=element.scrollHeight)
+ {
+ elements.push(element);
+ richfaces.Event.bind(element, "scroll"+component.getNamespace(), handler,
component);
+ }
+ element = element.parentNode;
+ }
+ return elements;
+ },
+ unbindScrollEventHandlers: function(elements, component) {
+ richfaces.Event.unbind(elements, "scroll"+component.getNamespace());
+ },
+
/**
* Execute all handlers and behaviors attached to the matched elements for the given
event type.
* @function
Modified:
branches/RF-8742/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js
===================================================================
---
branches/RF-8742/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js 2010-10-07
17:43:46 UTC (rev 19495)
+++
branches/RF-8742/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js 2010-10-07
20:17:49 UTC (rev 19496)
@@ -1,24 +1,3 @@
-// TODO: move this extend to RichFaces.Event for exapmle
-$.extend(RichFaces.Event, {
- bindScrollEventHandlers: function(element, handler, component) {
- var elements = [];
- element = RichFaces.getDomElement(element).parentNode;
- while (element && element!=window.document.body)
- {
- if (element.offsetWidth!=element.scrollWidth ||
element.offsetHeight!=element.scrollHeight)
- {
- elements.push(element);
- RichFaces.Event.bind(element, "scroll"+component.getNamespace(), handler,
component);
- }
- element = element.parentNode;
- }
- return elements;
- },
- unbindScrollEventHandlers: function(elements, component) {
- RichFaces.Event.unbind(elements, "scroll"+component.getNamespace());
- }
-});
-
(function (rf) {
rf.KEYS = {
BACKSPACE: 8,
@@ -31,8 +10,8 @@
UP: 38,
RIGHT: 39,
DOWN: 40,
- DEL: 46,
- }
+ DEL: 46
+ };
})(RichFaces);
(function ($, rf) {
@@ -205,7 +184,7 @@
}
break;
}
- }
+ };
/*
* public API functions definition