Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1160864 - The description field is not shown when editing a read-only container child in the Library. r=mano

Browse Source
This commit is contained in:
Marco Bonardo 2015-05-08 12:43:29 +02:00
parent 8f3d7648d5
commit a4a2afd118
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
browser/components/places/content/editBookmarkOverlay.js
View File

@ -82,12 +82,18 @@ let gEditItemOverlay = {
// Check if the pane is initialized to show only read-only fields.
get readOnly() {
// Bug 1120314 - Folder shortcuts are read-only due to some quirky implementation
// details (the most important being the "smart" semantics of node.title).
return (!this.initialized ||
(!this._paneInfo.visibleRows.has("tagsRow") &&
(this._paneInfo.isFolderShortcut ||
this._paneInfo.isParentReadOnly)));
// TODO (Bug 1120314): Folder shortcuts are currently read-only due to some
// quirky implementation details (the most important being the "smart"
// semantics of node.title that makes hard to edit the right entry).
// This pane is read-only if:
// * the panel is not initialized
// * the node is a folder shortcut
// * the node is not bookmarked
// * the node is child of a read-only container and is not a bookmarked URI
return !this.initialized ||
this._paneInfo.isFolderShortcut ||
!this._paneInfo.isItem ||
(this._paneInfo.isParentReadOnly && !this._paneInfo.isBookmark);
},
// the first field which was edited after this panel was initialized for
@ -189,17 +195,20 @@ let gEditItemOverlay = {
showOrCollapse("locationRow", isURI, "location");
if (isURI) {
this._initLocationField();
this._locationField.readOnly = !this._paneInfo.isItem;
this._locationField.readOnly = !this.readOnly;
}
if (showOrCollapse("descriptionRow",
this._paneInfo.isItem && !this.readOnly,
// hide the description field for
if (showOrCollapse("descriptionRow", isItem && !this.readOnly,
"description")) {
this._initDescriptionField();
this._descriptionField.readOnly = this.readOnly;
}
if (showOrCollapse("keywordRow", isBookmark, "keyword"))
if (showOrCollapse("keywordRow", isBookmark, "keyword")) {
this._initKeywordField();
this._keywordField.readOnly = this.readOnly;
}
// Collapse the tag selector if the item does not accept tags.
if (showOrCollapse("tagsRow", isURI || bulkTagging, "tags"))
@ -358,7 +367,7 @@ let gEditItemOverlay = {
// Hide the folders-separator if no folder is annotated as recently-used
this._element("foldersSeparator").hidden = (menupopup.childNodes.length <= 6);
this._folderMenuList.disabled = this._readOnly;
this._folderMenuList.disabled = this.readOnly;
},
QueryInterface:
@ -390,7 +399,7 @@ let gEditItemOverlay = {
},
onTagsFieldChange() {
if (!this.readOnly) {
if (this._paneInfo.isURI || this._paneInfo.bulkTagging) {
this._updateTags().then(
anyChanges => {
if (anyChanges)