From 4adf46bd77a055d4bf5078e45a800f6217ff7d08 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Thu, 5 Feb 2009 16:22:00 +0000 Subject: [PATCH] CCK - NPOB - Fix separator and some positioning git-svn-id: svn://10.0.0.236/trunk@256116 18797224-902f-48f8-a5cc-f745e15eee43 --- .../cckwizard/srcfiles/cckService.js.in | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in b/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in index 0e09f2ea006..2354a51ae15 100755 --- a/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in +++ b/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in @@ -295,19 +295,19 @@ CCKService.prototype = { BookmarkTitle = this.getString(prefix + "BookmarkTitle" + i); if (BookmarkTitle) { BookmarkURL = this.getString(prefix + "BookmarkURL" + i); - if (BookmarkURL) { - var bmtype = this.getString(prefix + "BookmarkType" + i); - var curitem; + var bmtype = this.getString(prefix + "BookmarkType" + i); + var curitem; + if (bmtype == "separator") { + curitem = this.bookmarks.insertSeparator(container, location); + } else if (BookmarkURL) { if (bmtype == "live") { - curitem = this.livemarks.createLivemark(container, BookmarkTitle, null, this.makeURI(BookmarkURL), -1); - } else if (bmtype == "separator") { - curitem = this.bookmarks.insertSeparator(container, -1); - } else { + curitem = this.livemarks.createLivemark(container, BookmarkTitle, null, this.makeURI(BookmarkURL), location); + }else { curitem = this.bookmarks.insertBookmark(container, this.makeURI(BookmarkURL), location, BookmarkTitle); } - if (curitem) { - this.annoService.setItemAnnotation(curitem, inId, "true", 0, this.annoService.EXPIRE_NEVER); - } + } + if (curitem) { + this.annoService.setItemAnnotation(curitem, inId, "true", 0, this.annoService.EXPIRE_NEVER); } } }