diff --git a/mozilla/toolkit/components/printing/content/printUtils.js b/mozilla/toolkit/components/printing/content/printUtils.js
index 05de039f087..d1627ea8f57 100644
--- a/mozilla/toolkit/components/printing/content/printUtils.js
+++ b/mozilla/toolkit/components/printing/content/printUtils.js
@@ -39,6 +39,8 @@
#
# ***** END LICENSE BLOCK ***** */
+var XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
var PrintUtils = {
showPageSetup: function ()
@@ -213,8 +215,10 @@ var PrintUtils = {
getBrowser().parentNode.insertBefore(printPreviewTB, getBrowser());
// Tab browser...
- this._chromeState.hadTabStrip = getBrowser().getStripVisibility();
- getBrowser().setStripVisibilityTo(false);
+ if ("getStripVisibility" in getBrowser()) {
+ this._chromeState.hadTabStrip = getBrowser().getStripVisibility();
+ getBrowser().setStripVisibilityTo(false);
+ }
// disable chrome shortcuts...
window.addEventListener("keypress", this.onKeyPressPP, true);
@@ -230,7 +234,8 @@ var PrintUtils = {
{
window.removeEventListener("keypress", this.onKeyPressPP, true);
- getBrowser().setStripVisibilityTo(this._chromeState.hadTabStrip);
+ if ("getStripVisibility" in getBrowser())
+ getBrowser().setStripVisibilityTo(this._chromeState.hadTabStrip);
var webBrowserPrint = this.getWebBrowserPrint();
webBrowserPrint.exitPrintPreview();
diff --git a/mozilla/toolkit/components/viewsource/content/viewPartialSource.xul b/mozilla/toolkit/components/viewsource/content/viewPartialSource.xul
index 88766b51db2..0d02be81a22 100644
--- a/mozilla/toolkit/components/viewsource/content/viewPartialSource.xul
+++ b/mozilla/toolkit/components/viewsource/content/viewPartialSource.xul
@@ -40,6 +40,7 @@
#***** END LICENSE BLOCK ***** -->
+
@@ -73,6 +74,7 @@
+
@@ -106,6 +108,8 @@
label="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;"/>
+
diff --git a/mozilla/toolkit/components/viewsource/content/viewSource.css b/mozilla/toolkit/components/viewsource/content/viewSource.css
new file mode 100644
index 00000000000..62cadb9c6fb
--- /dev/null
+++ b/mozilla/toolkit/components/viewsource/content/viewSource.css
@@ -0,0 +1,3 @@
+toolbar[printpreview="true"] {
+ -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar");
+}
diff --git a/mozilla/toolkit/components/viewsource/content/viewSource.js b/mozilla/toolkit/components/viewsource/content/viewSource.js
index 310988eca17..451dc54ed60 100644
--- a/mozilla/toolkit/components/viewsource/content/viewSource.js
+++ b/mozilla/toolkit/components/viewsource/content/viewSource.js
@@ -233,6 +233,18 @@ function ViewSourceSavePage()
saveURL(window.content.location.href.substring(12), null, "SaveLinkTitle");
}
+function onEnterPP()
+{
+ var toolbox = document.getElementById("viewSource-toolbox");
+ toolbox.hidden = true;
+}
+
+function onExitPP()
+{
+ var toolbox = document.getElementById("viewSource-toolbox");
+ toolbox.hidden = false;
+}
+
function ViewSourceGoToLine()
{
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
diff --git a/mozilla/toolkit/components/viewsource/content/viewSource.xul b/mozilla/toolkit/components/viewsource/content/viewSource.xul
index b002639a5fd..79ebed79dd0 100644
--- a/mozilla/toolkit/components/viewsource/content/viewSource.xul
+++ b/mozilla/toolkit/components/viewsource/content/viewSource.xul
@@ -40,6 +40,7 @@
#***** END LICENSE BLOCK ***** -->
+
@@ -71,9 +72,10 @@
-
-
+
+
+
@@ -107,6 +109,8 @@
label="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;"/>
+
diff --git a/mozilla/toolkit/components/viewsource/jar.mn b/mozilla/toolkit/components/viewsource/jar.mn
index b1576ed9ffc..43cfc1bf21f 100644
--- a/mozilla/toolkit/components/viewsource/jar.mn
+++ b/mozilla/toolkit/components/viewsource/jar.mn
@@ -1,8 +1,9 @@
toolkit.jar:
-* content/global/viewSource.xul (content/viewSource.xul)
+* content/global/viewSource.css (content/viewSource.css)
* content/global/viewSource.js (content/viewSource.js)
-* content/global/viewPartialSource.xul (content/viewPartialSource.xul)
+* content/global/viewSource.xul (content/viewSource.xul)
* content/global/viewPartialSource.js (content/viewPartialSource.js)
+* content/global/viewPartialSource.xul (content/viewPartialSource.xul)
en-US.jar:
locale/en-US/global/viewSource.dtd (locale/viewSource.dtd)
diff --git a/mozilla/toolkit/components/viewsource/locale/viewSource.dtd b/mozilla/toolkit/components/viewsource/locale/viewSource.dtd
index 81a7a76aed6..e9ada92bbb8 100644
--- a/mozilla/toolkit/components/viewsource/locale/viewSource.dtd
+++ b/mozilla/toolkit/components/viewsource/locale/viewSource.dtd
@@ -15,6 +15,8 @@
+
+