Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge MAPREDUCE-3045 from trunk. Contributed by Jonathan Eagles 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1207717 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Siddharth Seth 2011-11-29 00:14:54 +00:00
parent 47ada57878
commit 441f6a3b05
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -61,6 +61,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3413. RM web ui applications not sorted in any order by default. MAPREDUCE-3413. RM web ui applications not sorted in any order by default.
(Jonathan Eagles via mahadev) (Jonathan Eagles via mahadev)
MAPREDUCE-3045. Fixed UI filters to not filter on hidden title-numeric
sort fields. (Jonathan Eagles via sseth)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

5
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
View File

@ -2,6 +2,11 @@ if (!jQuery.fn.dataTableExt.fnVersionCheck("1.7.5")) {
alert("These plugins requires dataTables 1.7.5+"); alert("These plugins requires dataTables 1.7.5+");
} }
// don't filter on hidden html elements for an sType of title-numeric
$.fn.dataTableExt.ofnSearch['title-numeric'] = function ( sData ) {
return sData.replace(/\n/g," ").replace( /<.*?>/g, "" );
}
// 'title-numeric' sort type // 'title-numeric' sort type
jQuery.fn.dataTableExt.oSort['title-numeric-asc'] = function(a,b) { jQuery.fn.dataTableExt.oSort['title-numeric-asc'] = function(a,b) {
var x = a.match(/title=["']?(-?\d+\.?\d*)/)[1]; var x = a.match(/title=["']?(-?\d+\.?\d*)/)[1];