summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/palemoon/components/places/content/bookmarkProperties.js5
-rw-r--r--toolkit/content/browser-content.js29
-rw-r--r--toolkit/content/jar.mn2
3 files changed, 6 insertions, 30 deletions
diff --git a/application/palemoon/components/places/content/bookmarkProperties.js b/application/palemoon/components/places/content/bookmarkProperties.js
index 685ef57d2..e1d1077ab 100644
--- a/application/palemoon/components/places/content/bookmarkProperties.js
+++ b/application/palemoon/components/places/content/bookmarkProperties.js
@@ -382,6 +382,11 @@ var BookmarkPropertiesPanel = {
.addEventListener("input", this, false);
}
}
+
+ // Ensure the Name Picker textbox is focused on load
+ var namePickerElem = document.getElementById('editBMPanel_namePicker');
+ namePickerElem.focus();
+ namePickerElem.select();
}),
// nsIDOMEventListener
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js
index e1114672c..2276f8a0d 100644
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -841,35 +841,6 @@ var FindBar = {
fakeEvent[k] = event[k];
}
}
-#ifdef MC_PALEMOON
- let findBarId = "FindToolbar";
- // The FindBar is in the chrome window's context, not in tabbrowser
- // - see also bug 537013
- let chromeWin = null;
- try {
- chromeWin = content
- .QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIWebNavigation)
- .QueryInterface(Ci.nsIDocShellTreeItem)
- .rootTreeItem
- .QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIDOMWindow)
- .QueryInterface(Ci.nsIDOMChromeWindow);
- } catch (e) {
- Cu.reportError(
- "The FindBar - the chrome window's context was not detected:\n" + e);
- }
- if (chromeWin && chromeWin.document.getElementById(findBarId)) {
- try {
- chromeWin.document.getElementById(findBarId)
- .browser = Services.wm.getMostRecentWindow("navigator:browser")
- .gBrowser.mCurrentBrowser;
- } catch (e) {
- Cu.reportError(
- "The FindBar - cannot set the property 'browser':\n" + e);
- }
- }
-#endif
// sendSyncMessage returns an array of the responses from all listeners
let rv = sendSyncMessage("Findbar:Keypress", {
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index c11d3abed..e1d432cb3 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -39,7 +39,7 @@ toolkit.jar:
content/global/plugins.html
content/global/plugins.css
content/global/browser-child.js
-* content/global/browser-content.js
+ content/global/browser-content.js
* content/global/buildconfig.html
content/global/contentAreaUtils.js
#ifndef MOZ_FENNEC