зеркало из https://github.com/mozilla/gecko-dev.git
- fix two js warnings in printPreviewBindings.xml (redeclaration of var ifreq and total)
- remove useless class toolbarbutton-icon - rename class last-arrow to left-arrow and next-arrow to right-arrow
This commit is contained in:
Родитель
c38d856dc2
Коммит
7536f0d034
|
@ -59,9 +59,9 @@
|
||||||
<xul:vbox align="center" pack="center">
|
<xul:vbox align="center" pack="center">
|
||||||
<xul:label value="&page.label;"/>
|
<xul:label value="&page.label;"/>
|
||||||
</xul:vbox>
|
</xul:vbox>
|
||||||
<xul:toolbarbutton class="toolbarbutton-icon home-arrow"
|
<xul:toolbarbutton class="home-arrow"
|
||||||
oncommand="parentNode.navigate(0, 0, 'home');"/>
|
oncommand="parentNode.navigate(0, 0, 'home');"/>
|
||||||
<xul:toolbarbutton class="toolbarbutton-icon last-arrow"
|
<xul:toolbarbutton class="left-arrow"
|
||||||
oncommand="parentNode.navigate(-1, 0, 0);"/>
|
oncommand="parentNode.navigate(-1, 0, 0);"/>
|
||||||
<xul:hbox align="center" pack="center">
|
<xul:hbox align="center" pack="center">
|
||||||
<xul:textbox size="3" value="1" lastvalid="1"
|
<xul:textbox size="3" value="1" lastvalid="1"
|
||||||
|
@ -70,9 +70,9 @@
|
||||||
<xul:label value="&of.label;"/>
|
<xul:label value="&of.label;"/>
|
||||||
<xul:label value="1"/>
|
<xul:label value="1"/>
|
||||||
</xul:hbox>
|
</xul:hbox>
|
||||||
<xul:toolbarbutton class="toolbarbutton-icon next-arrow"
|
<xul:toolbarbutton class="right-arrow"
|
||||||
oncommand="parentNode.navigate(1, 0, 0);"/>
|
oncommand="parentNode.navigate(1, 0, 0);"/>
|
||||||
<xul:toolbarbutton class="toolbarbutton-icon end-arrow"
|
<xul:toolbarbutton class="end-arrow"
|
||||||
oncommand="parentNode.navigate(0, 0, 'end');"/>
|
oncommand="parentNode.navigate(0, 0, 'end');"/>
|
||||||
|
|
||||||
<xul:toolbarseparator class="toolbarseparator-primary"/>
|
<xul:toolbarseparator class="toolbarseparator-primary"/>
|
||||||
|
@ -243,6 +243,7 @@
|
||||||
|
|
||||||
var print = this._getWebBrowserPrint();
|
var print = this._getWebBrowserPrint();
|
||||||
var validInput = false;
|
var validInput = false;
|
||||||
|
var total;
|
||||||
|
|
||||||
// we use only one of aHomeOrEnd, aDirection, or aPageNum
|
// we use only one of aHomeOrEnd, aDirection, or aPageNum
|
||||||
if (aHomeOrEnd)
|
if (aHomeOrEnd)
|
||||||
|
@ -266,7 +267,7 @@
|
||||||
{
|
{
|
||||||
var textBoxStr = this.mPageTextBox.value;
|
var textBoxStr = this.mPageTextBox.value;
|
||||||
var newPageNum = parseInt(textBoxStr) + aDirection;
|
var newPageNum = parseInt(textBoxStr) + aDirection;
|
||||||
var total = print.printPreviewNumPages;
|
total = print.printPreviewNumPages;
|
||||||
|
|
||||||
// bounds check potentially user-entered number
|
// bounds check potentially user-entered number
|
||||||
if (newPageNum > 0 && newPageNum <= total)
|
if (newPageNum > 0 && newPageNum <= total)
|
||||||
|
@ -279,7 +280,7 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var total = print.printPreviewNumPages;
|
total = print.printPreviewNumPages;
|
||||||
|
|
||||||
// bounds check potentially user-entered number
|
// bounds check potentially user-entered number
|
||||||
if (aPageNum > 0 && aPageNum <= total)
|
if (aPageNum > 0 && aPageNum <= total)
|
||||||
|
@ -388,7 +389,7 @@
|
||||||
var webBrowserPrint;
|
var webBrowserPrint;
|
||||||
var domWin;
|
var domWin;
|
||||||
try {
|
try {
|
||||||
var ifreq = _content.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
|
ifreq = _content.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
|
||||||
domWin = ifreq.QueryInterface(Components.interfaces.nsIDOMWindow);
|
domWin = ifreq.QueryInterface(Components.interfaces.nsIDOMWindow);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// Pressing cancel is expressed as an NS_ERROR_ABORT return value,
|
// Pressing cancel is expressed as an NS_ERROR_ABORT return value,
|
||||||
|
|
|
@ -46,11 +46,11 @@
|
||||||
list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp-end.gif");
|
list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp-end.gif");
|
||||||
}
|
}
|
||||||
|
|
||||||
.last-arrow {
|
.left-arrow {
|
||||||
list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp.gif");
|
list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp.gif");
|
||||||
}
|
}
|
||||||
|
|
||||||
.next-arrow {
|
.right-arrow {
|
||||||
list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif");
|
list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче