Bug 700348 - fix showBookmarkDialog warnings.

r=dietrich
This commit is contained in:
Marco Bonardo 2011-11-11 22:39:26 +01:00
parent 0f041f87ce
commit ae6e15e620
6 changed files with 16 additions and 14 deletions

View File

@ -140,7 +140,7 @@ let RemoteTabViewer = {
, "folderPicker" , "folderPicker"
, "loadInSidebar" , "loadInSidebar"
, "keyword" ] , "keyword" ]
}); }, window.top);
}, },
bookmarkSelectedTabs: function() { bookmarkSelectedTabs: function() {
@ -160,7 +160,7 @@ let RemoteTabViewer = {
, type: "folder" , type: "folder"
, URIList: URIs , URIList: URIs
, hiddenRows: [ "description" ] , hiddenRows: [ "description" ]
}); }, window.top);
} }
}, },

View File

@ -388,13 +388,13 @@ var PlacesCommandHook = {
, "loadInSidebar" , "loadInSidebar"
, "folderPicker" , "folderPicker"
, "keyword" ] , "keyword" ]
}); }, window);
} }
else { else {
PlacesUIUtils.showBookmarkDialog({ action: "edit" PlacesUIUtils.showBookmarkDialog({ action: "edit"
, type: "bookmark" , type: "bookmark"
, itemId: itemId , itemId: itemId
}); }, window);
} }
}, },
@ -427,7 +427,7 @@ var PlacesCommandHook = {
, type: "folder" , type: "folder"
, URIList: pages , URIList: pages
, hiddenRows: [ "description" ] , hiddenRows: [ "description" ]
}); }, window);
} }
}, },
@ -478,7 +478,7 @@ var PlacesCommandHook = {
, hiddenRows: [ "feedLocation" , hiddenRows: [ "feedLocation"
, "siteLocation" , "siteLocation"
, "description" ] , "description" ]
}); }, window);
}, },
/** /**

View File

@ -3165,7 +3165,7 @@ var bookmarksButtonObserver = {
, "loadInSidebar" , "loadInSidebar"
, "folderPicker" , "folderPicker"
, "keyword" ] , "keyword" ]
}); }, window);
} catch(ex) { } } catch(ex) { }
}, },
@ -5794,7 +5794,7 @@ function contentAreaClick(event, isPanelClick)
, "location" , "location"
, "folderPicker" , "folderPicker"
, "keyword" ] , "keyword" ]
}); }, window);
event.preventDefault(); event.preventDefault();
return true; return true;
} }
@ -6841,7 +6841,7 @@ function AddKeywordForSearchField() {
, hiddenRows: [ "location" , hiddenRows: [ "location"
, "loadInSidebar" , "loadInSidebar"
, "folderPicker" ] , "folderPicker" ]
}); }, window);
} }
function SwitchDocumentDirection(aWindow) { function SwitchDocumentDirection(aWindow) {

View File

@ -1408,13 +1408,13 @@ nsContextMenu.prototype = {
, "loadInSidebar" , "loadInSidebar"
, "folderPicker" , "folderPicker"
, "keyword" ] , "keyword" ]
}); }, window.top);
} }
else { else {
PlacesUIUtils.showBookmarkDialog({ action: "edit" PlacesUIUtils.showBookmarkDialog({ action: "edit"
, type: "bookmark" , type: "bookmark"
, itemId: itemId , itemId: itemId
}); }, window.top);
} }
}, },

View File

@ -309,10 +309,11 @@ PlacesController.prototype = {
, hiddenRows: [ "description" , hiddenRows: [ "description"
, "keyword" , "keyword"
, "location" , "location"
, "folderPicker"
, "loadInSidebar" ] , "loadInSidebar" ]
, uri: NetUtil.newURI(node.uri) , uri: NetUtil.newURI(node.uri)
, title: node.title , title: node.title
}, window.top, true); }, window.top);
break; break;
} }
}, },
@ -768,7 +769,7 @@ PlacesController.prototype = {
, type: aType , type: aType
, defaultInsertionPoint: ip , defaultInsertionPoint: ip
, hiddenRows: [ "folderPicker" ] , hiddenRows: [ "folderPicker" ]
}, window); }, window.top);
if (performed) { if (performed) {
// Select the new item. // Select the new item.
let insertedNodeId = PlacesUtils.bookmarks let insertedNodeId = PlacesUtils.bookmarks

View File

@ -111,11 +111,12 @@ function (aTitle, aContentURL, aCustomizeURL, aPersist)
, hiddenRows: [ "description" , hiddenRows: [ "description"
, "keyword" , "keyword"
, "location" , "location"
, "folderPicker"
, "loadInSidebar" ] , "loadInSidebar" ]
, uri: uri , uri: uri
, title: aTitle , title: aTitle
, loadBookmarkInSidebar: true , loadBookmarkInSidebar: true
}, win, true); }, win);
} }
nsSidebar.prototype.validateSearchEngine = nsSidebar.prototype.validateSearchEngine =