summaryrefslogtreecommitdiffstats
path: root/application/palemoon/components/places/content
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-11-19 11:49:06 +0100
committerGitHub <noreply@github.com>2018-11-19 11:49:06 +0100
commitbe53c078d2c0fb31cbbc13cba2b14b9805a5df68 (patch)
tree0f74c023b0105f04d782f63434bf6dfaf83be9a4 /application/palemoon/components/places/content
parentf4908ce993e54f96876ec3abc2cd0192d4f1230c (diff)
parentb32323fae434bad270dd22f5a5d4da61101703ed (diff)
downloadUXP-be53c078d2c0fb31cbbc13cba2b14b9805a5df68.tar
UXP-be53c078d2c0fb31cbbc13cba2b14b9805a5df68.tar.gz
UXP-be53c078d2c0fb31cbbc13cba2b14b9805a5df68.tar.lz
UXP-be53c078d2c0fb31cbbc13cba2b14b9805a5df68.tar.xz
UXP-be53c078d2c0fb31cbbc13cba2b14b9805a5df68.zip
Merge pull request #873 from JustOff/PR_bm_folders_copy_paste
[PALEMOON] Align the places component with the updated PlacesUtils API
Diffstat (limited to 'application/palemoon/components/places/content')
-rw-r--r--application/palemoon/components/places/content/controller.js17
1 files changed, 8 insertions, 9 deletions
diff --git a/application/palemoon/components/places/content/controller.js b/application/palemoon/components/places/content/controller.js
index 7f27e8347..7f5f7f652 100644
--- a/application/palemoon/components/places/content/controller.js
+++ b/application/palemoon/components/places/content/controller.js
@@ -1287,15 +1287,15 @@ PlacesController.prototype = {
if (!didSuppressNotifications)
result.suppressNotifications = true;
- function addData(type, index, overrideURI) {
- let wrapNode = PlacesUtils.wrapNode(node, type, overrideURI, doCopy);
+ function addData(type, index, feedURI) {
+ let wrapNode = PlacesUtils.wrapNode(node, type, feedURI);
dt.mozSetDataAt(type, wrapNode, index);
}
- function addURIData(index, overrideURI) {
- addData(PlacesUtils.TYPE_X_MOZ_URL, index, overrideURI);
- addData(PlacesUtils.TYPE_UNICODE, index, overrideURI);
- addData(PlacesUtils.TYPE_HTML, index, overrideURI);
+ function addURIData(index, feedURI) {
+ addData(PlacesUtils.TYPE_X_MOZ_URL, index, feedURI);
+ addData(PlacesUtils.TYPE_UNICODE, index, feedURI);
+ addData(PlacesUtils.TYPE_HTML, index, feedURI);
}
try {
@@ -1387,12 +1387,11 @@ PlacesController.prototype = {
copiedFolders.push(node);
let livemarkInfo = this.getCachedLivemarkInfo(node);
- let overrideURI = livemarkInfo ? livemarkInfo.feedURI.spec : null;
- let resolveShortcuts = !PlacesControllerDragHelper.canMoveNode(node);
+ let feedURI = livemarkInfo && livemarkInfo.feedURI.spec;
contents.forEach(function (content) {
content.entries.push(
- PlacesUtils.wrapNode(node, content.type, overrideURI, resolveShortcuts)
+ PlacesUtils.wrapNode(node, content.type, feedURI)
);
});
}, this);