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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/05 14:11:29

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

Log message:
        patch #5513

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1076&r2=1.1077
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonMessages.ml?cvsroot=mldonkey&r1=1.59&r2=1.60

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1076
retrieving revision 1.1077
diff -u -b -r1.1076 -r1.1077
--- distrib/ChangeLog   5 Nov 2006 14:09:38 -0000       1.1076
+++ distrib/ChangeLog   5 Nov 2006 14:11:28 -0000       1.1077
@@ -15,6 +15,8 @@
 =========
 
 2006/11/05
+5513: HTML: Let webinterface work in a HTML frame (ported from Knockers Mulus)
+- third button row does not work yet, patches welcome
 5521: BT: Fix non-working EDK upload when BT is enabled,
       introduced by patch 5461
 

Index: src/daemon/common/commonMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonMessages.ml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- src/daemon/common/commonMessages.ml 25 Oct 2006 11:34:46 -0000      1.59
+++ src/daemon/common/commonMessages.ml 5 Nov 2006 14:11:29 -0000       1.60
@@ -412,23 +412,28 @@
  src.className=mOvrClass;
 }
 function mSub(target,cmd) {
- if (target != \"\") {
-       if (cmd==\"kill\") {
-               if (confirm(\"Are you sure?\")) {
-               top[target].location.href=\"submit?q=\" + cmd;
-           }
-       } else {
-        if (cmd.substring(0,6)==\"custom\") 
{top[target].location.href=\"submit?\" + cmd;}
-        else {top[target].location.href=\"submit?q=\" + cmd;
+if (target != '') {
+       if (cmd=='kill') {
+               if (confirm('Are you sure?')) {
+                       
parent.document.getElementsByName(target).item(0).src='submit?q=' + cmd;
      }
        }
- } else {
- location.href=\"submit?q=\" + cmd;
+       else {
+               if (cmd.substring(0,6)=='custom') {
+                       
parent.document.getElementsByName(target).item(0).src='submit?' + cmd;
+               }
+               else {
+                       
parent.document.getElementsByName(target).item(0).src='submit?q=' + cmd;
  }
+       }
+}
+else {
+       parent.document.getElementsByName(target).item(0).src='submit?q=' + cmd;
+}
 }
 function showTab(t){
-       for (i=1; i<=6; i++) document.getElementById(\"tab\" + i).style.display 
= \"none\";
-       document.getElementById(\"tab\" + t).style.display = \"block\";
+       for (i=1; i<=6; i++) document.getElementById('tab' + i).style.display = 
'none';
+       document.getElementById(\"tab\" + t).style.display = 'block';
 }
 var _tabLast=null;
 function _rObj (s,ar) {