[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/03/11 16:08:25

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonMessages.ml 

Log message:
        patch #5786

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1199&r2=1.1200
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonMessages.ml?cvsroot=mldonkey&r1=1.63&r2=1.64

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1199
retrieving revision 1.1200
diff -u -b -r1.1199 -r1.1200
--- distrib/ChangeLog   8 Mar 2007 21:01:02 -0000       1.1199
+++ distrib/ChangeLog   11 Mar 2007 16:08:25 -0000      1.1200
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2007/03/11
+5786: HTML: small javascript search improve (orbit)
+
 2007/03/08
 5787: HTML/Geoip: Show country flags
 - new option html_flags to disable display of flags 

Index: src/daemon/common/commonMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonMessages.ml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- src/daemon/common/commonMessages.ml 6 Mar 2007 19:31:26 -0000       1.63
+++ src/daemon/common/commonMessages.ml 11 Mar 2007 16:08:25 -0000      1.64
@@ -449,16 +449,15 @@
        for(var i=1;i<_nRows;i++){
                var _raw = rw.item(i).cells.item(obj.cellIndex).innerHTML;
                if (st==1) {
-                       _raw = _raw.replace((new RegExp('\\\\\\(','gi')), '');
+            var _regexp = /[TGMk]$/;
+            _raw = _raw.replace(/\\(/gi, \"\");          
                   if (_raw.indexOf(\":\") != -1) { _raw = 
_raw.substring(2,99); }
-                if (_raw.search(new RegExp(\"[TGMk]\",\"i\"))) {
-                 if (_raw.indexOf(\"T\") != -1) { _raw = parseFloat(_raw) * 
1024 * 1024 * 1024 * 1024; }
-                 else {
-                       if (_raw.indexOf(\"G\") != -1) { _raw = 
parseFloat(_raw) * 1024 * 1024 * 1024; }
-                       else {
-                                if (_raw.indexOf(\"M\") != -1) { _raw = 
parseFloat(_raw) * 1024 * 1024; }
-                                else {
-                                       if (_raw.indexOf(\"k\") != -1) { _raw = 
parseFloat(_raw) * 1024; }
+            if (_regexp.test(_raw)) {
+              switch (_raw.charAt(_raw.search(_regexp))) {
+               case \"k\": _raw = parseFloat(_raw) * 1024; break;
+               case \"M\": _raw = parseFloat(_raw) * 1024 * 1024; break;
+               case \"G\": _raw = parseFloat(_raw) * 1024 * 1024 * 1024; break;
+               case \"T\": _raw = parseFloat(_raw) * 1024 * 1024 * 1024 * 
1024; break;
                                 }
                        }
              }