From a307c3c3db50e4662b62624b3fe5ea65541a4826 Mon Sep 17 00:00:00 2001 From: "ben%netscape.com" Date: Wed, 20 Feb 2002 04:06:57 +0000 Subject: [PATCH] Fix for 106326 - better handling of IE favorites. Adding support for one-time import of IE favorites in addition to dynamic root which is now off by default. r=rjc, sr=hyatt --- xpfe/browser/resources/content/fastnav.js | 6 +++--- xpfe/browser/resources/content/navigator.js | 10 +++++----- xpfe/browser/resources/content/navigatorDD.js | 2 +- .../resources/content/nsBrowserStatusHandler.js | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xpfe/browser/resources/content/fastnav.js b/xpfe/browser/resources/content/fastnav.js index bd7dbc9c18d..cc91dee63ed 100644 --- a/xpfe/browser/resources/content/fastnav.js +++ b/xpfe/browser/resources/content/fastnav.js @@ -113,7 +113,7 @@ function UpdateBookmarksLastVisitedDate(event) var bmks = Components.classes["@mozilla.org/browser/bookmarks-service;1"] .getService(Components.interfaces.nsIBookmarksService); - bmks.UpdateBookmarkLastVisitedDate(url, _content.document.characterSet); + bmks.updateLastVisitedDate(url, _content.document.characterSet); } } @@ -868,7 +868,7 @@ function getShortcutOrURI(url) var bmks = Components.classes["@mozilla.org/browser/bookmarks-service;1"] .getService(Components.interfaces.nsIBookmarksService); - var shortcutURL = bmks.FindShortcut(url); + var shortcutURL = bmks.resolveKeyword(url); if (!shortcutURL) { // rjc: add support for string substitution with shortcuts (4/4/2000) // (see bug # 29871 for details) @@ -876,7 +876,7 @@ function getShortcutOrURI(url) if (aOffset > 0) { var cmd = url.substr(0, aOffset); var text = url.substr(aOffset+1); - shortcutURL = bmks.FindShortcut(cmd); + shortcutURL = bmks.resolveKeyword(cmd); if (shortcutURL && text) { aOffset = shortcutURL.indexOf("%s"); if (aOffset >= 0) diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js index f38fa83e1dd..ac785578c7d 100644 --- a/xpfe/browser/resources/content/navigator.js +++ b/xpfe/browser/resources/content/navigator.js @@ -114,7 +114,7 @@ function UpdateBookmarksLastVisitedDate(event) gBookmarksService = Components.classes["@mozilla.org/browser/bookmarks-service;1"] .getService(Components.interfaces.nsIBookmarksService); - gBookmarksService.UpdateBookmarkLastVisitedDate(url, _content.document.characterSet); + gBookmarksService.updateLastVisitedDate(url, _content.document.characterSet); } } @@ -126,8 +126,8 @@ function HandleBookmarkIcon(iconURL, addFlag) if (!gBookmarksService) gBookmarksService = Components.classes["@mozilla.org/browser/bookmarks-service;1"] .getService(Components.interfaces.nsIBookmarksService); - if (addFlag) gBookmarksService.UpdateBookmarkIcon(url, iconURL); - else gBookmarksService.RemoveBookmarkIcon(url, iconURL); + if (addFlag) gBookmarksService.updateBookmarkIcon(url, iconURL); + else gBookmarksService.removeBookmarkIcon(url, iconURL); } } @@ -936,7 +936,7 @@ function getShortcutOrURI(url) gBookmarksService = Components.classes["@mozilla.org/browser/bookmarks-service;1"] .getService(Components.interfaces.nsIBookmarksService); - var shortcutURL = gBookmarksService.FindShortcut(url); + var shortcutURL = gBookmarksService.resolveKeyword(url); if (!shortcutURL) { // rjc: add support for string substitution with shortcuts (4/4/2000) // (see bug # 29871 for details) @@ -944,7 +944,7 @@ function getShortcutOrURI(url) if (aOffset > 0) { var cmd = url.substr(0, aOffset); var text = url.substr(aOffset+1); - shortcutURL = gBookmarksService.FindShortcut(cmd); + shortcutURL = gBookmarksService.resolveKeyword(cmd); if (shortcutURL && text) { aOffset = shortcutURL.indexOf("%s"); if (aOffset >= 0) diff --git a/xpfe/browser/resources/content/navigatorDD.js b/xpfe/browser/resources/content/navigatorDD.js index b5d1cb300de..47a2d39a35f 100644 --- a/xpfe/browser/resources/content/navigatorDD.js +++ b/xpfe/browser/resources/content/navigatorDD.js @@ -680,6 +680,6 @@ function insertBookmarkAt(aURL, aTitle, aCharset, aFolderRes, aIndex) const kBMSContractID = "@mozilla.org/browser/bookmarks-service;1"; const kBMSIID = Components.interfaces.nsIBookmarksService; const kBMS = Components.classes[kBMSContractID].getService(kBMSIID); - kBMS.insertBookmarkInFolder(aURL, aTitle, aCharset, aFolderRes, aIndex); + kBMS.createBookmarkEx(aTitle, aURL, aCharset, aFolderRes, aIndex); } diff --git a/xpfe/browser/resources/content/nsBrowserStatusHandler.js b/xpfe/browser/resources/content/nsBrowserStatusHandler.js index 6f9feaf75fa..73bfcc49acf 100644 --- a/xpfe/browser/resources/content/nsBrowserStatusHandler.js +++ b/xpfe/browser/resources/content/nsBrowserStatusHandler.js @@ -176,7 +176,7 @@ nsBrowserStatusHandler.prototype = if (!gBookmarksService) gBookmarksService = Components.classes["@mozilla.org/browser/bookmarks-service;1"] .getService(Components.interfaces.nsIBookmarksService); - gBookmarksService.UpdateBookmarkIcon(this.urlBar.value, aHref); + gBookmarksService.updateBookmarkIcon(this.urlBar.value, aHref); } },