Bug 397263 - No way to set an icon for javascript bookmarklets on toolbar and menupopups, r=mak77

browser/components/places/content/menu.xml

@@ -820,6 +820,12 @@
             // to be added or removed.
             PlacesUIUtils.ensureLivemarkStatusMenuItem(menuitem.firstChild);
           }
+          else if (PlacesUtils.nodeIsURI(aNode)) {
+            if (aNode.uri.lastIndexOf("javascript:", 0) == 0)
+              menuitem.setAttribute("bookmarklet", "true");
+            else
+              menuitem.removeAttribute("bookmarklet");
+          }
         },
 
         itemReplaced:

browser/components/places/content/toolbar.xml

@@ -219,6 +219,12 @@
               this._containerNodesMap.push({ resultNode: aChild,
                                              domNode: popup });
             }
+            else if (PlacesUtils.nodeIsURI(aChild)) {
+              if (aChild.uri.lastIndexOf("javascript:", 0) == 0)
+                button.setAttribute("bookmarklet", "true");
+              else
+                button.removeAttribute("bookmarklet");
+            }
           }
 
           button.node = aChild;
@@ -638,6 +644,12 @@
             // to be added or removed.
             PlacesUIUtils.ensureLivemarkStatusMenuItem(element.firstChild);
           }
+          else if (PlacesUtils.nodeIsURI(aNode)) {
+            if (aNode.uri.lastIndexOf("javascript:", 0) == 0)
+              element.setAttribute("bookmarklet", "true");
+            else
+              element.removeAttribute("bookmarklet");
+          }
         },
 
         itemReplaced:

browser/components/places/content/treeView.js

@@ -928,6 +928,10 @@ PlacesTreeView.prototype = {
       else if (itemId != -1) { // bookmark nodes
         if (PlacesUtils.nodeIsLivemarkContainer(node.parent))
           properties.push(this._getAtomFor("livemarkItem"));
+        else if (PlacesUtils.nodeIsURI(node)) {
+          if (node.uri.lastIndexOf("javascript:", 0) == 0)
+            properties.push(this._getAtomFor("bookmarklet"));
+        }
       }
 
       this._visibleElements[aRow].properties = properties;

browser/components/places/content/utils.js

@@ -999,6 +999,9 @@ var PlacesUIUtils = {
       if (PlacesUtils.uriTypes.indexOf(type) != -1) {
         element = document.createElement("menuitem");
         element.className = "menuitem-iconic bookmark-item";
+
+        if (aNode.uri.lastIndexOf("javascript:", 0) == 0)
+          element.setAttribute("bookmarklet", "true");
       }
       else if (PlacesUtils.containerTypes.indexOf(type) != -1) {
         element = document.createElement("menu");