--- loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js	2001/04/18 12:18:12	1.15
+++ loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js	2001/04/30 11:28:05	1.18
@@ -26,8 +26,20 @@
 //                                      mm-dd-yyyy   by Xxxxxxxx Xxxxxx
 
 
-clienttitle="barf";  //debug
-clienthref="Egads!"; //debug
+//clienttitle="Enter title here";//debug
+//clienthref="Enter url here"; //debug
+
+//function ugh_oh( msg, url, ln ) {
+//   alert("Error: "+msg+" in "+url+" at line: "+ln);
+//   return true; 
+//}
+
+//alert("Does alert even work?");
+
+//window.onerror=ugh_oh;
+//this.onerror=ugh_oh;
+
+
 
 //---------------------------------------------------------------------
 // Tree object
@@ -54,9 +66,9 @@ function redraw() {
       write("marginheight=0 marginwidth=0>\n"                     );
       write("<table border=0 cellspacing=0 cellpadding=0>\n"      );
    }
-   bendebugger=window.open('','HTML_DUMP','scrollbars');  //debug
-   bendebugger.document.clear(); //debug
-   bendebugger.document.write('TEXT DOCUMENT: NONE OF THE TAGS SHOULD WORK\n'); //debug
+//   bendebugger=window.open('','HTML_DUMP','scrollbars');  //debug
+//   bendebugger.document.clear(); //debug
+//   bendebugger.document.write('TEXT DOCUMENT: NONE OF THE TAGS SHOULD WORK\n'); //debug
    var objPath="top.tree.bookmarks";
    depth=0;
    for(var i=0;i<this.bookmarks.p.length;i++) {
@@ -73,8 +85,8 @@ function redraw() {
 //   this.bookmarks.folderDraw(0,"top.tree.bookmarks");
    top.frames[4].document.write("</table>\n</body>\n</html>");
    top.frames[4].document.close();
-   bendebugger.document.close(); //debug
-   return false; //debug
+//   bendebugger.document.close(); //debug
+//   return false; //debug
 }
 
 //-----------------generate 'save-string' and submit to admbookmarks.pm
@@ -182,28 +194,16 @@ function swapState() {
 //-------------------recursive, Moves folder and contents to new object
 //                        Don't forget to 'bump' before calling moveTo!
 function moveTo(object1) {
-   //alert('moveto11: from '+this.name+' to: '+object1.name+' o1 exists?'+object1.exists);
    object1=new newFolder(this.name,this.opened);
-   //alert('moveto22: from '+this.name+' to: '+object1.name+' o1 exists?'+object1.exists);
-   //object1.exists=this.exists;
    for (var i=0;i<this.p.length;i++) {
-//     alert('moveTo i='+i); 
      if (this.p[i].exists) {
-         //alert('it exists at least!');
-         //alert('vitals, state:: '+this.p[i].state+'\n name: '+this.p[i].name+'\n exists: '+this.p[i].exists+'\n end of stuff');
          if (this.p[i].state=="folder") {
-            //alert('it must have been a folder: '+this.p[i].state+'\n name: '+this.p[i].name+'\n exists: '+this.p[i].exists+'\n end of stuff');
             object1.p[i]=this.p[i].moveTo(object1.p[i]);
          } else {
-            //alert('was not a folder, was a '+this.p[i].state);
             object1.p[i]=new newLink(this.p[i].name,this.p[i].url);        
          }
          object1.p[i].exists=this.p[i].exists;
-//    } else {
-//       alert('NO EXISTANCE');
-//       object1.p[i].exists=false;
       }
-//    object1.p[i].exists=this.p[i].exists;
    }
    return object1;
 }
@@ -211,7 +211,6 @@ function moveTo(object1) {
 //---------------------------------------bump all folder/links within a
 //                                     folder up one from 'location' up
 function bump(location) {
-//alert('bump: '+this.name+'--location: '+location);
    for (var i=this.p.length-1;i>=location;i--) {
       if (this.p[i].exists) { //saves time by not moving non-existing items
          if (this.p[i].state=="folder") {
@@ -250,18 +249,18 @@ function folderDraw(depth,objPath) {
 	 write("<img src="+this.icon+" border=0></a>"                   );
 	 write( this.name+"</td></tr>"                                  );
       }
-      with (bendebugger.document) {
-	 write("<p>|-tr-||-td-||-a href=JavaScript:"+objPath+".swapState();-|\n"   );
-         write("|-img src=/res/adm/pages/bookmarkmenu/folder_pointer_opened.gif border=0-||-/a-|\n"       );
-	 write("|-a href='JavaScript:"+objPath+".folderClick();'\n"        );
-	 write("onmouseover="+objPath+".folderHover("+image_num+");-|\n"   );
-	 write("|-img src=/res/adm/pages/bookmarkmenu/pix.gif height=25 width="+20*(depth)+" border=0-||-/a-|\n");
-	 write("|-a href='javaScript:"+objPath+".folderClick();'"        );
-         write("onmouseover='"+objPath+".folderHover("+image_num+");'-|\n" );
-	 write("|-img src="+this.icon+" border=0-||-/a-|\n"                   );
-	 write( this.name                                               );
-	 write("|-/td-||-/tr-|\n"                                             );
-      }             //whole thing is a debug
+//       with (bendebugger.document) {
+//	 write("<p>|-tr-||-td-||-a href=JavaScript:"+objPath+".swapState();-|\n"   );
+//         write("|-img src=/res/adm/pages/bookmarkmenu/folder_pointer_opened.gif border=0-||-/a-|\n"       );
+//	 write("|-a href='JavaScript:"+objPath+".folderClick();'\n"        );
+//	 write("onmouseover="+objPath+".folderHover("+image_num+");-|\n"   );
+//	 write("|-img src=/res/adm/pages/bookmarkmenu/pix.gif height=25 width="+20*(depth)+" border=0-||-/a-|\n");
+//	 write("|-a href='javaScript:"+objPath+".folderClick();'"        );
+//         write("onmouseover='"+objPath+".folderHover("+image_num+");'-|\n" );
+//	 write("|-img src="+this.icon+" border=0-||-/a-|\n"                   );
+//	 write( this.name                                               );
+//	 write("|-/td-||-/tr-|\n"                                             );
+//      }             //whole thing is a debug
       for(var i=0;i<this.p.length;i++) {
 	 if (this.p[i].exists) {                                            // PROGRAM DIED HERE ONCE
             if (this.p[i].state=="folder") {
@@ -284,17 +283,17 @@ function folderDraw(depth,objPath) {
 	 write("<img src="+this.icon+" border=0></a>"                   );
 	 write( this.name+"</td></tr>"                                  );
       }
-      with (bendebugger.document) {
-	 write("<p>|-tr-||-td-||-a href=JavaScript:"+objPath+".swapState();-|\n"   );
-         write("|-img src=/res/adm/pages/bookmarkmenu/folder_pointer_closed.gif border=0-||-/a-|\n"       );
-	 write("|-a href='JavaScript:"+objPath+".folderClick();'"        );
-	 write(" onmouseover="+objPath+".folderHover("+image_num+");-|\n"  );
-	 write("|-img src=/res/adm/pages/bookmarkmenu/pix.gif height=25 width="+20*(depth)+" border=0-||-/a-|\n");
-	 write("|-a href=JavaScript:"+objPath+".folderClick();-|\n"         );
-	 write("|-img src="+this.icon+" border=0-||-/a-|\n"                   );
-	 write( this.name                                               );
-	 write("|-/td-||-/tr-|\n"                                             );
-      }
+//      with (bendebugger.document) {
+//	 write("<p>|-tr-||-td-||-a href=JavaScript:"+objPath+".swapState();-|\n"   );
+//         write("|-img src=/res/adm/pages/bookmarkmenu/folder_pointer_closed.gif border=0-||-/a-|\n"       );
+//	 write("|-a href='JavaScript:"+objPath+".folderClick();'"        );
+//	 write(" onmouseover="+objPath+".folderHover("+image_num+");-|\n"  );
+//	 write("|-img src=/res/adm/pages/bookmarkmenu/pix.gif height=25 width="+20*(depth)+" border=0-||-/a-|\n");
+//	 write("|-a href=JavaScript:"+objPath+".folderClick();-|\n"         );
+//	 write("|-img src="+this.icon+" border=0-||-/a-|\n"                   );
+//	 write( this.name                                               );
+//	 write("|-/td-||-/tr-|\n"                                             );
+//     }
    }
 }
 
@@ -376,7 +375,7 @@ function newLink(name, url) {
 }
 
 function linkGoto() {
-   BookmarkedPage=window.open(this.url,'BookmarkedPage');
+   self.opener.clientwindow.location.href=this.url;
 }
 
 function linkEdit() {
@@ -393,22 +392,22 @@ function linkDraw(depth,objPath,pstn) {
       write("<img src=/res/adm/pages/bookmarkmenu/pix.gif height=25 width="+(20*(depth)+15)+" border=0></a>");
       write("<a href='javaScript:"+objPath+".linkClick("+pstn+");'");
       write(" onmouseover='"+objPath+".p["+pstn+"].linkHover("+image_num+");'>");
-      write("<img src=/res/adm/pages/bookmarkmenu/link.gif border=0></a>"); //this.icon replaced with link.gif
+      write("<img src=/res/adm/pages/bookmarkmenu/link.gif border=0></a>");
       write("<a href='javaScript:"+objPath+".p["+pstn+"].linkGoto();'" );
       write(" onmouseover='"+objPath+".p["+pstn+"].linkHover("+image_num+");'>");
       write(this.name+"</td></tr>"                                );
    }
-   with (bendebugger.document) {
-      write("<P>|-tr-||-td-||-a href='javaScript:"+objPath+".linkClick("+pstn+");'\n" );
-      write(" onmouseover='"+objPath+".p["+pstn+"].linkHover("+image_num+");'-|\n");
-      write("|-img src=/res/adm/pages/bookmarkmenu/pix.gif height=25 width="+(20*(depth)+15)+" border=0-||-/a-|\n");
-      write("|-a href='javaScript:"+objPath+".linkClick("+pstn+");'");
-      write(" onmouseover='"+objPath+".p["+pstn+"].linkHover("+image_num+");'-|\n");
-      write("|-img src=/res/adm/pages/bookmarkmenu/link.gif border=0-||-/a-|"); //this.icon replaced with link.gif
-      write("|-a href='javaScript:"+objPath+".p["+pstn+"].linkGoto();'" );
-      write(" onmouseover='"+objPath+".p["+pstn+"].linkHover("+image_num+");'-|\n");
-      write(this.name+"|-/td-||-/tr-|\n"                                );
-   } //debug
+//   with (bendebugger.document) {
+//      write("<P>|-tr-||-td-||-a href='javaScript:"+objPath+".linkClick("+pstn+");'\n" );
+//      write(" onmouseover='"+objPath+".p["+pstn+"].linkHover("+image_num+");'-|\n");
+//      write("|-img src=/res/adm/pages/bookmarkmenu/pix.gif height=25 width="+(20*(depth)+15)+" border=0-||-/a-|\n");
+//      write("|-a href='javaScript:"+objPath+".linkClick("+pstn+");'");
+//      write(" onmouseover='"+objPath+".p["+pstn+"].linkHover("+image_num+");'-|\n");
+//      write("|-img src=/res/adm/pages/bookmarkmenu/link.gif border=0-||-/a-|"); //this.icon replaced with link.gif
+//      write("|-a href='javaScript:"+objPath+".p["+pstn+"].linkGoto();'" );
+//      write(" onmouseover='"+objPath+".p["+pstn+"].linkHover("+image_num+");'-|\n");
+//      write(this.name+"|-/td-||-/tr-|\n"                                );
+//   } //debug
 }
 
 //---------------------------generate link information for saving links
@@ -533,6 +532,11 @@ function buildBookmarkMenu() {
 //----------------------------
 function queryNewLink() {
    add_link=window.open('','Link','width=360,height=165');
+   clienthref="[ENTER ADDRESS HERE]";
+   clienttitle="[ENTER NAME HERE]";
+//   this.onerror=ugh_oh; // this doesn't seem to work properly
+//   clienthref=this.opener.clientwindow.window.location.pathname;
+//   clienttitle=this.opener.clientwindow.title;
    with(add_link.document) {
       open();
       clear();