[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
Date: |
Sun, 23 May 2010 09:05:07 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 10/05/23 09:05:07
Modified files:
distrib : ChangeLog
src/daemon/common: commonMessages.ml
Log message:
patch #7181
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1430&r2=1.1431
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonMessages.ml?cvsroot=mldonkey&r1=1.71&r2=1.72
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1430
retrieving revision 1.1431
diff -u -b -r1.1430 -r1.1431
--- distrib/ChangeLog 23 May 2010 09:03:29 -0000 1.1430
+++ distrib/ChangeLog 23 May 2010 09:05:06 -0000 1.1431
@@ -14,6 +14,7 @@
ChangeLog
=========
+7181: HTML: Fix sorting of friends' file list (ygrek)
7200: Allow compilation with upcoming Ocaml 3.12
-------------------------------------------------------------------------------
2010/04/25: version 3.0.2 = tag release-3-0-2
Index: src/daemon/common/commonMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonMessages.ml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- src/daemon/common/commonMessages.ml 3 Feb 2008 23:13:20 -0000 1.71
+++ src/daemon/common/commonMessages.ml 23 May 2010 09:05:07 -0000 1.72
@@ -449,6 +449,17 @@
this.s = s;
this.ar = ar;
}
+// http://slayeroffice.com/code/functions/so_getText.html
+function so_getText(obj) {
+ if(obj.textContent) return obj.textContent;
+ if (obj.nodeType == 3) return obj.data;
+ var txt = new Array(), i=0;
+ while(obj.childNodes[i]) {
+ txt[txt.length] = so_getText(obj.childNodes[i]);
+ i++;
+ }
+ return txt.join(\"\");
+}
function _tabCreateArray(obj,st,total){
var tb=obj.parentNode.parentNode;
var rw=obj.parentNode.parentNode.rows;
@@ -456,7 +467,7 @@
var _tabS=new Array(_nRows-1);
var _nCells = rw.item(0).cells.length;
for(var i=1;i<_nRows;i++){
- var _raw = rw.item(i).cells.item(obj.cellIndex).innerHTML;
+ var _raw = so_getText(rw.item(i).cells.item(obj.cellIndex));
//.innerHTML;
if (st==1) {
var _regexp = /[TGMk]$/;
_raw = _raw.replace(/\\(/gi, \"\");
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=