--- loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js	2000/10/10 20:30:57	1.7
+++ loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js	2000/10/13 11:57:29	1.8
@@ -25,14 +25,16 @@ function addLink(name, link, address, po
 
 //-----------------------------------------------------Adds a folder to an object
 function addFolder(name, size, address) {
-       this.p = new Array(size);
+       this.p = new Array();                            //BEN got rid of size in Array Agument
+                                                        // Currently SIZE doesn't matter
+							// This probably works cross-platform
        this.lname = name;
        this.address = address;
        this.state = "opened";
        this.icon = "/res/adm/pages/bookmarkmenu/folder_opened.gif";
        this.pressed = "/res/adm/pages/bookmarkmenu/folder_opened_pressed.gif";
        this.swapState = swapState;
-       this.clickFolder = clickFolder;
+       this.clickFolder = clickFolder; 
        this.clickLink = clickLink;
        this.hover = hover;
        this.remove = remove;
@@ -60,7 +62,9 @@ function swapState() {
 function hover( object ) {
     if ( dragCache != "" ) {
         object.src = this.pressed;
-        parent.frames[4].document.images[lastDrug].src = lastIcon;
+        if (lastDrug != -1) {
+	   parent.frames[4].document.images[lastDrug].src = lastIcon;
+	}
         lastIcon = this.icon;
         lastDrug = object.name;
     }
@@ -91,16 +95,16 @@ function clickFolder( object ) {
         dragCache=object.src;
         lastIcon=this.icon;
         lastDrug=object.name;
-        addressCache=new addFolder("lame_folder",2,"doesnotmatter"); //used to be (this.lname,this.p.length+1,this.address)
-      shiftFolder(this,addressCache,1);               //this is  a whole new line
+        addressCache=new addFolder("lame_folder",1,"doesnotmatter"); //used to be (this.lname,this.p.length+1,this.address)
+      shiftFolder(this,addressCache,0);               //this is  a whole new line
         this.remove();
     } else {                                        //--------'put down' the icon
         dragCache = "";
            if ( addressCache.state == "link" ) {    //-----place link into folder
-              this.insertLink( 1 );
+              this.insertLink(0);
 //              this.p[ this.p.length ] = new addLink( addressCache.lname, addressCache.link, this.address, this.p.length );
            } else {                                 //---place folder into folder
-                this.insertFolder( 1 );
+                this.insertFolder(0);
 //              this.p[ this.p.length ] = new addFolder( addressCache.lname, addressCache.p.length, this.address+".p["+this.p.length+"]" );
 //              this.p[ this.p.length ].p = addressCache.p;
            }
@@ -110,25 +114,14 @@ function clickFolder( object ) {
 
 //---------Folder method to place link in middle of other links (should simplify code)
 function insertLink( position ) {
-        this.bump( position );
-        this.p[ position ] = new addLink( addressCache.lname, addressCache.link, this.address, position );
+        this.bump(position);
+        this.p[position]=new addLink(addressCache.lname,addressCache.link,this.address, position);
 }
 
 
 //---------------------------Recursive folder Method to bump items up one to make room 
-//                                   for new item. Currently, bump doesn't always work.
-function bump( position ) {
-// ORIGINAL RECURSIVE VERSION has short-comings but may work better because of 'not exists'
-//
-//        if ( this.length >= position ) {
-//           this.bump( position + 1 );
-//        }
-//        position;
-//        this.p[ position + 1 ] = this.p[position ];
-//
-// NON RECURSIVE of the same thing (I'll probably stick with this).
-// I can combine the creation and shifting if everything works out nicely
-// Worry about what happens to the first link.
+function bump(position) {
+					       //     long term: make recursive
         var i=this.p.length;                   // First, create a new spot at the top.
         if (this.p[i-1].state=="link") {
            this.p[i]=new addLink(this.p[i-1].lname,this.p[i-1].link,this.address,i);
@@ -137,16 +130,14 @@ function bump( position ) {
         }
         this.p[i].exists=this.p[i-1].exists;                    // preserve existance
         i--;                                           // Second, shift others up one
-        while ( i >= position + 1 ) {
+        while (i >= position+1 ) {
            if ( this.p[i-1].state == "link" ) {
               this.p[ i ] = new addLink( this.p[ i-1 ].lname, this.p[i-1].link, this.p[i-1].address, i);
            } else {
               this.p[ i ] = new addFolder( this.p[ i-1 ].lname, this.p[i-1].p.length, this.address+".p["+ i +"]" );
                                                 // move all of the inner folder stuff
-              shiftFolder( this.p[i-1], this, i);
+              shiftFolder(this.p[i-1],this,i);
            }
-//           this.p[i].address = this.p[i-1].address;
-//           this.p[i].exists = this.p[ i-1 ].exists;           // preserve existance
            i--;
         }
 }
@@ -168,11 +159,11 @@ function clickOnBookmark(url) {
 //---------------------------------shifts contents of folder up one position
 function shiftFolder(object1, object2, n) {
       object2.p[n] = new addFolder(object1.lname,object1.length,object2.address+".p["+n+"]");
-      for (var i=1; i<object1.p.length; i++) {
+      for (var i=0; i<object1.p.length; i++) {
         if (object1.p[i].state=="link") {
           object2.p[n].p[i]=new addLink(object1.p[i].lname,object1.p[i].link,object2.p[n].address,i);
         } else {
-          object2.p[n].p[i]=new addFolder(object1.p[i].lname,object1.p[i].length,object2.address+".p["+n+"].p["+i+"]");
+          object2.p[n].p[i]=new addFolder(object1.p[i].lname,object1.p.length,object2.address+".p["+n+"].p["+i+"]"); //BEN rid of [i]
           shiftFolder(object1.p[i],object2.p[n],i);
         }
         object2.p[n].p[i].state=object1.p[i].state;
@@ -190,7 +181,7 @@ function shiftFolder(object1, object2, n
 //--------Method to place folder in middle of other links (this simplifies code)
 function insertFolder(position) {
         this.bump(position);
-        shiftFolder(addressCache.p[1],this,position);
+        shiftFolder(addressCache.p[0],this,position);
 }
 
 
@@ -207,7 +198,7 @@ function clickTrash() {
 
 //-----------------------------------------------------------------------------
 // These functions should be incorporated as methods
-// and the trash should be a folder. I'll work on this later.
+// and the trash should be a folder. I'll work on that later.
 //-----------------------------------------------------------------------------
 function hoverTrash() {
 //        if ( dragCache != "" ) {
@@ -221,28 +212,74 @@ function hoverTrash() {
 function newLink() {
    var clienthref=opener.clientwindow.location.href;
    var clienttitle=opener.opener.document.title;
-   add_link=window.open('','Link','width=400,height=200,scrollbars=0');
+   add_link=window.open('','Link','width=360,height=165,scrollbars=0');
+   savedoc=add_link.document;
+   var instr='<html><head><title>New Link</title></head><body bgcolor="#bbbbbb">';
+   instr+='<center><form method="post" name="newLink">';
+   instr+='<table width="340" height="150" bgcolor="#ffffff" align="center">';
+   instr+='<tr><td>';
+   instr+='Name:<br><input type="text" name="title" size="45" value="'+clienttitle+'"><br>';
+   instr+='Address:<br><input type="text" name="address" size="45" value="'+clienthref+'"><br>';
+   instr+='<center>';
+   instr+='<input type="button" value="Save and Position" onclick="javascript:opener.addNewLink(newLink.title.value,newLink.address.value);">';
+   instr+='<input type="button" value="Close (no save)" onclick="javascript:window.close();">';
+   instr+='</center></td></tr></table></form></center>';
+   instr+='</body></html>';
+   savedoc.write(instr);
+   savedoc.close();
+}
+
+//-------------------------------------------------------Add the just-named link
+function addNewLink(title,address) {
+   dragCache="/res/adm/pages/bookmarkmenu/folder_opened.gif";
+   lastIcon="/res/adm/pages/bookmarkmenu/folder_opened.gif";
+   lastDrug="-1";
+   addressCache=new addLink(title,address,"doesnotmatter",1);
+   add_link.close();   
+}
+
+//----------------------------------------------------------------Add new Folder
+function newFolder() {
+   var clienthref=opener.clientwindow.location.href;
+   var clienttitle=opener.opener.document.title;
+   add_link=window.open('','Link','width=360,height=165,scrollbars=0');
    savedoc=add_link.document;
-   var instr='<html><head><title>New Link</title></head><body>';
-   instr+='<form method="post" name="newlink">';
-   instr+='Name: <input type="text" name="title" value="'+clienthref+'"><br>';
-   instr+='URL: <input type="text" name="url" value="'+clienttitle+'"><br>';
-   instr+='<input type="button" value="Save (at bottom)" onclick="javascript:">';
-   instr+='<input type="button" value="Save (within)" onclick="javascript:">';
+   var instr='<html><head><title>New Folder</title></head><body bgcolor="#bbbbbb">';
+   instr+='<center><form method="post" name="newFolder">';
+   instr+='<table width="340" height="150" bgcolor="#ffffff" align="center">';
+   instr+='<tr><td>';
+   instr+='Folder Name:<br><input type="text" name="title" size="45" value=""><br>';
+   instr+='<center>';
+   instr+='<input type="button" value="Save and Position" onclick="javascript:opener.addNewFolder(newFolder.title.value);">';
    instr+='<input type="button" value="Close (no save)" onclick="javascript:window.close();">';
-   instr+='</form>';
+   instr+='</center></td></tr></table></form></center>';
    instr+='</body></html>';
    savedoc.write(instr);
    savedoc.close();
 }
 
+//----------------------------------------------------Add the just-named folder
+function addNewFolder(title) {
+   dragCache="/res/adm/pages/bookmarkmenu/folder_opened.gif";
+   lastIcon="/res/adm/pages/bookmarkmenu/folder_opened.gif";
+   lastDrug="-1";
+   addressCache=new addFolder(title,1,"doesnotmatter");
+   add_link.close();
+}
+
+
+
+
+
+
+
 //-----------------------------------------------------------------------------
 // The following are construction functions.
 //-----------------------------------------------------------------------------
 
 //--------------------------------------------------generate the Tree HTML code
 function drawTree(depth, folder) {
-   for (var i=1; i<folder.length; i++) {
+   for (var i=0; i<folder.length; i++) {
       if (folder[i].exists) {
          if (folder[i].state=="link") {
             drawLink(depth,folder[i]);
@@ -305,30 +342,39 @@ function redrawTree() {
 // bookmarks
 //-----------------------------------------------------------------------------
 
+//--------------recovers old bookmarks this is a debug function remove it later
+function recover() {
+   parent.frames[7].document.saveBookmarks.hiddenbookmarks.value='recover';
+   parent.frames[7].document.saveBookmarks.submit();
+}
+
+
 //----------------------------------------------------------starts save process
 function save() {
-   parent.frames[4].document.clear();                                    // debug
-   parent.frames[4].document.write("<P>Debug: Beginning save process...</P>");   // debug
-   saveVar="this.bookmarks=new addFolder('Stuff',"+bookmarkpal.bookmarks.p.length+",'bookmarks')<br>\n";
-   saveTree("this.bookmarks",bookmarkpal.bookmarks.p);
-   parent.frames[4].document.write("<p>writing variable...</p>"+saveVar+"<p>...done</p>");      // debug
-   parent.frames[7].document.saveBookmarks.hidden_bookmarks=saveVar;
+//   parent.frames[4].document.clear();                                    // debug
+//   parent.frames[4].document.write("<P>Debug: Beginning save process...</P>");   // debug
+   saveVar="this.bookmarks=new addFolder(\"Stuff\","+bookmarkpal.bookmarks.p.length+",\"bookmarks\");\n";
+   saveTree("bookmarks",bookmarkpal.bookmarks.p);
+//   parent.frames[4].document.write("<p>writing variable...</p>"+saveVar+"<p>...done</p>");      // debug
+   parent.frames[7].document.saveBookmarks.hiddenbookmarks.value=saveVar;
    return true;
 }
 
 
 //---------------------------------------------------------generate save string
 function saveTree(depth_string,folder) {
-   for (var i=1; i<folder.length; i++) {
+   var n=0;                                    // n renumbers links because 
+   for (var i=0; i<folder.length; i++) {       // of deleted links
       if (folder[i].exists) {
          if (folder[i].state=="link") {
-            saveLink(depth_string+".p["+i+"]",folder[i]);
+            saveLink(depth_string,folder[i], n);
          } else {
-            saveFolder(depth_string+".p["+i+"]",folder[i]);
-            if (folder[i].state=="opened" && folder[i].p.length>=0) {
-               saveTree(depth_string+".p["+i+"]",folder[i].p);
+            saveFolder(depth_string+".p["+n+"]",folder[i]);
+            if (folder[i].p.length>=0) {
+               saveTree(depth_string+".p["+n+"]",folder[i].p);
             }
          }
+	 n++;
       }
    }
 }
@@ -336,13 +382,13 @@ function saveTree(depth_string,folder) {
 
 //-------------------------Writes javascript code for generating individual folder
 function saveFolder(depth_string, folder) {
-       saveVar+=depth_string+"=new addfolder('"+folder.lname+"',"+folder.p.length+",'"+folder.address+"');<BR>\n";
+       saveVar+="this."+depth_string+"=new addFolder(\""+folder.lname+"\","+folder.p.length+",\""+depth_string+"\");\n";
 }
 
 
 //-------------------------Writes javascript code for generating individual link
-function saveLink(depth_string,link) {
-       saveVar+=depth_string+"=new addlink('"+link.lname+"','"+link.link+"','"+link.address+"',"+link.position+");<BR>\n";
+function saveLink(depth_string,link,newpos) {
+       saveVar+="this."+depth_string+".p["+newpos+"]=new addLink(\""+link.lname+"\",\""+link.link+"\",\""+depth_string+"\","+newpos+");\n";
 }