Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1310894 - Remove tags from default Nightly bookmarks. r=dolske

Browse Source
This commit is contained in:
Dão Gottwald 2016-10-19 10:50:15 +02:00
parent df2baaebfd
commit d3de4fc885
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/places/tests/browser/browser_410196_paste_into_tags.js
View File

@ -93,9 +93,7 @@ function focusTag(PlacesOrganizer) {
let fooTag = tags.getChild(0);
let tagNode = fooTag;
PlacesOrganizer._places.selectNode(fooTag);
// Bug 1283076: Nightly has a default 'bug' tag already set
let tagValue = AppConstants.NIGHTLY_BUILD ? 'bug' : 'foo';
is(tagNode.title, tagValue, "tagNode title is " + tagValue);
is(tagNode.title, 'foo', "tagNode title is foo");
let ip = PlacesOrganizer._places.insertionPoint;
ok(ip.isTag, "IP is a tag");
}

4
browser/components/places/tests/browser/browser_423515.js
View File

@ -152,9 +152,7 @@ function test() {
var tagsNode = PlacesUtils.history.executeQuery(query, options).root;
tagsNode.containerOpen = true;
// Bug 1283076: Nightly already has 7 tags set
let tagsCount = AppConstants.NIGHTLY_BUILD ? 8 : 1;
is(tagsNode.childCount, tagsCount, "has new tag");
is(tagsNode.childCount, 1, "has new tag");
var tagNode = tagsNode.getChild(0);

7
browser/components/places/tests/browser/browser_bookmarkProperties_editTagContainer.js
View File

@ -23,10 +23,9 @@ add_task(function* () {
let tree = PlacesOrganizer._places;
let tagsContainer = tree.selectedNode;
tagsContainer.containerOpen = true;
// Bug 1283076: Nightly already has several tags set, position changes
let tagPosition = AppConstants.NIGHTLY_BUILD ? 7 : 0;
let tagNode = tagsContainer.getChild(tagPosition);
tree.selectNode(tagNode);
let fooTag = tagsContainer.getChild(0);
let tagNode = fooTag;
tree.selectNode(fooTag);
is(tagNode.title, 'tag1', "tagNode title is correct");
ok(tree.controller.isCommandEnabled("placesCmd_show:info"),

5
browser/components/places/tests/browser/browser_library_commands.js
View File

@ -205,9 +205,8 @@ add_task(function* test_tags() {
// Now select the tag.
PlacesUtils.asContainer(tagsNode).containerOpen = true;
// Bug 1283076: Nightly already has several tags set, position changes
let tagPosition = AppConstants.NIGHTLY_BUILD ? 7 : 0;
PO._places.selectNode(tagsNode.getChild(tagPosition));
let tag = tagsNode.getChild(0);
PO._places.selectNode(tag);
is(PO._places.selectedNode.title, "test",
"The created tag has been properly selected");

8
browser/locales/generic/profile/bookmarks.html.in
View File

@ -45,12 +45,12 @@
<p><dt><h3>@nightly_heading@</h3></dt>
<dl><p>
<dt><a href="https://blog.nightly.mozilla.org/" icon="@nightly_icon@">@nightly_blog@</a>
<dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz" tags="bug,issue">@bugzilla@</a>
<dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz">@bugzilla@</a>
<dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn">@mdn@</a>
<dt><a href="https://addons.mozilla.org/@AB_CD@/firefox/addon/nightly-tester-tools/" icon="@addon_icon@">@nightly_tester_tools@</a>
<dt><a href="about:crashes" icon="@mozilla_icon@" tags="crash">@crashes@</a>
<dt><a href="https://mibbit.com/?server=irc.mozilla.org&channel=%23nightly" icon="@mozilla_icon@" tags="chat,irc">@irc@</a>
<dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@" tags="planet,news">@planet@</a>
<dt><a href="about:crashes" icon="@mozilla_icon@">@crashes@</a>
<dt><a href="https://mibbit.com/?server=irc.mozilla.org&channel=%23nightly" icon="@mozilla_icon@">@irc@</a>
<dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@">@planet@</a>
</dl>
#endif
</dl>