JBoss Rich Faces SVN: r5006 - in trunk/ui/modal-panel/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-26 08:53:48 -0500 (Wed, 26 Dec 2007)
New Revision: 5006
Modified:
trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java
trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1654
Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java
===================================================================
--- trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-12-26 06:03:57 UTC (rev 5005)
+++ trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-12-26 13:53:48 UTC (rev 5006)
@@ -160,4 +160,27 @@
public void writeEventHandlerFunction(FacesContext context, UIComponent component, String eventName) throws IOException{
RendererUtils.writeEventHandlerFunction(context, component, eventName);
}
+
+ public String getContentStyle(FacesContext context, UIModalPanel panel) {
+ StringBuffer result = new StringBuffer();
+
+ result.append("overflow: hidden; ");
+
+ String style = (String)panel.getAttributes().get("style");
+ if (null != style && !"".equals(style)) {
+ result.append(style).
+ append(" ");
+
+ }
+ int minHeight = panel.getMinHeight();
+ int minWidth = panel.getMinWidth();
+ if (minWidth > -1) {
+ result.append("min-width: " + minWidth + "; ");
+ }
+ if (minHeight > -1) {
+ result.append("min-height: " + minHeight + "; ");
+ }
+
+ return result.toString();
+ }
}
Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-12-26 06:03:57 UTC (rev 5005)
+++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-12-26 13:53:48 UTC (rev 5006)
@@ -73,7 +73,7 @@
style="#{component.shadowStyle}" >
</div>
<table id="#{clientId}ContentTable" cellpadding="0" cellspacing="0" border="0" style="position: absolute; z-index: 2;"><tbody><tr><td class="dr-mpnl-pnl">
- <div id="#{clientId}ContentDiv" style="overflow: hidden; #{component.attributes['style']}" class="rich-mp-content">
+ <div id="#{clientId}ContentDiv" style="#{this:getContentStyle(context, component)}" class="rich-mp-content">
<a href="#" class="dr-mpnl-pnl-a" id="#{clientId}FirstHref" >_</a>
<table style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0">
18 years, 4 months
JBoss Rich Faces SVN: r5005 - in management/design/comboBox/markup: images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2007-12-26 01:03:57 -0500 (Wed, 26 Dec 2007)
New Revision: 5005
Added:
management/design/comboBox/markup/comboBox.html
management/design/comboBox/markup/images/
management/design/comboBox/markup/images/bg_btn.png
management/design/comboBox/markup/images/bg_press.png
management/design/comboBox/markup/images/down.gif
Log:
Added: management/design/comboBox/markup/comboBox.html
===================================================================
--- management/design/comboBox/markup/comboBox.html (rev 0)
+++ management/design/comboBox/markup/comboBox.html 2007-12-26 06:03:57 UTC (rev 5005)
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+ <title>Untitled</title>
+<style>
+.cb_width{ width : 150px; }
+.cb_font{ font-size : 11px/*generalSizeFont*/; font-family : arial/*generalFamilyFont*/; color : #000000/*generalTextColor*/}
+.cb_shell{ position : relative;}
+.cb_field{ position : absolute; top : 0px; left : 0;padding :1px 20px 1px 2px; margin : 0px; border : 1px solid #c0c0c0;} /*panelBorderColor*/
+.cb_strut{ position : relative; visibility : hidden; margin : 0px; padding : 1px;}
+.cb_button{ position : absolute; top : 0px; right : 0; width : 18px; padding : 1px; margin : 0px; border : 1px solid #c0c0c0; } /*panelBorderColor*/
+.cb_button_bg{ background : url(images/bg_btn.png) top repeat-x #C7D7EC;} /*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/
+.cb_button_bg_press{ background : url(images/bg_press.png) repeat-x bottom #C7D7EC} /*gradient - from tabBackgroundColor to generalBackgroundColor, background-color - tabBackgroundColor*/
+.cb_button_arrow{ background : url(images/down.gif) center no-repeat; cursor : pointer;}
+
+.cb_list_cord{ position : relative; font-size : 0px; display:none;}/*DDL is hidden!!!!!*/
+.cb_list_position{ position : absolute; top:-5px; left:0px;}
+.cb_list_decoration{ border : 1px solid #c0c0c0 /*panelBorderColor*/; padding : 0px; background : #FFFFFF; /*tableBackgroundColor*/}
+.cb_list_scroll{ overflow : auto; width : 100%; height : 100;}
+.cb_option{ padding : 2px; white-space : nowrap;}
+.cb_select{ padding : 1px; background : #C7D7EC; border : 1px dotted #000000;/*generalTextColor*/}
+</style>
+</head>
+
+<body style="margin : 30px">
+
+
+
+<div class="cb_width cb_font cb_shell">
+ <input type="Text" value="Input text or select option" class="cb_width cb_font cb_field">
+ <input readonly="" type="Text" value="" class="cb_button cb_font cb_button_bg">
+ <input readonly="" type="Text" value="" class="cb_button cb_font cb_button_arrow">
+ <input type="Text"class="cb_width cb_strut cb_font"><div class="cb_list_cord">
+ <div class="cb_list_position cb_width">
+ <div class="cb_list_decoration">
+ <div class="cb_list_scroll">
+ <div class="cb_option cb_font">Option 1</div>
+ <div class="cb_option cb_font">Option 2</div>
+ <div class="cb_option cb_font">Option 3</div>
+ <div class="cb_option cb_font">Option 4</div>
+ <div class="cb_option cb_font cb_select">Opt</div>
+ <div class="cb_option cb_font">Option 6</div>
+ <div class="cb_option cb_font">Option 7</div>
+ <div class="cb_option cb_font">Option 8</div>
+ <div class="cb_option cb_font">Option 9</div>
+ <div class="cb_option cb_font">Option 0</div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+</body>
+</html>
Added: management/design/comboBox/markup/images/bg_btn.png
===================================================================
(Binary files differ)
Property changes on: management/design/comboBox/markup/images/bg_btn.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/comboBox/markup/images/bg_press.png
===================================================================
(Binary files differ)
Property changes on: management/design/comboBox/markup/images/bg_press.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/comboBox/markup/images/down.gif
===================================================================
(Binary files differ)
Property changes on: management/design/comboBox/markup/images/down.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 4 months
JBoss Rich Faces SVN: r5004 - management/design/comboBox/markup.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2007-12-25 08:56:14 -0500 (Tue, 25 Dec 2007)
New Revision: 5004
Removed:
management/design/comboBox/markup/test.txt
Log:
Deleted: management/design/comboBox/markup/test.txt
===================================================================
--- management/design/comboBox/markup/test.txt 2007-12-25 13:55:33 UTC (rev 5003)
+++ management/design/comboBox/markup/test.txt 2007-12-25 13:56:14 UTC (rev 5004)
@@ -1 +0,0 @@
-Test
18 years, 4 months
JBoss Rich Faces SVN: r5003 - in management/design/comboBox: markup and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2007-12-25 08:55:33 -0500 (Tue, 25 Dec 2007)
New Revision: 5003
Added:
management/design/comboBox/markup/
management/design/comboBox/markup/test.txt
Log:
Added: management/design/comboBox/markup/test.txt
===================================================================
--- management/design/comboBox/markup/test.txt (rev 0)
+++ management/design/comboBox/markup/test.txt 2007-12-25 13:55:33 UTC (rev 5003)
@@ -0,0 +1 @@
+Test
18 years, 4 months
JBoss Rich Faces SVN: r5002 - in trunk/framework/impl/src/main/javascript: prototype and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-24 16:57:17 -0500 (Mon, 24 Dec 2007)
New Revision: 5002
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
trunk/framework/impl/src/main/javascript/prototype/patches.js
trunk/framework/impl/src/main/javascript/prototype/prototype1.6.0.js
Log:
http://jira.jboss.com/jira/browse/RF-1567
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-12-24 21:32:45 UTC (rev 5001)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-12-24 21:57:17 UTC (rev 5002)
@@ -347,6 +347,12 @@
if( ! newnode ) { LOG.error("New node for ID "+id+" is not present in response");return;}
var oldnode = window.document.getElementById(id);
if ( oldnode ) {
+
+ // Remove unload prototype events for a removed elements.
+ if ((typeof Event != "undefined") && (typeof Event.unloadElementsCache == "function")) {
+ Event.unloadElementsCache(oldnode);
+ }
+
var anchor = oldnode.parentNode;
if(!window.opera && oldnode.outerHTML && !oldnode.tagName.match( /(tbody|thead|tfoot|tr|th|td)/i ) ){
LOG.debug("Replace content of node by outerHTML()");
@@ -366,11 +372,6 @@
anchor.replaceChild(importednode,oldnode);
}
- // Remove unload prototype events for a removed elements.
- if ((typeof Event != "undefined") && (typeof Event.unloadElementsCache == "function")) {
- Event.unloadElementsCache(oldnode);
- }
-
// re-execute all script fragments in imported subtree...
// TODO - opera 8 run scripts at replace content stage.
if(!A4J.AJAX._scriptEvaluated){
Modified: trunk/framework/impl/src/main/javascript/prototype/patches.js
===================================================================
--- trunk/framework/impl/src/main/javascript/prototype/patches.js 2007-12-24 21:32:45 UTC (rev 5001)
+++ trunk/framework/impl/src/main/javascript/prototype/patches.js 2007-12-24 21:57:17 UTC (rev 5002)
@@ -62,32 +62,47 @@
}
};
+//That's prototype version-dependent
+
+if (window.attachEvent) {
+ window.attachEvent("onunload", function() {
+ Event.unloadElementsCache(document);
+ Event.unloadElementsCache(window);
+ });
+}
+
Event.unloadElementsCache = function(oldNode) {
//refer to window.unload handling conditions in prototype script
if (!window.attachEvent) return;
if (!oldNode) return;
- if (oldNode) {
- if (oldNode._eventID) {
- var cache = Event.cache[oldNode._eventID];
+ var node = oldNode;
+ //node.all is quicker than recursive traversing
+ //window doesn't have "all" attribute
+ var all = node.all || {};
+ var counter = 0;
+
+ do {
+ var eventID = node._eventID;
+ if (eventID) {
+ var cache = Event.cache[eventID];
for (var eventName in cache) {
+ var wrappers = cache[eventName];
+
+ wrappers.each(function(wrapper) {
+ node.detachEvent("on" + eventName, wrapper);
+ });
+
cache[eventName] = null;
}
- delete Event.cache[oldNode._eventID];
+ delete Event.cache[eventID];
}
+
+ node = all[counter++];
+ } while (node);
+};
- var firstNode = oldNode.firstChild;
- if (firstNode) {
- Event.unloadElementsCache(firstNode);
-
- var nextNode = firstNode.nextSibling;
- while (nextNode) {
- Event.unloadElementsCache(nextNode);
- nextNode = nextNode.nextSibling;
- }
- }
- }
-};
\ No newline at end of file
+//
Modified: trunk/framework/impl/src/main/javascript/prototype/prototype1.6.0.js
===================================================================
--- trunk/framework/impl/src/main/javascript/prototype/prototype1.6.0.js 2007-12-24 21:32:45 UTC (rev 5001)
+++ trunk/framework/impl/src/main/javascript/prototype/prototype1.6.0.js 2007-12-24 21:57:17 UTC (rev 5002)
@@ -3858,16 +3858,18 @@
c[eventName] = c[eventName].without(findWrapper(id, eventName, handler));
}
- function destroyCache() {
- for (var id in cache)
- for (var eventName in cache[id])
- cache[id][eventName] = null;
- }
+// Commented by Nick
+//
+// function destroyCache() {
+// for (var id in cache)
+// for (var eventName in cache[id])
+// cache[id][eventName] = null;
+// }
+//
+// if (window.attachEvent) {
+// window.attachEvent("onunload", destroyCache);
+// }
- if (window.attachEvent) {
- window.attachEvent("onunload", destroyCache);
- }
-
return {
observe: function(element, eventName, handler) {
element = $(element);
18 years, 4 months
JBoss Rich Faces SVN: r5000 - trunk/sandbox/ui/combobox/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-22 12:25:36 -0500 (Sat, 22 Dec 2007)
New Revision: 5000
Modified:
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
onclick on button = 'false'
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-22 17:05:08 UTC (rev 4999)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-22 17:25:36 UTC (rev 5000)
@@ -12,6 +12,8 @@
new org.ajax4jsf.javascript.PrototypeScript(),/org/richfaces/renderkit/html/scripts/combobox.js
</h:scripts>
+ <f:resource name="org.richfaces.renderkit.html.images.SpinnerButtonDown" var="down_arrow" />
+
<f:clientid var="clientId" />
<table cellpadding="0" cellspacing="0" id="#{clientId}">
@@ -21,7 +23,7 @@
<input type="text" id="#{clientId}_input"/>
</td>
<td style="padding: 0px 4px 0px 4px">
- <input type="image" src="down.gif" id="#{clientId}_button"/>
+ <input type="image" src="#{down_arrow}" id="#{clientId}_button" onclick="return false;"/>
</td>
</tr>
</tbody>
18 years, 4 months
JBoss Rich Faces SVN: r4999 - in trunk/sandbox/samples/combobox-sample/src/main: webapp/WEB-INF and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-22 12:05:08 -0500 (Sat, 22 Dec 2007)
New Revision: 4999
Modified:
trunk/sandbox/samples/combobox-sample/src/main/java/org/richfaces/samples/Bean.java
trunk/sandbox/samples/combobox-sample/src/main/webapp/WEB-INF/web.xml
trunk/sandbox/samples/combobox-sample/src/main/webapp/pages/index.jsp
Log:
Modified: trunk/sandbox/samples/combobox-sample/src/main/java/org/richfaces/samples/Bean.java
===================================================================
--- trunk/sandbox/samples/combobox-sample/src/main/java/org/richfaces/samples/Bean.java 2007-12-22 17:04:48 UTC (rev 4998)
+++ trunk/sandbox/samples/combobox-sample/src/main/java/org/richfaces/samples/Bean.java 2007-12-22 17:05:08 UTC (rev 4999)
@@ -20,10 +20,30 @@
*/
package org.richfaces.samples;
+
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author $Autor$
*
*/
public class Bean {
+ List suggestions = new ArrayList() ;
+
+ public Bean() {
+ for (int i = 0; i < 10; i++) {
+ suggestions.add("suggestion: " + i );
+ }
+ }
+
+ public List getSuggestions() {
+ return suggestions;
+ }
+
+ public void setSuggestions(List suggestions) {
+ this.suggestions = suggestions;
+ }
+
}
\ No newline at end of file
Modified: trunk/sandbox/samples/combobox-sample/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/sandbox/samples/combobox-sample/src/main/webapp/WEB-INF/web.xml 2007-12-22 17:04:48 UTC (rev 4998)
+++ trunk/sandbox/samples/combobox-sample/src/main/webapp/WEB-INF/web.xml 2007-12-22 17:05:08 UTC (rev 4999)
@@ -10,6 +10,10 @@
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
</context-param>
+ <context-param>
+ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
+ <param-value>false</param-value>
+</context-param>
<filter>
<display-name>Ajax4jsf Filter</display-name>
<filter-name>ajax4jsf</filter-name>
Modified: trunk/sandbox/samples/combobox-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/combobox-sample/src/main/webapp/pages/index.jsp 2007-12-22 17:04:48 UTC (rev 4998)
+++ trunk/sandbox/samples/combobox-sample/src/main/webapp/pages/index.jsp 2007-12-22 17:05:08 UTC (rev 4999)
@@ -8,7 +8,7 @@
<body>
<f:view>
<h:form>
- <cmb:comboBox>
+ <cmb:comboBox suggestionValues="#{bean.suggestions}">
</cmb:comboBox>
</h:form>
</f:view>
18 years, 4 months
JBoss Rich Faces SVN: r4998 - trunk/sandbox/ui/combobox/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-22 12:04:48 -0500 (Sat, 22 Dec 2007)
New Revision: 4998
Modified:
trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml
Log:
Modified: trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml 2007-12-22 17:04:28 UTC (rev 4997)
+++ trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml 2007-12-22 17:04:48 UTC (rev 4998)
@@ -27,5 +27,12 @@
org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
</superclass>
</tag>
+ <properties>
+ <property>
+ <name>suggestionValues</name>
+ <classname>java.util.List</classname>
+ </property>
+
+ </properties>
</component>
</components>
18 years, 4 months
JBoss Rich Faces SVN: r4997 - trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-22 12:04:28 -0500 (Sat, 22 Dec 2007)
New Revision: 4997
Modified:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java
Log:
add getters/setters suggestionValues
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java 2007-12-22 17:04:03 UTC (rev 4996)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java 2007-12-22 17:04:28 UTC (rev 4997)
@@ -3,6 +3,8 @@
*/
package org.richfaces.component;
+import java.util.List;
+
import javax.faces.component.UIInput;
/**
@@ -12,6 +14,7 @@
*/
public abstract class UIComboBox extends UIInput {
-
-
+ public abstract List <String> getSuggestionValues();
+ public abstract void setSuggestionValues( List value);
+
}
18 years, 4 months
JBoss Rich Faces SVN: r4996 - trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-22 12:04:03 -0500 (Sat, 22 Dec 2007)
New Revision: 4996
Modified:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
Log:
add script and items rendering
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2007-12-22 17:03:30 UTC (rev 4995)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2007-12-22 17:04:03 UTC (rev 4996)
@@ -2,6 +2,8 @@
import java.io.IOException;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import javax.faces.component.UIComponent;
@@ -22,34 +24,54 @@
private static final String INPUT = "_input";
private static final String BUTTON = "_button";
-
- protected Class getComponentClass() {
+
+ private static final String POPUP = "_popup";
+
+ protected Class<UIComboBox> getComponentClass() {
return UIComboBox.class;
}
-
- private String getScript(FacesContext context, UIComponent component){
+
+ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
+ UIComboBox comboBox = (UIComboBox)component;
+ String popupId = comboBox.getClientId(context) + POPUP;
+ writer.startElement(HTML.DIV_ELEM, comboBox);
+ writer.writeAttribute(HTML.id_ATTRIBUTE, popupId, null);
+ writer.writeAttribute(HTML.style_ATTRIBUTE, "display: none", null);
+
+ List <String> suggestionValues = comboBox.getSuggestionValues();
+ if (suggestionValues != null) {
+ for (Iterator <String> iterator = suggestionValues.iterator(); iterator.hasNext();) {
+ String suggestion = iterator .next();
+ encodeSuggestion(writer, comboBox, suggestion);
+ }
+ }
+
+ writer.endElement(HTML.DIV_ELEM);
+ writer.startElement(HTML.SCRIPT_ELEM, component);
+ writer.writeText(encodeScript(context, component,popupId), "script");
+ writer.endElement(HTML.SCRIPT_ELEM);
+
+ }
+
+ protected void encodeSuggestion(ResponseWriter writer, UIComboBox comboBox, String value) throws IOException{
+ writer.startElement(HTML.DIV_ELEM, comboBox);
+ writer.write(value);
+ writer.endElement(HTML.DIV_ELEM);
+ }
+
+ private String encodeScript(FacesContext context, UIComponent component, String popupId){
UIComboBox comboBox = (UIComboBox) component;
- JSFunction function = new JSFunction("new Richfaces.Combobox");
+
+ JSFunction function = new JSFunction("new Richfaces.ComboBox");
String clientId = comboBox.getClientId(context);
function.addParameter(clientId);
- Map options = new HashMap();
+
+ Map<String, String> options = new HashMap<String, String>();
options.put("input", clientId + INPUT);
- options.put("button", BUTTON);
+ options.put("button", clientId + BUTTON);
+ options.put("popup", clientId + POPUP);
function.addParameter(options);
- return function.toString() ;
+
+ return (function.toString() + ";");
}
-
- protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
- super.doEncodeEnd(writer, context, component);
- writer.startElement(HTML.SCRIPT_ELEM, component);
- writer.writeText(getScript(context, component), "script");
- writer.endElement(HTML.SCRIPT_ELEM);
-
- }
-
- protected void doEncodeChildren(ResponseWriter writer,
- FacesContext context, UIComponent component) throws IOException {
- // TODO Auto-generated method stub
- super.doEncodeChildren(writer, context, component);
- }
}
18 years, 4 months