Bug 1158900 - Editing bookmark's Location and Description in the Properties window doesn't work; bookmark title missing. r=mak

browser/components/places/content/bookmarkProperties.js

@@ -234,6 +234,7 @@ var BookmarkPropertiesPanel = {
     }
     else { // edit
       this._node = dialogInfo.node;
+      this._title = this._node.title;
       switch (dialogInfo.type) {
         case "bookmark":
           this._itemType = BOOKMARK_ITEM;

browser/components/places/content/editBookmarkOverlay.js

@@ -529,7 +529,7 @@ let gEditItemOverlay = {
 
     let itemId = this._paneInfo.itemId;
     let description = this._element("descriptionField").value;
-    if (description != PlacesUIUtils.getItemDescription(this._itemId)) {
+    if (description != PlacesUIUtils.getItemDescription(this._paneInfo.itemId)) {
       let annotation =
         { name: PlacesUIUtils.DESCRIPTION_ANNO, value: description };
       if (!PlacesUIUtils.useAsyncTransactions) {
@@ -562,7 +562,7 @@ let gEditItemOverlay = {
 
     if (!PlacesUIUtils.useAsyncTransactions) {
       let itemId = this._paneInfo.itemId;
-      let txn = new PlacesEditBookmarkURITransaction(this._itemId, newURI);
+      let txn = new PlacesEditBookmarkURITransaction(this._paneInfo.itemId, newURI);
       PlacesUtils.transactionManager.doTransaction(txn);
       return;
     }
@@ -677,7 +677,7 @@ let gEditItemOverlay = {
     if (aEvent.target.id == "editBMPanel_chooseFolderMenuItem") {
       // reset the selection back to where it was and expand the tree
       // (this menu-item is hidden when the tree is already visible
-      let containerId = PlacesUtils.bookmarks.getFolderIdForItem(this._itemId);
+      let containerId = PlacesUtils.bookmarks.getFolderIdForItem(this._paneInfo.itemId);
       let item = this._getFolderMenuItem(containerId);
       this._folderMenuList.selectedItem = item;
       // XXXmano HACK: setTimeout 100, otherwise focus goes back to the