Permalink
Browse files

Bug 901234 - Stop using uriTypes (Places Session ids) in SeaMonkey co…

…de, r=Neil, a=me

CLOSED TREE
  • Loading branch information...
1 parent c18a7b2 commit 9559a28968a3cb538a3a485733cde3c32e39d4e3 @Frankst2 Frankst2 committed Mar 5, 2014
@@ -289,7 +289,7 @@ var PlacesUIUtils = {
getBestTitle: function PU_getBestTitle(aNode) {
var title;
- if (!aNode.title && PlacesUtils.uriTypes.indexOf(aNode.type) != -1) {
+ if (!aNode.title && PlacesUtils.nodeIsURI(aNode)) {
// if node title is empty, try to set the label using host and filename
// PlacesUtils._uri() will throw if aNode.uri is not a valid URI
try {
@@ -295,7 +295,7 @@ PlacesViewBase.prototype = {
if (type == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR)
element = document.createElement("menuseparator");
else {
- if (PlacesUtils.uriTypes.indexOf(type) != -1) {
+ if (type == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_URI) {
element = document.createElement("menuitem");
element.className = "menuitem-iconic bookmark-item menuitem-with-favicon";
element.setAttribute("scheme",
@@ -461,7 +461,6 @@ PlacesController.prototype = {
nodeData["separator"] = true;
break;
case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_URI:
- case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_VISIT:
nodeData["link"] = true;
uri = PlacesUtils._uri(node.uri);
if (PlacesUtils.nodeIsBookmark(node)) {
@@ -62,7 +62,7 @@
if (PlacesUtils.nodeIsHistoryContainer(queryNode) ||
options.resultType == options.RESULTS_AS_TAG_QUERY ||
options.resultType == options.RESULTS_AS_TAG_CONTENTS)
- options.resultType = options.RESULT_TYPE_URI;
+ options.resultType = options.RESULTS_AS_URI;
var query = PlacesUtils.history.getNewQuery();
query.searchTerms = filterString;
@@ -895,7 +895,7 @@ var PlacesUIUtils = {
getBestTitle: function PUIU_getBestTitle(aNode) {
var title;
- if (!aNode.title && PlacesUtils.uriTypes.indexOf(aNode.type) != -1) {
+ if (!aNode.title && PlacesUtils.nodeIsURI(aNode)) {
// if node title is empty, try to set the label using host and filename
// PlacesUtils._uri() will throw if aNode.uri is not a valid URI
try {

0 comments on commit 9559a28

Please sign in to comment.