Author: konstantin.mishin Date: 2011-02-09 12:56:14 -0500 (Wed, 09 Feb 2011) New Revision: 21576 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/extendedDataTable.js Log: RF-10404 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-09 17:55:54 UTC (rev 21575) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.js 2011-02-09 17:56:14 UTC (rev 21576) @@ -47,10 +47,18 @@ invoke.call(this,null,createParameters.call(this,richfaces.ui.DataTable.SORTING, columnId, direction, isClear)); }, + clearSorting: function() { + this.sort("", "", true); + }, + filter: function(columnId, filterValue, isClear) { invoke.call(this,null,createParameters.call(this,richfaces.ui.DataTable.FILTERING, columnId, filterValue, isClear)); }, + clearFiltering: function() { + this.filter("", "", true); + }, + expandAllSubTables: function() { this.invokeOnSubTables('expand'); }, Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2011-02-09 17:55:54 UTC (rev 21575) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2011-02-09 17:56:14 UTC (rev 21576) @@ -227,7 +227,7 @@ filterValue = ""; } var map = {}; - map[id + "rich:filtering"] = colunmId + ":" + filterValue + ":" + isClear; + map[this.id + "rich:filtering"] = colunmId + ":" + filterValue + ":" + isClear; this.ajaxFunction(null, map); // TODO Maybe, event model should be used here. }, @@ -237,7 +237,7 @@ sort: function(colunmId, sortOrder, isClear) { if (typeof(sortOrder) == "string") { - sortOrder = sortOrder.toUpperCase(); + sortOrder = sortOrder.toLowerCase(); } var map = {} map[this.id + "rich:sorting"] = colunmId + ":" + sortOrder + ":" + isClear;