summaryrefslogtreecommitdiffstats
path: root/application/palemoon/components/places/content
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-05-02 13:46:17 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-05-02 13:46:17 +0200
commit815cb2f40490907a43cf394d2aabb960e7ec6df1 (patch)
tree7d2fecf9afd5d9c9162acd7d0467246895ec4391 /application/palemoon/components/places/content
parent61de1c80cdc6c04e71fde07cc5028af503438134 (diff)
downloadUXP-815cb2f40490907a43cf394d2aabb960e7ec6df1.tar
UXP-815cb2f40490907a43cf394d2aabb960e7ec6df1.tar.gz
UXP-815cb2f40490907a43cf394d2aabb960e7ec6df1.tar.lz
UXP-815cb2f40490907a43cf394d2aabb960e7ec6df1.tar.xz
UXP-815cb2f40490907a43cf394d2aabb960e7ec6df1.zip
[PALEMOON] [frontend vs backend] Places - Fix: "Keyword" reset (to an empty value) does not work
Issue #121
Diffstat (limited to 'application/palemoon/components/places/content')
-rw-r--r--application/palemoon/components/places/content/editBookmarkOverlay.js21
1 files changed, 12 insertions, 9 deletions
diff --git a/application/palemoon/components/places/content/editBookmarkOverlay.js b/application/palemoon/components/places/content/editBookmarkOverlay.js
index 43645cc73..1b9765bb4 100644
--- a/application/palemoon/components/places/content/editBookmarkOverlay.js
+++ b/application/palemoon/components/places/content/editBookmarkOverlay.js
@@ -12,6 +12,7 @@ var gEditItemOverlay = {
_uris: [],
_tags: [],
_allTags: [],
+ _keyword: null,
_multiEdit: false,
_itemType: -1,
_readOnly: false,
@@ -139,9 +140,8 @@ var gEditItemOverlay = {
this._itemType = PlacesUtils.bookmarks.getItemType(this._itemId);
if (this._itemType == Ci.nsINavBookmarksService.TYPE_BOOKMARK) {
this._uri = PlacesUtils.bookmarks.getBookmarkURI(this._itemId);
- this._initTextField("keywordField",
- PlacesUtils.bookmarks
- .getKeywordForBookmark(this._itemId));
+ this._keyword = PlacesUtils.bookmarks.getKeywordForBookmark(this._itemId);
+ this._initTextField("keywordField", this._keyword);
this._element("loadInSidebarCheckbox").checked =
PlacesUtils.annotations.itemHasAnnotation(this._itemId,
PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO);
@@ -610,9 +610,13 @@ var gEditItemOverlay = {
},
onKeywordFieldBlur: function EIO_onKeywordFieldBlur() {
- var keyword = this._element("keywordField").value;
- if (keyword != PlacesUtils.bookmarks.getKeywordForBookmark(this._itemId)) {
- var txn = new PlacesEditBookmarkKeywordTransaction(this._itemId, keyword);
+ let oldKeyword = this._keyword;
+ let keyword = this._keyword = this._element("keywordField").value;
+ if (keyword != oldKeyword) {
+ var txn = new PlacesEditBookmarkKeywordTransaction(this._itemId,
+ keyword,
+ null,
+ oldKeyword);
PlacesUtils.transactionManager.doTransaction(txn);
}
},
@@ -1004,9 +1008,8 @@ var gEditItemOverlay = {
}
break;
case "keyword":
- this._initTextField("keywordField",
- PlacesUtils.bookmarks
- .getKeywordForBookmark(this._itemId));
+ this._keyword = PlacesUtils.bookmarks.getKeywordForBookmark(this._itemId);
+ this._initTextField("keywordField", this._keyword);
break;
case PlacesUIUtils.DESCRIPTION_ANNO:
this._initTextField("descriptionField",