Author: pyaschenko Date: 2011-02-03 13:21:46 -0500 (Thu, 03 Feb 2011) New Revision: 21427 Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable-toggler.js trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable.js trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.js Log: https://jira.jboss.org/browse/RF-10403 Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable-toggler.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable-toggler.js 2011-02-03 18:18:09 UTC (rev 21426) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable-toggler.js 2011-02-03 18:21:46 UTC (rev 21427) @@ -11,7 +11,7 @@ this.element = $(document.getElementById(this.id)); if(this.element && this.eventName) { - this.element.bind(this.eventName, $.proxy(this.toggle, this)); + this.element.bind(this.eventName, $.proxy(this.switchState , this)); } }; @@ -23,7 +23,7 @@ return { - toggle: function(e) { + switchState: function(e) { var subtable = richfaces.$(this.forId); if(subtable) { var mode = subtable.getMode(); @@ -33,7 +33,7 @@ } subtable.setOption(this.id); - subtable.toggle(e); + subtable.switchState(e); } }, Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable.js 2011-02-03 18:18:09 UTC (rev 21426) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable.js 2011-02-03 18:21:46 UTC (rev 21427) @@ -40,12 +40,12 @@ }; var ajax = function(e, options) { - this.switchState(); + this.__switchState(); richfaces.ajax(this.id, e, options); }; var server = function(options) { - this.switchState(); + this.__switchState(); $(document.getElementById(this.formId)).submit(); }; @@ -62,7 +62,7 @@ name: "CollapsibleSubTable", - toggle: function(e, options) { + switchState: function(e, options) { if(this.expandMode == richfaces.ui.CollapsibleSubTable.MODE_AJAX) { ajax.call(this, e, this.eventOptions, options); }else if(this.expandMode == richfaces.ui.CollapsibleSubTable.MODE_SRV) { @@ -86,7 +86,7 @@ return (parseInt(this.getState()) == richfaces.ui.CollapsibleSubTable.expand); }, - switchState: function(options) { + __switchState: function(options) { var state = this.isExpanded() ? richfaces.ui.CollapsibleSubTable.collapse : richfaces.ui.CollapsibleSubTable.expand; this.setState(state); }, Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.js 2011-02-03 18:18:09 UTC (rev 21426) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.js 2011-02-03 18:21:46 UTC (rev 21427) @@ -15,7 +15,7 @@ $.extend(richfaces.ui.DataTable, { SORTING: "rich:sorting", FILTERING: "rich:filtering", - SUBTABLE_SELECTOR:".rich-subtable" + SUBTABLE_SELECTOR:".rf-cst" }); $.extend(richfaces.ui.DataTable.prototype, ( function () { @@ -60,7 +60,7 @@ }, switchSubTable: function(id) { - this.getSubTable(id).toggle(); + this.getSubTable(id).switchState(); }, getSubTable: function(id) { @@ -72,9 +72,9 @@ var invokeOnComponent = this.invokeOnComponent; elements.each( function(){ - if(this.richfaces && this.richfaces.component) { - var component = this.richfaces.component; - if(component instanceof RichFaces.ui.SubTable) { + if(this.firstChild && this.firstChild[richfaces.RICH_CONTAINER] && this.firstChild[richfaces.RICH_CONTAINER].component) { + var component = this.firstChild[richfaces.RICH_CONTAINER].component; + if(component instanceof RichFaces.ui.CollapsibleSubTable) { invokeOnComponent(component, funcName); } }