зеркало из https://github.com/mozilla/gecko-dev.git
Bug 892073 - Remove unused Panel UI
--HG-- extra : rebase_source : d671b83d5a80ce0c34efb99d887ae9fa885e08d4
This commit is contained in:
Rodrigo Silveira
Родитель
c51eaa5101
Коммит
7569d6b02f
|
|
@ -122,25 +122,3 @@ let RemoteTabsStartView = {
|
|||
this._grid.arrangeItems();
|
||||
}
|
||||
};
|
||||
|
||||
let RemoteTabsPanelView = {
|
||||
_view: null,
|
||||
|
||||
get _grid() { return document.getElementById("remotetabs-list"); },
|
||||
get visible() { return PanelUI.isPaneVisible("remotetabs-container"); },
|
||||
|
||||
init: function init() {
|
||||
//decks are fragile, don't hide the tab panel(bad things happen), hide link in menu.
|
||||
let snappedEntry = document.getElementById("snappedRemoteTabsLabel");
|
||||
let uiList = [snappedEntry];
|
||||
this._view = new RemoteTabsView(this._grid, uiList);
|
||||
},
|
||||
|
||||
show: function show() {
|
||||
this._grid.arrangeItems();
|
||||
},
|
||||
|
||||
uninit: function uninit() {
|
||||
this._view.destruct();
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -370,26 +370,6 @@ var BookmarksStartView = {
|
|||
}
|
||||
};
|
||||
|
||||
var BookmarksPanelView = {
|
||||
_view: null,
|
||||
|
||||
get _grid() { return document.getElementById("bookmarks-list"); },
|
||||
get visible() { return PanelUI.isPaneVisible("bookmarks-container"); },
|
||||
|
||||
init: function init() {
|
||||
this._view = new BookmarksView(this._grid, null, Bookmarks.metroRoot);
|
||||
},
|
||||
|
||||
show: function show() {
|
||||
this._view.getBookmarks(true);
|
||||
this._grid.arrangeItems();
|
||||
},
|
||||
|
||||
uninit: function uninit() {
|
||||
this._view.destruct();
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Observes bookmark changes and keeps a linked BookmarksView updated.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -123,12 +123,10 @@ let ScriptContexts = {};
|
|||
["ContextCommands", "chrome://browser/content/ContextCommands.js"],
|
||||
["Bookmarks", "chrome://browser/content/bookmarks.js"],
|
||||
["Downloads", "chrome://browser/content/downloads.js"],
|
||||
["BookmarksPanelView", "chrome://browser/content/bookmarks.js"],
|
||||
["ConsolePanelView", "chrome://browser/content/console.js"],
|
||||
["BookmarksStartView", "chrome://browser/content/bookmarks.js"],
|
||||
["HistoryView", "chrome://browser/content/history.js"],
|
||||
["HistoryStartView", "chrome://browser/content/history.js"],
|
||||
["HistoryPanelView", "chrome://browser/content/history.js"],
|
||||
["Site", "chrome://browser/content/Site.js"],
|
||||
["TopSites", "chrome://browser/content/TopSites.js"],
|
||||
["TopSitesView", "chrome://browser/content/TopSites.js"],
|
||||
|
|
@ -142,7 +140,6 @@ let ScriptContexts = {};
|
|||
["FlyoutPanelsUI", "chrome://browser/content/flyouts/flyoutUI.js"],
|
||||
#ifdef MOZ_SERVICES_SYNC
|
||||
["RemoteTabsView", "chrome://browser/content/RemoteTabs.js"],
|
||||
["RemoteTabsPanelView", "chrome://browser/content/RemoteTabs.js"],
|
||||
["RemoteTabsStartView", "chrome://browser/content/RemoteTabs.js"],
|
||||
#endif
|
||||
].forEach(function (aScript) {
|
||||
|
|
|
|||
|
|
@ -1230,10 +1230,7 @@ var PanelUI = {
|
|||
},
|
||||
|
||||
views: {
|
||||
"bookmarks-container": "BookmarksPanelView",
|
||||
"console-container": "ConsolePanelView",
|
||||
"remotetabs-container": "RemoteTabsPanelView",
|
||||
"history-container" : "HistoryPanelView"
|
||||
},
|
||||
|
||||
init: function() {
|
||||
|
|
|
|||
|
|
@ -292,22 +292,3 @@ let HistoryStartView = {
|
|||
this._view.destruct();
|
||||
}
|
||||
};
|
||||
|
||||
let HistoryPanelView = {
|
||||
_view: null,
|
||||
get _grid() { return document.getElementById("history-list"); },
|
||||
get visible() { return PanelUI.isPaneVisible("history-container"); },
|
||||
|
||||
show: function show() {
|
||||
this._view.populateGrid(true);
|
||||
this._grid.arrangeItems();
|
||||
},
|
||||
|
||||
init: function init() {
|
||||
this._view = new HistoryView(this._grid, StartUI.maxResultsPerSection, false);
|
||||
},
|
||||
|
||||
uninit: function uninit() {
|
||||
this._view.destruct();
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
"use strict";
|
||||
|
||||
let gStartView = BookmarksStartView._view;
|
||||
let gPanelView = BookmarksPanelView._view;
|
||||
|
||||
function test() {
|
||||
runTests();
|
||||
|
|
@ -65,7 +64,6 @@ var BookmarksTestHelper = {
|
|||
|
||||
// Simulate observer notification
|
||||
gStartView._changes.onItemRemoved(aId, gStartView._root);
|
||||
gPanelView._changes.onItemRemoved(aId, gPanelView._root);
|
||||
},
|
||||
},
|
||||
|
||||
|
|
@ -100,24 +98,18 @@ var BookmarksTestHelper = {
|
|||
|
||||
this._originalNavHistoryService = gStartView._navHistoryService;
|
||||
gStartView._navHistoryService = this.MockNavHistoryService;
|
||||
gPanelView._navHistoryService = this.MockNavHistoryService;
|
||||
|
||||
this._originalBookmarkService = gStartView._bookmarkService;
|
||||
gStartView._bookmarkService= this.MockBookmarkService;
|
||||
gPanelView._bookmarkService= this.MockBookmarkService;
|
||||
|
||||
this._originalPinHelper = gStartView._pinHelper;
|
||||
gStartView._pinHelper = this.MockPinHelper;
|
||||
gPanelView._pinHelper = this.MockPinHelper;
|
||||
|
||||
this._originalUpdateFavicon = gStartView._updateFavicon;
|
||||
gStartView._updateFavicon = function () {};
|
||||
gPanelView._updateFavicon = function () {};
|
||||
|
||||
gStartView.clearBookmarks();
|
||||
gStartView.getBookmarks();
|
||||
gPanelView.clearBookmarks();
|
||||
gPanelView.getBookmarks();
|
||||
},
|
||||
|
||||
restore: function () {
|
||||
|
|
@ -126,15 +118,8 @@ var BookmarksTestHelper = {
|
|||
gStartView._pinHelper = this._originalPinHelper;
|
||||
gStartView._updateFavicon = this._originalUpdateFavicon;
|
||||
|
||||
gPanelView._navHistoryService = this._originalNavHistoryService;
|
||||
gPanelView._bookmarkService= this._originalBookmarkService;
|
||||
gPanelView._pinHelper = this._originalPinHelper;
|
||||
gPanelView._updateFavicon = this._originalUpdateFavicon;
|
||||
|
||||
gStartView.clearBookmarks();
|
||||
gStartView.getBookmarks();
|
||||
gPanelView.clearBookmarks();
|
||||
gPanelView.getBookmarks();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -350,215 +335,3 @@ gTests.push({
|
|||
ok(gStartView._set.itemCount === gStartView._limit - 1, "Grid repopulated");
|
||||
}
|
||||
});
|
||||
|
||||
gTests.push({
|
||||
desc: "Test bookmarks PanelUI unpin",
|
||||
setUp: setup,
|
||||
tearDown: tearDown,
|
||||
run: function testBookmarksPanelUnpin() {
|
||||
PanelUI.show('bookmarks-container');
|
||||
|
||||
let pinButton = document.getElementById("pin-selected-button");
|
||||
let unpinButton = document.getElementById("unpin-selected-button");
|
||||
|
||||
// --------- unpin item 2
|
||||
|
||||
let item = gPanelView._getItemForBookmarkId(2);
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item, 10, 10);
|
||||
yield promise;
|
||||
|
||||
yield waitForCondition(() => !unpinButton.hidden);
|
||||
|
||||
ok(!unpinButton.hidden, "Unpin button is visible.");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
EventUtils.synthesizeMouse(unpinButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item = gPanelView._getItemForBookmarkId(2);
|
||||
let startItem = gStartView._getItemForBookmarkId(2);
|
||||
|
||||
ok(item, "Item is in grid");
|
||||
ok(!startItem, "Item not in start grid");
|
||||
ok(!gPanelView._pinHelper.isPinned(2), "Item unpinned");
|
||||
|
||||
// --------- unpin multiple items
|
||||
|
||||
let item1 = gPanelView._getItemForBookmarkId(0);
|
||||
let item2 = gPanelView._getItemForBookmarkId(5);
|
||||
let item3 = gPanelView._getItemForBookmarkId(12);
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item1, 10, 10);
|
||||
sendContextMenuClickToElement(window, item2, 10, 10);
|
||||
sendContextMenuClickToElement(window, item3, 10, 10);
|
||||
yield promise;
|
||||
|
||||
ok(!unpinButton.hidden, "Unpin button is visible.");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
EventUtils.synthesizeMouse(unpinButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item1 = gPanelView._getItemForBookmarkId(0);
|
||||
item2 = gPanelView._getItemForBookmarkId(5);
|
||||
item3 = gPanelView._getItemForBookmarkId(12);
|
||||
let startItem1 = gStartView._getItemForBookmarkId(0);
|
||||
let startItem2 = gStartView._getItemForBookmarkId(5);
|
||||
let startItem3 = gStartView._getItemForBookmarkId(12);
|
||||
|
||||
ok(item1 && item2 && item3, "Items are in grid");
|
||||
ok(!startItem1 && !startItem2 && !startItem3, "Items are not in start grid");
|
||||
ok(!gPanelView._pinHelper.isPinned(0) && !gPanelView._pinHelper.isPinned(5) && !gPanelView._pinHelper.isPinned(12) , "Items unpinned");
|
||||
|
||||
// --------- pin item 2
|
||||
|
||||
let item = gPanelView._getItemForBookmarkId(2);
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item, 10, 10);
|
||||
yield promise;
|
||||
|
||||
// Make sure app bar is updated
|
||||
yield waitForCondition(() => !pinButton.hidden);
|
||||
|
||||
ok(!pinButton.hidden, "Pin button is visible.");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
EventUtils.synthesizeMouse(pinButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item = gPanelView._getItemForBookmarkId(2);
|
||||
let startItem = gStartView._getItemForBookmarkId(2);
|
||||
|
||||
ok(item, "Item is in grid");
|
||||
ok(startItem, "Item is back in start grid");
|
||||
ok(gPanelView._pinHelper.isPinned(2), "Item pinned");
|
||||
|
||||
// --------- pin multiple items
|
||||
|
||||
let item1 = gPanelView._getItemForBookmarkId(0);
|
||||
let item2 = gPanelView._getItemForBookmarkId(5);
|
||||
let item3 = gPanelView._getItemForBookmarkId(12);
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item1, 10, 10);
|
||||
sendContextMenuClickToElement(window, item2, 10, 10);
|
||||
sendContextMenuClickToElement(window, item3, 10, 10);
|
||||
yield promise;
|
||||
|
||||
// Make sure app bar is updated
|
||||
yield waitForCondition(() => !pinButton.hidden);
|
||||
|
||||
ok(!pinButton.hidden, "pin button is visible.");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
EventUtils.synthesizeMouse(pinButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item1 = gPanelView._getItemForBookmarkId(0);
|
||||
item2 = gPanelView._getItemForBookmarkId(5);
|
||||
item3 = gPanelView._getItemForBookmarkId(12);
|
||||
let startItem1 = gStartView._getItemForBookmarkId(0);
|
||||
let startItem2 = gStartView._getItemForBookmarkId(5);
|
||||
let startItem3 = gStartView._getItemForBookmarkId(12);
|
||||
|
||||
ok(item1 && item2 && item3, "Items are in grid");
|
||||
ok(startItem1 && startItem2 && startItem3, "Items are back in start grid");
|
||||
ok(gPanelView._pinHelper.isPinned(0) && gPanelView._pinHelper.isPinned(5) && gPanelView._pinHelper.isPinned(12) , "Items pinned");
|
||||
}
|
||||
});
|
||||
|
||||
gTests.push({
|
||||
desc: "Test bookmarks PanelUI delete",
|
||||
setUp: setup,
|
||||
tearDown: tearDown,
|
||||
run: function testBookmarksPanelDelete() {
|
||||
PanelUI.show('bookmarks-container');
|
||||
|
||||
let restoreButton = document.getElementById("restore-selected-button");
|
||||
let deleteButton = document.getElementById("delete-selected-button");
|
||||
|
||||
// --------- delete item 2
|
||||
|
||||
let item = gPanelView._getItemForBookmarkId(2);
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item, 10, 10);
|
||||
yield promise;
|
||||
|
||||
ok(!deleteButton.hidden, "Delete button is visible.");
|
||||
|
||||
let promise = waitForCondition(() => !restoreButton.hidden);
|
||||
EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item = gPanelView._getItemForBookmarkId(2);
|
||||
let startItem = gStartView._getItemForBookmarkId(2);
|
||||
|
||||
ok(!item, "Item is not in grid");
|
||||
ok(startItem, "Item is not deleted from start grid yet");
|
||||
ok(BookmarksTestHelper._nodes[2], "Item exists");
|
||||
ok(!restoreButton.hidden, "Restore button is visible.");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
Elements.contextappbar.dismiss();
|
||||
yield promise;
|
||||
|
||||
item = gPanelView._getItemForBookmarkId(2);
|
||||
startItem = gStartView._getItemForBookmarkId(2);
|
||||
|
||||
ok(!item, "Item gone from grid");
|
||||
ok(!startItem, "Item gone from start grid");
|
||||
ok(!BookmarksTestHelper._nodes[2], "Item RIP");
|
||||
|
||||
// --------- delete multiple items
|
||||
|
||||
let item1 = gPanelView._getItemForBookmarkId(0);
|
||||
let item2 = gPanelView._getItemForBookmarkId(5);
|
||||
let item3 = gPanelView._getItemForBookmarkId(12);
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item1, 10, 10);
|
||||
sendContextMenuClickToElement(window, item2, 10, 10);
|
||||
sendContextMenuClickToElement(window, item3, 10, 10);
|
||||
yield promise;
|
||||
|
||||
ok(!deleteButton.hidden, "Delete button is visible.");
|
||||
|
||||
let promise = waitForCondition(() => !restoreButton.hidden);
|
||||
EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item1 = gPanelView._getItemForBookmarkId(0);
|
||||
item2 = gPanelView._getItemForBookmarkId(5);
|
||||
item3 = gPanelView._getItemForBookmarkId(12);
|
||||
let startItem1 = gStartView._getItemForBookmarkId(0);
|
||||
let startItem2 = gStartView._getItemForBookmarkId(5);
|
||||
let startItem3 = gStartView._getItemForBookmarkId(12);
|
||||
|
||||
ok(!restoreButton.hidden, "Restore button is visible.");
|
||||
ok(!item1 && !item2 && !item3, "Items are not in grid");
|
||||
ok(startItem1 && startItem2 && startItem3, "Items are still in start grid");
|
||||
ok(BookmarksTestHelper._nodes[0] && BookmarksTestHelper._nodes[5] && BookmarksTestHelper._nodes[12],
|
||||
"Items not deleted yet");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
Elements.contextappbar.dismiss();
|
||||
yield promise;
|
||||
|
||||
item1 = gPanelView._getItemForBookmarkId(0);
|
||||
item2 = gPanelView._getItemForBookmarkId(5);
|
||||
item3 = gPanelView._getItemForBookmarkId(12);
|
||||
let startItem1 = gStartView._getItemForBookmarkId(0);
|
||||
let startItem2 = gStartView._getItemForBookmarkId(5);
|
||||
let startItem3 = gStartView._getItemForBookmarkId(12);
|
||||
|
||||
ok(!item1 && !item2 && !item3, "Items are gone from grid");
|
||||
ok(!startItem1 && !startItem2 && !startItem3, "Items are gone from start grid");
|
||||
ok(!BookmarksTestHelper._nodes[0] && !BookmarksTestHelper._nodes[5] && !BookmarksTestHelper._nodes[12],
|
||||
"Items are gone for good");
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
"use strict";
|
||||
|
||||
let gStartView = HistoryStartView._view;
|
||||
let gPanelView = HistoryPanelView._view;
|
||||
|
||||
function test() {
|
||||
runTests();
|
||||
|
|
@ -71,7 +70,6 @@ var HistoryTestHelper = {
|
|||
|
||||
// Simulate observer notification
|
||||
gStartView.onDeleteURI(aURI);
|
||||
gPanelView.onDeleteURI(aURI);
|
||||
},
|
||||
},
|
||||
|
||||
|
|
@ -106,20 +104,15 @@ var HistoryTestHelper = {
|
|||
|
||||
this._originalNavHistoryService = gStartView._navHistoryService;
|
||||
gStartView._navHistoryService = this.MockNavHistoryService;
|
||||
gPanelView._navHistoryService = this.MockNavHistoryService;
|
||||
|
||||
this._originalHistoryService = gStartView._historyService;
|
||||
gStartView._historyService= this.MockHistoryService;
|
||||
gPanelView._historyService= this.MockHistoryService;
|
||||
|
||||
this._originalPinHelper = gStartView._pinHelper;
|
||||
gStartView._pinHelper = this.MockPinHelper;
|
||||
gPanelView._pinHelper = this.MockPinHelper;
|
||||
|
||||
gStartView._set.clearAll();
|
||||
gStartView.populateGrid();
|
||||
gPanelView._set.clearAll();
|
||||
gPanelView.populateGrid();
|
||||
},
|
||||
|
||||
restore: function () {
|
||||
|
|
@ -127,14 +120,8 @@ var HistoryTestHelper = {
|
|||
gStartView._historyService= this._originalHistoryService;
|
||||
gStartView._pinHelper = this._originalPinHelper;
|
||||
|
||||
gPanelView._navHistoryService = this._originalNavHistoryService;
|
||||
gPanelView._historyService= this._originalHistoryService;
|
||||
gPanelView._pinHelper = this._originalPinHelper;
|
||||
|
||||
gStartView._set.clearAll();
|
||||
gStartView.populateGrid();
|
||||
gPanelView._set.clearAll();
|
||||
gPanelView.populateGrid();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -363,218 +350,3 @@ gTests.push({
|
|||
ok(gStartView._set.itemCount === gStartView._limit - 1, "Grid repopulated");
|
||||
}
|
||||
});
|
||||
|
||||
gTests.push({
|
||||
desc: "Test history PanelUI unpin",
|
||||
setUp: setup,
|
||||
tearDown: tearDown,
|
||||
run: function testHistoryPanelUnpin() {
|
||||
PanelUI.show('history-container');
|
||||
|
||||
let pinButton = document.getElementById("pin-selected-button");
|
||||
let unpinButton = document.getElementById("unpin-selected-button");
|
||||
|
||||
// --------- unpin item 2
|
||||
|
||||
let item = gPanelView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item, 10, 10);
|
||||
yield promise;
|
||||
|
||||
yield waitForCondition(() => !unpinButton.hidden);
|
||||
|
||||
ok(!unpinButton.hidden, "Unpin button is visible.");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
EventUtils.synthesizeMouse(unpinButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item = gPanelView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
let startItem = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
|
||||
ok(item, "Item is in grid");
|
||||
ok(!startItem, "Item not in start grid");
|
||||
ok(!gPanelView._pinHelper.isPinned(uriFromIndex(2)), "Item unpinned");
|
||||
|
||||
// --------- unpin multiple items
|
||||
|
||||
let item1 = gPanelView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
let item2 = gPanelView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
let item3 = gPanelView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
|
||||
scrollToEnd();
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item1, 10, 10);
|
||||
sendContextMenuClickToElement(window, item2, 10, 10);
|
||||
sendContextMenuClickToElement(window, item3, 10, 10);
|
||||
yield promise;
|
||||
|
||||
ok(!unpinButton.hidden, "Unpin button is visible.");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
EventUtils.synthesizeMouse(unpinButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item1 = gPanelView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
item2 = gPanelView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
item3 = gPanelView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
let startItem1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
let startItem2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
let startItem3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
|
||||
ok(item1 && item2 && item3, "Items are in grid");
|
||||
ok(!startItem1 && !startItem2 && !startItem3, "Items are not in start grid");
|
||||
ok(!gPanelView._pinHelper.isPinned(uriFromIndex(0)) && !gPanelView._pinHelper.isPinned(uriFromIndex(5)) && !gPanelView._pinHelper.isPinned(uriFromIndex(12)) , "Items unpinned");
|
||||
|
||||
// --------- pin item 2
|
||||
|
||||
let item = gPanelView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item, 10, 10);
|
||||
yield promise;
|
||||
|
||||
// Make sure app bar is updated
|
||||
yield waitForCondition(() => !pinButton.hidden);
|
||||
|
||||
ok(!pinButton.hidden, "Pin button is visible.");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
EventUtils.synthesizeMouse(pinButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item = gPanelView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
let startItem = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
|
||||
ok(item, "Item is in grid");
|
||||
ok(startItem, "Item is back in start grid");
|
||||
ok(gPanelView._pinHelper.isPinned(uriFromIndex(2)), "Item pinned");
|
||||
|
||||
// --------- pin multiple items
|
||||
|
||||
let item1 = gPanelView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
let item2 = gPanelView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
let item3 = gPanelView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
|
||||
scrollToEnd();
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item1, 10, 10);
|
||||
sendContextMenuClickToElement(window, item2, 10, 10);
|
||||
sendContextMenuClickToElement(window, item3, 10, 10);
|
||||
yield promise;
|
||||
|
||||
// Make sure app bar is updated
|
||||
yield waitForCondition(() => !pinButton.hidden);
|
||||
|
||||
ok(!pinButton.hidden, "pin button is visible.");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
EventUtils.synthesizeMouse(pinButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item1 = gPanelView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
item2 = gPanelView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
item3 = gPanelView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
let startItem1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
let startItem2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
let startItem3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
|
||||
ok(item1 && item2 && item3, "Items are in grid");
|
||||
ok(startItem1 && startItem2 && startItem3, "Items are back in start grid");
|
||||
ok(gPanelView._pinHelper.isPinned(uriFromIndex(0)) && gPanelView._pinHelper.isPinned(uriFromIndex(5)) && gPanelView._pinHelper.isPinned(uriFromIndex(12)) , "Items pinned");
|
||||
}
|
||||
});
|
||||
|
||||
gTests.push({
|
||||
desc: "Test history PanelUI delete",
|
||||
setUp: setup,
|
||||
tearDown: tearDown,
|
||||
run: function testHistoryPanelDelete() {
|
||||
PanelUI.show('history-container');
|
||||
|
||||
let restoreButton = document.getElementById("restore-selected-button");
|
||||
let deleteButton = document.getElementById("delete-selected-button");
|
||||
|
||||
// --------- delete item 2
|
||||
|
||||
let item = gPanelView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item, 10, 10);
|
||||
yield promise;
|
||||
|
||||
ok(!deleteButton.hidden, "Delete button is visible.");
|
||||
|
||||
let promise = waitForCondition(() => !restoreButton.hidden);
|
||||
EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item = gPanelView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
let startItem = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
|
||||
ok(!item, "Item is not in grid");
|
||||
ok(startItem, "Item is not deleted from start grid yet");
|
||||
ok(HistoryTestHelper._nodes[uriFromIndex(2)], "Item exists");
|
||||
ok(!restoreButton.hidden, "Restore button is visible.");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
Elements.contextappbar.dismiss();
|
||||
yield promise;
|
||||
|
||||
item = gPanelView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
startItem = gStartView._set.getItemsByUrl(uriFromIndex(2))[0];
|
||||
|
||||
ok(!item, "Item gone from grid");
|
||||
ok(!startItem, "Item gone from start grid");
|
||||
ok(!HistoryTestHelper._nodes[uriFromIndex(2)], "Item RIP");
|
||||
|
||||
// --------- delete multiple items
|
||||
|
||||
let item1 = gPanelView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
let item2 = gPanelView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
let item3 = gPanelView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
|
||||
scrollToEnd();
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
sendContextMenuClickToElement(window, item1, 10, 10);
|
||||
sendContextMenuClickToElement(window, item2, 10, 10);
|
||||
sendContextMenuClickToElement(window, item3, 10, 10);
|
||||
yield promise;
|
||||
|
||||
ok(!deleteButton.hidden, "Delete button is visible.");
|
||||
|
||||
let promise = waitForCondition(() => !restoreButton.hidden);
|
||||
EventUtils.synthesizeMouse(deleteButton, 10, 10, {}, window);
|
||||
yield promise;
|
||||
|
||||
item1 = gPanelView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
item2 = gPanelView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
item3 = gPanelView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
let startItem1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
let startItem2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
let startItem3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
|
||||
ok(!restoreButton.hidden, "Restore button is visible.");
|
||||
ok(!item1 && !item2 && !item3, "Items are not in grid");
|
||||
ok(startItem1 && startItem2 && startItem3, "Items are still in start grid");
|
||||
ok(HistoryTestHelper._nodes[uriFromIndex(0)] && HistoryTestHelper._nodes[uriFromIndex(5)] && HistoryTestHelper._nodes[uriFromIndex(12)],
|
||||
"Items not deleted yet");
|
||||
|
||||
let promise = waitForEvent(Elements.contextappbar, "transitionend", null, Elements.contextappbar);
|
||||
Elements.contextappbar.dismiss();
|
||||
yield promise;
|
||||
|
||||
item1 = gPanelView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
item2 = gPanelView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
item3 = gPanelView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
let startItem1 = gStartView._set.getItemsByUrl(uriFromIndex(0))[0];
|
||||
let startItem2 = gStartView._set.getItemsByUrl(uriFromIndex(5))[0];
|
||||
let startItem3 = gStartView._set.getItemsByUrl(uriFromIndex(12))[0];
|
||||
|
||||
ok(!item1 && !item2 && !item3, "Items are gone from grid");
|
||||
ok(!startItem1 && !startItem2 && !startItem3, "Items are gone from start grid");
|
||||
ok(!HistoryTestHelper._nodes[uriFromIndex(0)] && !HistoryTestHelper._nodes[uriFromIndex(5)] && !HistoryTestHelper._nodes[uriFromIndex(12)],
|
||||
"Items are gone for good");
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче