From 5b364e0f4776eac63d604c48dcd9671d430a1e8f Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Thu, 6 Dec 2001 23:11:52 +0000
Subject: [PATCH] More post-bookmarksliner cleanup. r=hewitt sr=ben

---
 .../resources/content/personalToolbar.js      | 16 ++---
 .../bookmarks/resources/addBookmark.xul       |  2 +-
 .../bookmarks/resources/bm-panel.xul          |  2 +-
 .../bookmarks/resources/bookmarks.css         |  6 +-
 .../bookmarks/resources/bookmarks.xml         | 68 ++++++++++++++-----
 5 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/xpfe/browser/resources/content/personalToolbar.js b/xpfe/browser/resources/content/personalToolbar.js
index 3945dccc23f..cc6c6ea06ee 100644
--- a/xpfe/browser/resources/content/personalToolbar.js
+++ b/xpfe/browser/resources/content/personalToolbar.js
@@ -106,7 +106,7 @@ BookmarksToolbar.prototype = {
 
     editCell: function (aSelectedItem, aXXXLameAssIndex)
     {
-      goDoCommand("cmd_properties");
+      goDoCommand("cmd_bm_properties");
       return; // Disable Inline Edit for now. See bug 77125 for why this is being disabled
               // on the personal toolbar for the moment. 
 
@@ -414,12 +414,12 @@ BookmarksToolbar.prototype = {
       case "cmd_openfolderinnewwindow":
         seln = gBookmarksShell.getSelection();
         return document.popupNode != null && seln[0].getAttributeNS(RDF_NS, "type") == NC_NS + "Folder";
-      case "cmd_find":
-      case "cmd_newbookmark":
-      case "cmd_newfolder":
-      case "cmd_newseparator":
-      case "cmd_import":
-      case "cmd_export":
+      case "cmd_bm_find":
+      case "cmd_bm_newbookmark":
+      case "cmd_bm_newfolder":
+      case "cmd_bm_newseparator":
+      case "cmd_bm_import":
+      case "cmd_bm_export":
         return true;
       case "cmd_bm_properties":
       case "cmd_bm_rename":
@@ -472,7 +472,7 @@ BookmarksToolbar.prototype = {
       case "cmd_bm_import":
       case "cmd_bm_export":
       case "cmd_bm_fileBookmark":
-        gBookmarksShell.execCommand(aCommand.substring("cmd_bm_".length));
+        gBookmarksShell.execCommand(aCommand.substring("cmd_".length));
         break;
       case "cmd_bm_selectAll":
         break;
diff --git a/xpfe/components/bookmarks/resources/addBookmark.xul b/xpfe/components/bookmarks/resources/addBookmark.xul
index ada236c6555..c2cc5521a4b 100644
--- a/xpfe/components/bookmarks/resources/addBookmark.xul
+++ b/xpfe/components/bookmarks/resources/addBookmark.xul
@@ -86,7 +86,7 @@
     <hbox flex="1">
       <label id="createinlabel" value="&createin.label;"/>
       <hbox flex="1">
-        <bookmarks-outliner id="bookmarks-view" flex="1" class="folders" outlinerclass="inset"/>
+        <bookmarks-outliner id="bookmarks-view" flex="1" type="folders" class="inset"/>
         <vbox>
           <button label="&button.newfolder.label;" accesskey="&button.newfolder.accesskey;"
                   oncommand="createNewFolder();"/>
diff --git a/xpfe/components/bookmarks/resources/bm-panel.xul b/xpfe/components/bookmarks/resources/bm-panel.xul
index ee0fdf47dfe..cbdf1adb3de 100644
--- a/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -81,5 +81,5 @@
             oncommand="document.getElementById('bookmarks-view').openFindDialog();"/>
   </hbox>
   
-  <bookmarks-outliner id="bookmarks-view" class="single-name" flex="1"/>
+  <bookmarks-outliner id="bookmarks-view" type="single-column" flex="1"/>
 </page>
diff --git a/xpfe/components/bookmarks/resources/bookmarks.css b/xpfe/components/bookmarks/resources/bookmarks.css
index cf1516d4edc..1ecae654af0 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.css
+++ b/xpfe/components/bookmarks/resources/bookmarks.css
@@ -1,14 +1,14 @@
-bookmarks-outliner
+bookmarks-outliner, bookmarks-outliner[type="multi-column"]
   {
     -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-outliner-full");
   }
   
-bookmarks-outliner.single-name
+bookmarks-outliner[type="single-column"]
   {
     -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-outliner-name");
   }
 
-bookmarks-outliner.folders
+bookmarks-outliner[type="folders"]
   {
     -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-outliner-folders");
   }
\ No newline at end of file
diff --git a/xpfe/components/bookmarks/resources/bookmarks.xml b/xpfe/components/bookmarks/resources/bookmarks.xml
index 410ff656884..d46d0581319 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.xml
+++ b/xpfe/components/bookmarks/resources/bookmarks.xml
@@ -93,7 +93,7 @@
         var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].getService(Components.interfaces.nsIStringBundleService);
         var bundleURL = "chrome://communicator/locale/bookmarks/bookmark.properties";
         this._bundle = stringBundleService.createBundle(bundleURL, localeService.GetApplicationLocale());
-        // setTimeout(this.refreshSort, 0, this);
+        setTimeout(this.refreshSort, 0, this);
       ]]></constructor>
       <destructor><![CDATA[
         this.outlinerBuilder.removeObserver(this.builderObserver);
@@ -188,6 +188,20 @@
         ]]></getter>
       </property>
       
+      <field name="_type">null</field>
+ 
+      <property name="type">
+        <getter><![CDATA[
+          if (!this._type) {
+            var type = this.getAttribute("type");
+            if (!type)
+              type = "multi-column";
+            this._type = type;
+          }
+          return this._type;
+        ]]></getter>
+      </property>
+      
       <!-- Returns the row index of the best row at which to perform an operation
            relative to the current selection, e.g. creating a new bookmark 
            adjacent to the current selection. -->
@@ -454,7 +468,7 @@
             this.mOuter.selectAll();
             break;
           case "cmd_bm_open":
-            this.mOuter.openItem();
+            this.mOuter.openItem(true);
             break;
           case "cmd_bm_openfolder":
             this.mOuter.outlinerBoxObject.view.toggleOpenState(this.mOuter.currentIndex);
@@ -608,7 +622,25 @@
             }
             var rSource = this.mOuter.rdf.GetResource(sourceID[i]);
             var rParent = parentID[i] ? this.mOuter.rdf.GetResource(parentID[i]) : null;
+
             const kBMDS = this.mOuter.bookmarksDS;
+            var bmType = this.mOuter.resolveType(rSource);
+            var rType = this.mOuter.rdf.GetResource(this.mOuter.RDF_NS + "type");
+            if (!bmType) 
+              kBMDS.Assert(rSource, rType, rBookmark, true);
+            
+            // prevent dropping folder within itself or one of its subfolders
+            if (bmType == this.mOuter.NC_NS + "Folder") {
+              var currRow = row;
+              do {
+                var currURI = this.mOuter.outlinerBuilder.getResourceAtIndex(currRow).Value;
+                currRow = this.mOuter.outlinerBoxObject.view.getParentIndex(currRow);
+              }
+              while (currRow != -1 && currURI != "NC:BookmarksRoot" && currURI != rSource.Value);
+              if (currURI == rSource.Value)
+                return;
+            }
+
             RDFC.Init(kBMDS, rContainer);
             var dropIx = RDFC.IndexOf(rTarget);
             // XXX if any of the following fails, the nodes are gone for good!
@@ -619,18 +651,15 @@
                 try {
                   RDFC.Init(kBMDS, rParent);
                   ix = RDFC.IndexOf(rSource);
-                  if (ix >= 1) 
+                  if (ix >= 1) {
                     RDFC.RemoveElementAt(ix, true);
+                    --row;
+                  }
                 }
                 catch (ex) { }
               }
             }
     
-            var bmType = kBMDS.GetTarget(this.mOuter.rdf.GetResource(sourceID[i]), this.mOuter.rdf.GetResource(this.mOuter.RDF_NS + "type"), true);
-            var rType = this.mOuter.rdf.GetResource(this.mOuter.RDF_NS + "type");
-            if (!bmType) 
-              kBMDS.Assert(rSource, rType, rBookmark, true);
-
             if (bmType == this.mOuter.NC_NS + "Folder") {
               // If we're going to copy a folder type, we need to clone the folder 
               // rather than just asserting the new node as a child of the drop folder.
@@ -643,8 +672,8 @@
               RDFC.InsertElementAt(rSource, rParent ? dropIx : (orientation == this.inDropAfter ? ++dropIx : dropIx), true);
             }
             else {
-              rContainer = this.mOuter.outlinerBuilder.getResourceAtIndex(row);
-              RDFC.Init(kBMDS, rContainer);
+              var cont = this.mOuter.outlinerBuilder.getResourceAtIndex(row);
+              RDFC.Init(kBMDS, cont);
               RDFC.AppendElement(rSource); // drop on
             }
             dirty = true;
@@ -1523,8 +1552,10 @@
       ]]></body>
       </method>
      
+      // requires utilityOverlay.js if opening in new window for opentopwin()
       <method name="openItem">
       <parameter name="aEvent"/>
+      <parameter name="aInNewWindow"/>
         <body><![CDATA[
           if (this.outlinerBoxObject.view.isContainer(this.outlinerBoxObject.selection.currentIndex))
             return;
@@ -1535,9 +1566,10 @@
           if (urlValue.substring(0,3) == "NC:" || !urlValue) return;
           if (aEvent && aEvent.altKey)
             this.openPropertiesForItem();
-          else
+          else if (aInNewWindow)
             openDialog (this._browserURL, "_blank", "chrome,all,dialog=no", urlValue);
-
+          else
+            openTopWin(urlValue);
           if (aEvent) 
             aEvent.preventBubble();
         ]]></body>
@@ -1568,9 +1600,10 @@
         <menupopup id="bmContext" 
                    onpopupshowing="this.parentNode.createContextMenu(event);"/>
       <vbox flex="1">
-        <outliner flex="1" flags="dont-test-empty" anonid="bookmarks-outliner" enableColumnDrag="true">
+        <outliner flex="1" flags="dont-test-empty" anonid="bookmarks-outliner" enableColumnDrag="true"
+                           onkeypress="if (event.keyCode == 13) this.parentNode.parentNode.openItem(event, true);">
           <outlinerbody anonid="bookmarks-outlinerbody" datasources="rdf:bookmarks rdf:internetsearch rdf:files rdf:localsearch" flex="1" ref="NC:BookmarksRoot"
-                        ondblclick="this.parentNode.parentNode.parentNode.openItem(event);"
+                        ondblclick="this.parentNode.parentNode.parentNode.openItem(event, true);"
                         ondraggesture="nsDragAndDrop.startDrag(event, this.parentNode.parentNode.parentNode.DNDObserver);"
                         onselect="this.parentNode.parentNode.parentNode.outlinerBoxObject.view.selectionChanged();">
             <template>
@@ -1617,10 +1650,11 @@
                  contextmenu="_child">
       <menupopup id="bmContext" 
                  onpopupshowing="this.parentNode.createContextMenu(event);"/>
-      <outliner flex="1" flags="dont-test-empty" anonid="bookmarks-outliner" inherits="class=outlinerclass" enableColumnDrag="true">
+      <outliner flex="1" flags="dont-test-empty" anonid="bookmarks-outliner" inherits="class" enableColumnDrag="true"
+                         onkeypress="if (event.keyCode == 13) this.parentNode.openItem(event, false);">
         <outlinerbody anonid="bookmarks-outlinerbody" datasources="rdf:bookmarks rdf:internetsearch rdf:files rdf:localsearch" flex="1" ref="NC:BookmarksRoot"
-                      ondblclick="this.parentNode.parentNode.openItem(event);"
                       ondraggesture="nsDragAndDrop.startDrag(event, this.parentNode.parentNode.DNDObserver);"
+                      onclick="this.parentNode.parentNode.openItem(event, false);"
                       onselect="this.parentNode.parentNode.outlinerBoxObject.view.selectionChanged();">
           <template>
             <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
@@ -1641,7 +1675,7 @@
   <!-- Outliner with folders only -->
   <binding id="bookmarks-outliner-folders" extends="chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-outliner">
     <xbl:content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xbl="http://www.mozilla.org/xbl">
-      <outliner flex="1" flags="dont-test-empty" anonid="bookmarks-outliner" inherits="class=outlinerclass">
+      <outliner flex="1" flags="dont-test-empty" anonid="bookmarks-outliner" inherits="class">
         <outlinerbody anonid="bookmarks-outlinerbody" datasources="rdf:bookmarks rdf:internetsearch rdf:files rdf:localsearch" flex="1" ref="NC:BookmarksRoot"
                       onselect="this.parentNode.parentNode.outlinerBoxObject.view.selectionChanged();">
           <template>