summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2017-08-15 16:23:20 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-03-11 16:15:52 +0100
commiteda34d02aa8159def0d811846e9417c37cea15cd (patch)
tree8b03982c4650fb76856917c615fddc6e40dfd02d /toolkit
parent1275cfecf8608fd8724ba8ac94349f10e266582e (diff)
downloadUXP-eda34d02aa8159def0d811846e9417c37cea15cd.tar
UXP-eda34d02aa8159def0d811846e9417c37cea15cd.tar.gz
UXP-eda34d02aa8159def0d811846e9417c37cea15cd.tar.lz
UXP-eda34d02aa8159def0d811846e9417c37cea15cd.tar.xz
UXP-eda34d02aa8159def0d811846e9417c37cea15cd.zip
[minor fix] Places - deleting folder of livemarks - nsLivemarkService.js - 0x80070057 (NS_ERROR_ILLEGAL_VALUE)
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/components/places/PlacesUtils.jsm9
1 files changed, 7 insertions, 2 deletions
diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm
index 4b7bcb82a..fc303ca8a 100644
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -53,6 +53,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
"resource://gre/modules/AsyncShutdown.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PlacesSyncUtils",
"resource://gre/modules/PlacesSyncUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUIUtils",
+ "resource:///modules/PlacesUIUtils.jsm");
// The minimum amount of transactions before starting a batch. Usually we do
// do incremental updates, a batch will cause views to completely
@@ -3248,8 +3250,11 @@ PlacesRemoveItemTransaction.prototype = {
let contents =
PlacesUtils.getFolderContents(this.item.id, false, false).root;
for (let i = 0; i < contents.childCount; ++i) {
- let txn = new PlacesRemoveItemTransaction(contents.getChild(i).itemId);
- transactions.push(txn);
+ let childId = contents.getChild(i).itemId;
+ if (!PlacesUIUtils._isLivemark(childId)) {
+ let txn = new PlacesRemoveItemTransaction(childId);
+ transactions.push(txn);
+ }
}
contents.containerOpen = false;
// Reverse transactions to preserve parent-child relationship.