зеркало из https://github.com/mozilla/pjs.git
diffs from pete@postpagan.com (cleanup and alignment fixes)
This commit is contained in:
Родитель
256a2f7a8a
Коммит
b868913ed8
|
@ -58,7 +58,7 @@
|
|||
onkeypress = "OnChangeSrc()"
|
||||
onkeyup = "checkForImage( this.id ); doValueChanged()"
|
||||
onmouseup = "checkForImage( this.id ); doValueChanged()"
|
||||
onblur = "checkForImage( this.id ); doValueChanged()"
|
||||
onblur = "/*checkForImage( this.id ); doValueChanged()*/"
|
||||
onfocus = "checkForImage( this.id ); doValueChanged()"
|
||||
onchange = "OnChangeSrc(); doOverallEnabling()" />
|
||||
|
||||
|
@ -151,7 +151,7 @@
|
|||
type = "radio"
|
||||
name = "image.dimensionType"
|
||||
id = "originalsizeRadio"
|
||||
onclick = "doValueChanged()"
|
||||
onclick = " doValueChanged();"
|
||||
checked = "true" />
|
||||
|
||||
</td>
|
||||
|
@ -175,7 +175,7 @@
|
|||
<input type="radio"
|
||||
name = "image.dimensionType"
|
||||
id = "customsizeRadio"
|
||||
onclick = "doValueChanged()" />
|
||||
onclick = "doDimensionEnabling( true );" />
|
||||
|
||||
</td>
|
||||
<td colspan="3">
|
||||
|
@ -209,8 +209,11 @@
|
|||
|
||||
|
||||
<input
|
||||
type = "text" size="4" length="4"
|
||||
type = "text"
|
||||
size = "4"
|
||||
length = "4"
|
||||
id = "imagewidthInput"
|
||||
disabled = "true"
|
||||
onfocus = "oldSourceInt = this.value;"
|
||||
onkeyup = "constrainProportions(this.id, 'imageheightInput')"
|
||||
onchange = "doValueChanged()" />
|
||||
|
@ -221,8 +224,10 @@
|
|||
<xul:titledbutton
|
||||
class = "popup"
|
||||
id = "widthunitSelect"
|
||||
style = "width: 50px;"
|
||||
disabled = "true"
|
||||
value = "&pixelsPopup.value;"
|
||||
align = "right"
|
||||
align = "left"
|
||||
popup = "PixelOrPercentMenu1"
|
||||
popupanchor = "bottomleft"
|
||||
onchange = "doValueChanged()" />
|
||||
|
@ -252,6 +257,7 @@
|
|||
size = "4"
|
||||
length = "4"
|
||||
id = "imageheightInput"
|
||||
disabled = "true"
|
||||
onfocus = "oldSourceInt = this.value;"
|
||||
onkeyup = "constrainProportions(this.id, 'imagewidthInput')"
|
||||
onchange = "doValueChanged()" />
|
||||
|
@ -262,8 +268,10 @@
|
|||
<xul:titledbutton
|
||||
class = "popup"
|
||||
id = "heightunitSelect"
|
||||
style = "width: 50px;"
|
||||
disabled = "true"
|
||||
value = "&pixelsPopup.value;"
|
||||
align = "right"
|
||||
align = "left"
|
||||
popup = "PixelOrPercentMenu2"
|
||||
popupanchor = "bottomleft"
|
||||
onchange = "doValueChanged()" />
|
||||
|
@ -305,12 +313,12 @@
|
|||
</button>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<td align="right">
|
||||
|
||||
<!-- IMAGE ALIGNMENT -->
|
||||
|
||||
<label
|
||||
class = "disabled"
|
||||
class = "selectbox"
|
||||
for = "image.alignType"
|
||||
id = "imagealignmentLabel">
|
||||
|
||||
|
@ -319,15 +327,13 @@
|
|||
|
||||
<xul:titledbutton
|
||||
id = "image.alignType"
|
||||
src = "resource:/chrome/editor/skin/default/images/ED_imgalignbottom.gif"
|
||||
class = "popup"
|
||||
popup = "ImageTextAlignment"
|
||||
popupanchor = "bottomleft"
|
||||
align = "left"
|
||||
value = "&bottomPopup.value;"
|
||||
src = "&bottomIcon.url;"
|
||||
onchange = "doValueChanged()" />
|
||||
|
||||
|
||||
<fieldset
|
||||
id = "spacing.fieldset">
|
||||
|
||||
|
@ -492,43 +498,104 @@
|
|||
<!-- ///////////////////// Image Percent 1 PopUp Window //////////////////////// -->
|
||||
|
||||
<xul:popup id = "PixelOrPercentMenu1">
|
||||
<xul:menu>
|
||||
<xul:window
|
||||
class = "popup"
|
||||
xmlns = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
name = "menu2"
|
||||
align = "vertical"
|
||||
flex = "100%"
|
||||
|
||||
<xul:menuitem
|
||||
style="
|
||||
background-color: #CCCCDD;
|
||||
width: 70px;
|
||||
height: auto;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
font: 3mm tahoma,arial,helvetica,sans-serif;
|
||||
padding: 0px;"
|
||||
>
|
||||
|
||||
<xul:box align="vertical" flex="100%" style="border: 1px outset white;">
|
||||
|
||||
<xul:titledbutton
|
||||
class = "select"
|
||||
value = "&pixelsPopup.value;"
|
||||
onclick = "SetPixelOrPercentByID('widthunitSelect', '')" />
|
||||
<xul:menuitem
|
||||
value = "&percentPopup.value;"
|
||||
onclick = "SetPixelOrPercentByID('widthunitSelect', '%')" />
|
||||
align = "center"
|
||||
style = "height:20px; vertical-align: middle;"
|
||||
onclick = "opener.SetPixelOrPercentByID('heightunitSelect', '');
|
||||
opener.popupSelectedImage('&pixelsPopup.value;', 'widthunitSelect', 'value');
|
||||
window.close();"/>
|
||||
|
||||
</xul:menu>
|
||||
<xul:titledbutton
|
||||
class = "select"
|
||||
value = "&percentPopup.value;"
|
||||
align = "center"
|
||||
style = "height:20px; vertical-align: middle;"
|
||||
onclick = "opener.SetPixelOrPercentByID('heightunitSelect', '%');
|
||||
opener.popupSelectedImage('&percentPopup.value;', 'widthunitSelect', 'value');
|
||||
window.close();"/>
|
||||
|
||||
|
||||
</xul:box>
|
||||
</xul:window>
|
||||
</xul:popup>
|
||||
|
||||
<!-- ///////////////////// Image Percent 2 PopUp Window //////////////////////// -->
|
||||
|
||||
<xul:popup id = "PixelOrPercentMenu2">
|
||||
<xul:menu>
|
||||
<xul:window
|
||||
class = "popup"
|
||||
xmlns = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
name = "menu2"
|
||||
align = "vertical"
|
||||
flex = "100%"
|
||||
|
||||
<xul:menuitem
|
||||
style="
|
||||
background-color: #CCCCDD;
|
||||
width: 70px;
|
||||
height: auto;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
font: 3mm tahoma,arial,helvetica,sans-serif;
|
||||
padding: 0px;"
|
||||
>
|
||||
|
||||
|
||||
<xul:box align="vertical" flex="100%" style="border: 1px outset white;">
|
||||
|
||||
<xul:titledbutton
|
||||
class = "select"
|
||||
value = "&pixelsPopup.value;"
|
||||
onclick = "SetPixelOrPercentByID('heightunitSelect', '')" />
|
||||
<xul:menuitem
|
||||
value = "&percentPopup.value;"
|
||||
onclick = "SetPixelOrPercentByID('heightunitSelect', '%')" />
|
||||
align = "center"
|
||||
style = "height:20px; vertical-align: middle;"
|
||||
onclick = "opener.SetPixelOrPercentByID('heightunitSelect', '');
|
||||
opener.popupSelectedImage('&pixelsPopup.value;', 'heightunitSelect', 'value');
|
||||
window.close();"/>
|
||||
|
||||
</xul:menu>
|
||||
<xul:titledbutton
|
||||
class = "select"
|
||||
value = "&percentPopup.value;"
|
||||
align = "center"
|
||||
style = "height:20px; vertical-align: middle;"
|
||||
onclick = "opener.SetPixelOrPercentByID('heightunitSelect', '%');
|
||||
opener.popupSelectedImage('&percentPopup.value;', 'heightunitSelect', 'value');
|
||||
window.close();"/>
|
||||
|
||||
</xul:box>
|
||||
</xul:window>
|
||||
</xul:popup>
|
||||
|
||||
<!-- ///////////////////// Image Align PopUp Window //////////////////////// -->
|
||||
|
||||
<xul:popup id="ImageTextAlignment">
|
||||
|
||||
<window
|
||||
<xul:window
|
||||
class = "popup"
|
||||
xmlns = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
name = "imageAlignPopup"
|
||||
align = "vertical"
|
||||
flex = "100%"
|
||||
|
||||
style="
|
||||
background-color: #CCCCDD;
|
||||
width: auto;
|
||||
|
@ -539,53 +606,62 @@
|
|||
padding: 0px;"
|
||||
>
|
||||
|
||||
<titledbutton
|
||||
class = "popup"
|
||||
value = "&topPopup.value;"
|
||||
style = "min-width: 40px"
|
||||
<xul:box align="vertical" flex="100%" style="border: 1px outset white;">
|
||||
|
||||
<xul:titledbutton
|
||||
class = "dropdown"
|
||||
src = "&topIcon.url;"
|
||||
align = "left"
|
||||
onclick = "opener.SetImageAlignment('top'); window.close();" />
|
||||
value = "&topPopup.value;"
|
||||
onclick = "opener.SetImageAlignment('top');
|
||||
opener.popupSelectedImage('&topIcon.url;', 'image.alignType', 'src');
|
||||
window.close();" />
|
||||
|
||||
<titledbutton
|
||||
class = "popup"
|
||||
value ="¢erPopup.value;"
|
||||
style = "min-width: 40px"
|
||||
src = "¢erIcon.url;"
|
||||
class = "dropdown"
|
||||
align = "left"
|
||||
onclick = "opener.SetImageAlignment('middle'); window.close();" />
|
||||
src = "¢erIcon.url;"
|
||||
value ="¢erPopup.value;"
|
||||
onclick = "opener.SetImageAlignment('middle');
|
||||
opener.popupSelectedImage('¢erIcon.url;', 'image.alignType', 'src');
|
||||
window.close();" />
|
||||
|
||||
<titledbutton
|
||||
class = "popup"
|
||||
value = "&bottomPopup.value;"
|
||||
style = "min-width: 40px"
|
||||
class = "dropdown"
|
||||
src = "&bottomIcon.url;"
|
||||
align = "left"
|
||||
onclick = "opener.SetImageAlignment('bottom'); window.close();" />
|
||||
value = "&bottomPopup.value;"
|
||||
onclick = "opener.SetImageAlignment('bottom', 'image.alignType');
|
||||
opener.popupSelectedImage('&bottomIcon.url;', 'image.alignType', 'src');
|
||||
window.close();" />
|
||||
|
||||
<titledbutton
|
||||
class = "popup"
|
||||
value = "&wrapRightPopup.value;"
|
||||
style = "min-width: 40px"
|
||||
class = "dropdown"
|
||||
src = "&wrapRightIcon.url;"
|
||||
align = "left"
|
||||
onclick = "opener.SetImageAlignment('left'); window.close();" />
|
||||
value = "&wrapRightPopup.value;"
|
||||
onclick = "opener.SetImageAlignment('left', 'image.alignType');
|
||||
opener.popupSelectedImage('&wrapRightIcon.url;', 'image.alignType', 'src');
|
||||
window.close();" />
|
||||
|
||||
<titledbutton
|
||||
class = "popup"
|
||||
value = "&wrapLeftPopup.value;"
|
||||
style = "min-width: 40px"
|
||||
class = "dropdown"
|
||||
src = "&wrapLeftIcon.url;"
|
||||
align = "left"
|
||||
onclick = "opener.SetImageAlignment('right'); window.close();" />
|
||||
value = "&wrapLeftPopup.value;"
|
||||
onclick = "opener.SetImageAlignment('right');
|
||||
opener.popupSelectedImage('&wrapLeftIcon.url;', 'image.alignType', 'src');
|
||||
window.close();" />
|
||||
|
||||
</window>
|
||||
</xul:box>
|
||||
</xul:window>
|
||||
</xul:popup>
|
||||
|
||||
</xul:window>
|
||||
|
||||
<!-- The old stuff:
|
||||
|
||||
|
||||
<xul:popup id="ImageTextAlignment">
|
||||
<xul:menu>
|
||||
<xul:menuitem name="&topPopup.value;" onclick="SetImageAlignment('^')"/>
|
||||
|
|
Загрузка…
Ссылка в новой задаче