mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backout changesets d811aa4cf0cf and 96ca77c43cb9 from bug 432599
This commit is contained in:
Ryan Flint
parent
af451459ca
commit
1e9a3e2710
@ -164,49 +164,49 @@ var StarUI = {
|
|||||||
|
|
||||||
_doShowEditBookmarkPanel:
|
_doShowEditBookmarkPanel:
|
||||||
function SU__doShowEditBookmarkPanel(aItemId, aAnchorElement, aPosition) {
|
function SU__doShowEditBookmarkPanel(aItemId, aAnchorElement, aPosition) {
|
||||||
|
this._blockCommands(); // un-done in the popuphiding handler
|
||||||
|
|
||||||
|
var bundle = this._element("bundle_browser");
|
||||||
|
|
||||||
|
// Set panel title:
|
||||||
|
// if we are batching, i.e. the bookmark has been added now,
|
||||||
|
// then show Page Bookmarked, else if the bookmark did already exist,
|
||||||
|
// we are about editing it, then use Edit This Bookmark.
|
||||||
|
this._element("editBookmarkPanelTitle").value =
|
||||||
|
this._batching ?
|
||||||
|
bundle.getString("editBookmarkPanel.pageBookmarkedTitle") :
|
||||||
|
bundle.getString("editBookmarkPanel.editBookmarkTitle");
|
||||||
|
|
||||||
|
// No description; show the Done, Cancel;
|
||||||
|
// hide the Edit, Undo buttons
|
||||||
|
this._element("editBookmarkPanelDescription").textContent = "";
|
||||||
|
this._element("editBookmarkPanelBottomButtons").hidden = false;
|
||||||
|
this._element("editBookmarkPanelContent").hidden = false;
|
||||||
|
this._element("editBookmarkPanelEditButton").hidden = true;
|
||||||
|
this._element("editBookmarkPanelUndoRemoveButton").hidden = true;
|
||||||
|
|
||||||
|
// The remove button is shown only if we're not already batching, i.e.
|
||||||
|
// if the cancel button/ESC does not remove the bookmark.
|
||||||
|
this._element("editBookmarkPanelRemoveButton").hidden = this._batching;
|
||||||
|
|
||||||
|
// unset the unstarred state, if set
|
||||||
|
this._element("editBookmarkPanelStarIcon").removeAttribute("unstarred");
|
||||||
|
|
||||||
|
this._itemId = aItemId !== undefined ? aItemId : this._itemId;
|
||||||
|
this.beginBatch();
|
||||||
|
|
||||||
|
// XXXmano hack: We push a no-op transaction on the stack so it's always
|
||||||
|
// safe for the Cancel button to call undoTransaction after endBatch.
|
||||||
|
// Otherwise, if no changes were done in the edit-item panel, the last
|
||||||
|
// transaction on the undo stack may be the initial createItem transaction,
|
||||||
|
// or worse, the batched editing of some other item.
|
||||||
|
PlacesUIUtils.ptm.doTransaction({ doTransaction: function() { },
|
||||||
|
undoTransaction: function() { },
|
||||||
|
redoTransaction: function() { },
|
||||||
|
isTransient: false,
|
||||||
|
merge: function() { return false; } });
|
||||||
|
|
||||||
if (this.panel.state == "closed") {
|
if (this.panel.state == "closed") {
|
||||||
this._blockCommands(); // un-done in the popuphiding handler
|
|
||||||
|
|
||||||
var bundle = this._element("bundle_browser");
|
|
||||||
|
|
||||||
// Set panel title:
|
|
||||||
// if we are batching, i.e. the bookmark has been added now,
|
|
||||||
// then show Page Bookmarked, else if the bookmark did already exist,
|
|
||||||
// we are about editing it, then use Edit This Bookmark.
|
|
||||||
this._element("editBookmarkPanelTitle").value =
|
|
||||||
this._batching ?
|
|
||||||
bundle.getString("editBookmarkPanel.pageBookmarkedTitle") :
|
|
||||||
bundle.getString("editBookmarkPanel.editBookmarkTitle");
|
|
||||||
|
|
||||||
// No description; show the Done, Cancel;
|
|
||||||
// hide the Edit, Undo buttons
|
|
||||||
this._element("editBookmarkPanelDescription").textContent = "";
|
|
||||||
this._element("editBookmarkPanelBottomButtons").hidden = false;
|
|
||||||
this._element("editBookmarkPanelContent").hidden = false;
|
|
||||||
this._element("editBookmarkPanelEditButton").hidden = true;
|
|
||||||
this._element("editBookmarkPanelUndoRemoveButton").hidden = true;
|
|
||||||
|
|
||||||
// The remove button is shown only if we're not already batching, i.e.
|
|
||||||
// if the cancel button/ESC does not remove the bookmark.
|
|
||||||
this._element("editBookmarkPanelRemoveButton").hidden = this._batching;
|
|
||||||
|
|
||||||
// unset the unstarred state, if set
|
|
||||||
this._element("editBookmarkPanelStarIcon").removeAttribute("unstarred");
|
|
||||||
|
|
||||||
this._itemId = aItemId !== undefined ? aItemId : this._itemId;
|
|
||||||
this.beginBatch();
|
|
||||||
|
|
||||||
// XXXmano hack: We push a no-op transaction on the stack so it's always
|
|
||||||
// safe for the Cancel button to call undoTransaction after endBatch.
|
|
||||||
// Otherwise, if no changes were done in the edit-item panel, the last
|
|
||||||
// transaction on the undo stack may be the initial createItem transaction,
|
|
||||||
// or worse, the batched editing of some other item.
|
|
||||||
PlacesUIUtils.ptm.doTransaction({ doTransaction: function() { },
|
|
||||||
undoTransaction: function() { },
|
|
||||||
redoTransaction: function() { },
|
|
||||||
isTransient: false,
|
|
||||||
merge: function() { return false; } });
|
|
||||||
|
|
||||||
// Consume dismiss clicks, see bug 400924
|
// Consume dismiss clicks, see bug 400924
|
||||||
this.panel.popupBoxObject
|
this.panel.popupBoxObject
|
||||||
.setConsumeRollupEvent(Ci.nsIPopupBoxObject.ROLLUP_CONSUME);
|
.setConsumeRollupEvent(Ci.nsIPopupBoxObject.ROLLUP_CONSUME);
|
||||||
|
|||||||
@ -56,7 +56,6 @@ _BROWSER_FILES = browser_bug321000.js \
|
|||||||
browser_bug409481.js \
|
browser_bug409481.js \
|
||||||
browser_autodiscovery.js \
|
browser_autodiscovery.js \
|
||||||
browser_bug420160.js \
|
browser_bug420160.js \
|
||||||
browser_bug432599.js \
|
|
||||||
autodiscovery.html \
|
autodiscovery.html \
|
||||||
moz.png \
|
moz.png \
|
||||||
browser_getshortcutoruri.js \
|
browser_getshortcutoruri.js \
|
||||||
|
|||||||
@ -1,58 +0,0 @@
|
|||||||
function invokeUsingCtrlD(close) {
|
|
||||||
if (close)
|
|
||||||
EventUtils.sendMouseEvent({ type: "click", button: 1 }, "editBookmarkPanelDoneButton");
|
|
||||||
else
|
|
||||||
EventUtils.synthesizeKey("d", { accelKey: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
function invokeUsingStarButton(close) {
|
|
||||||
if (close)
|
|
||||||
EventUtils.sendMouseEvent({ type: "click", button: 1 }, "editBookmarkPanelDoneButton");
|
|
||||||
else
|
|
||||||
EventUtils.sendMouseEvent({ type: "click", button: 1 }, "star-button");
|
|
||||||
}
|
|
||||||
|
|
||||||
let testBrowser = null;
|
|
||||||
|
|
||||||
// test bug 432599
|
|
||||||
function test() {
|
|
||||||
waitForExplicitFinish();
|
|
||||||
|
|
||||||
let testTab = gBrowser.addTab();
|
|
||||||
gBrowser.selectedTab = testTab;
|
|
||||||
testBrowser = gBrowser.getBrowserForTab(testTab);
|
|
||||||
testBrowser.addEventListener("load", initTest, true);
|
|
||||||
|
|
||||||
testBrowser.contentWindow.location = 'data:text/plain,Content';
|
|
||||||
}
|
|
||||||
|
|
||||||
function initTest() {
|
|
||||||
let invokers = [invokeUsingStarButton, invokeUsingCtrlD];
|
|
||||||
|
|
||||||
// first, bookmark the page
|
|
||||||
PlacesCommandHook.bookmarkPage(testBrowser);
|
|
||||||
|
|
||||||
invokers.forEach(checkBookmarksPanel);
|
|
||||||
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
|
|
||||||
function checkBookmarksPanel(invoker)
|
|
||||||
{
|
|
||||||
let titleElement = document.getElementById("editBookmarkPanelTitle");
|
|
||||||
let removeElement = document.getElementById("editBookmarkPanelRemoveButton");
|
|
||||||
|
|
||||||
// invoke the panel for the first time
|
|
||||||
invoker();
|
|
||||||
|
|
||||||
let initialValue = titleElement.value;
|
|
||||||
let initialRemoveHidden = removeElement.hidden;
|
|
||||||
invoker(true);
|
|
||||||
|
|
||||||
// invoke the panel for the second time
|
|
||||||
invoker();
|
|
||||||
|
|
||||||
is(titleElement.value, initialValue, "The bookmark panel's title should be the same");
|
|
||||||
is(removeElement.hidden, initialRemoveHidden, "The bookmark panel's visibility should not change");
|
|
||||||
invoker(true);
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user