mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1448946 - remove trailing spaces in editor. rs=white-space-only 

[skip-blame]
This commit is contained in:
Jorg K 2018-03-31 12:50:02 +02:00
Родитель 94c0e3a4f3
Коммит b341d7af8f
79 изменённых файлов: 655 добавлений и 655 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
editor/ui/composer.js
Просмотреть файл

@ -78,7 +78,7 @@ pref("editor.always_show_publish_dialog", false);
* otherwise, we may output 0xa0 depending on the charset.
*
* "none" : don't use any entity names; only use numeric codes.
* "basic" : use entity names just for   & < > " for
* "basic" : use entity names just for   & < > " for
* interoperability/exchange with products that don't support more
* than that.
* "latin1" : use entity names for 8bit accented letters and other special
@ -97,6 +97,6 @@ pref("editor.dont_lock_spell_files", true);
pref("editor.CR_creates_new_p", false);
// Pasting images from the clipboard, order of encoding preference:
// Pasting images from the clipboard, order of encoding preference:
// JPEG-PNG-GIF=0, PNG-JPEG-GIF=1, GIF-JPEG-PNG=2
pref("clipboard.paste_image_type", 1);

386
editor/ui/composer/content/EditorAllTags.css
Просмотреть файл

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* Styles to alter look of things in the Editor content window
/* Styles to alter look of things in the Editor content window
* for the "All Tags Edit Mode" Every HTML tag shows up as an icon.
*/
@ -13,7 +13,7 @@
*:not(a):not(abbr):not(acronym):not(address):not(applet):not(area):not(b):not(base):not(basefont):not(bdo):not(bgsound):not(big):not(blink):not(blockquote):not(body):not(br):not(button):not(canvas):not(caption):not(center):not(cite):not(code):not(col):not(colgroup):not(dd):not(del):not(dfn):not(dir):not(div):not(dl):not(dt):not(em):not(embed):not(fieldset):not(font):not(form):not(frame):not(frameset):not(h1):not(h2):not(h3):not(h4):not(h5):not(h6):not(head):not(hr):not(html):not(i):not(iframe):not(image):not(img):not(input):not(ins):not(isindex):not(kbd):not(keygen):not(label):not(legend):not(li):not(link):not(listing):not(map):not(marquee):not(menu):not(meta):not(multicol):not(nobr):not(noembed):not(noframes):not(noscript):not(object):not(ol):not(optgroup):not(option):not(p):not(param):not(plaintext):not(pre):not(q):not(s):not(samp):not(script):not(select):not(server):not(small):not(sound):not(spacer):not(span):not(strike):not(strong):not(style):not(sub):not(sup):not(table):not(tbody):not(td):not(textarea):not(tfoot):not(th):not(thead):not(title):not(tr):not(tt):not(u):not(ul):not(var):not(wbr):not(xmp) {
display: inline;
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 16px;
padding-left: 16px;
background-image: url(chrome://editor/content/images/tag-userdefined.gif);
background-repeat: no-repeat;
background-position: top left;
@ -21,636 +21,636 @@
a:not([\_moz_anonclass]) {
min-height: 16px; margin-left: 2px; margin-top: 2px;
padding-left: 20px;
padding-left: 20px;
background-image: url(chrome://editor/content/images/tag-a.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
abbr {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 35px;
padding-left: 35px;
background-image: url(chrome://editor/content/images/tag-abr.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
acronym {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 57px;
padding-left: 57px;
background-image: url(chrome://editor/content/images/tag-acr.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
address {
min-height: 44px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-adr.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
applet {
min-height: 35px; margin-top: 2px;
padding-left: 47px;
padding-left: 47px;
background-image: url(chrome://editor/content/images/tag-app.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
area {
min-height: 35px; margin-top: 2px;
padding-left: 39px;
padding-left: 39px;
background-image: url(chrome://editor/content/images/tag-ara.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
b {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 20px;
padding-left: 20px;
background-image: url(chrome://editor/content/images/tag-b.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
basefont {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 57px;
padding-left: 57px;
background-image: url(chrome://editor/content/images/tag-bsf.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
bdo {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-bdo.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
big {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-big.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
blockquote {
min-height: 44px; margin-left: 2px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-blq.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
body {
min-height: 36px; margin-left: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-body.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
br {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 23px;
padding-left: 23px;
background-image: url(chrome://editor/content/images/tag-br.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
button {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 57px;
padding-left: 57px;
background-image: url(chrome://editor/content/images/tag-btn.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
caption {
min-height: 35px; margin-top: 2px;
padding-left: 55px;
padding-left: 55px;
background-image: url(chrome://editor/content/images/tag-cpt.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
center {
min-height: 44px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-ctr.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
cite {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 39px;
padding-left: 39px;
background-image: url(chrome://editor/content/images/tag-cit.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
code {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 39px;
padding-left: 39px;
background-image: url(chrome://editor/content/images/tag-cod.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
col {
min-height: 35px; margin-left: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-col.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
colgroup {
min-height: 35px; margin-left: 2px;
padding-left: 51px;
padding-left: 51px;
background-image: url(chrome://editor/content/images/tag-clg.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
dd {
min-height: 35px; margin-top: 2px;
padding-left: 23px;
padding-left: 23px;
background-image: url(chrome://editor/content/images/tag-dd.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
del {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-del.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
dfn {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-dfn.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
dir {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-dir.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
div {
min-height: 24px; margin-top: 2px;
/* TEMPORARY TO COMPENSATE FOR BUG */
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-div.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
input div {
min-height: 0px; margin-left: 0px; margin-top: 0px;
padding-left: 0px;
padding-left: 0px;
background-image: none;
}
dl {
min-height: 20px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-dl.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
dt {
min-height: 35px; margin-top: 2px;
padding-left: 23px;
padding-left: 23px;
background-image: url(chrome://editor/content/images/tag-dt.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
em {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 23px;
padding-left: 23px;
background-image: url(chrome://editor/content/images/tag-em.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
fieldset {
min-height: 44px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-fld.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
font {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 39px;
padding-left: 39px;
background-image: url(chrome://editor/content/images/tag-fnt.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
form {
min-height: 36px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-for.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
frame {
min-height: 40px; margin-left: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-frm.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
frameset {
min-height: 44px; margin-left: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-fst.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
h1 {
min-height: 20px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-h1.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
h2 {
min-height: 20px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-h2.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
h3 {
min-height: 20px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-h3.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
h4 {
min-height: 20px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-h4.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
h5 {
min-height: 20px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-h5.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
h6 {
min-height: 20px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-h6.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
hr {
min-height: 20px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-hr.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
i {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 20px;
padding-left: 20px;
background-image: url(chrome://editor/content/images/tag-i.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
iframe {
min-height: 35px; margin-left: 2px;
padding-left: 47px;
padding-left: 47px;
background-image: url(chrome://editor/content/images/tag-ifr.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
img:not([\_moz_anonclass]) {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-img.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
input {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 39px;
padding-left: 39px;
background-image: url(chrome://editor/content/images/tag-inp.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
ins {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-ins.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
isindex {
min-height: 40px; margin-left: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-isx.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
kbd {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-kbd.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
label {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 39px;
padding-left: 39px;
background-image: url(chrome://editor/content/images/tag-lbl.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
legend {
min-height: 35px; margin-top: 2px;
padding-left: 49px;
padding-left: 49px;
background-image: url(chrome://editor/content/images/tag-lgn.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
li {
min-height: 35px; margin-top: 2px;
padding-left: 23px;
padding-left: 23px;
background-image: url(chrome://editor/content/images/tag-li.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
listing {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 57px;
padding-left: 57px;
background-image: url(chrome://editor/content/images/tag-lst.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
map {
min-height: 35px; margin-left: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-map.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
menu {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 39px;
padding-left: 39px;
background-image: url(chrome://editor/content/images/tag-men.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
nobr {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 39px;
padding-left: 39px;
background-image: url(chrome://editor/content/images/tag-nbr.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
noframes {
min-height: 44px; margin-left: 2px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-nfr.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
noscript {
min-height: 44px; margin-left: 2px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-nsc.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
object {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 49px;
padding-left: 49px;
background-image: url(chrome://editor/content/images/tag-obj.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
ol {
min-height: 38px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-ol.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
optgroup {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 51px;
padding-left: 51px;
background-image: url(chrome://editor/content/images/tag-opg.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
option {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 47px;
padding-left: 47px;
background-image: url(chrome://editor/content/images/tag-opt.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
p {
min-height: 38px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-p.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
param {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 43px;
padding-left: 43px;
background-image: url(chrome://editor/content/images/tag-prm.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
plaintext {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 57px;
padding-left: 57px;
background-image: url(chrome://editor/content/images/tag-pln.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
pre {
min-height: 24px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-pre.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
q {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 20px;
padding-left: 20px;
background-image: url(chrome://editor/content/images/tag-q.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
s {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 20px;
padding-left: 20px;
background-image: url(chrome://editor/content/images/tag-s.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
samp {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 39px;
padding-left: 39px;
background-image: url(chrome://editor/content/images/tag-smp.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
script {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 45px;
padding-left: 45px;
background-image: url(chrome://editor/content/images/tag-scr.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
select {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 47px;
padding-left: 47px;
background-image: url(chrome://editor/content/images/tag-slc.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
small {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 41px;
padding-left: 41px;
background-image: url(chrome://editor/content/images/tag-sml.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
span:not([\_moz_anonclass]) {
min-height: 35px; margin-left: 2px; margin-top: 2px;
/* TEMPORARY TO COMPENSATE FOR BUG */
padding-left: 39px;
padding-left: 39px;
background-image: url(chrome://editor/content/images/tag-spn.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
strike {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 45px;
padding-left: 45px;
background-image: url(chrome://editor/content/images/tag-stk.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
strong {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 51px;
padding-left: 51px;
background-image: url(chrome://editor/content/images/tag-stn.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
sub {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-sub.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
sup {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-sup.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
/* The background image technique is not working for
/* The background image technique is not working for
some table elements. Trying the "before" strategy
*/
table {
min-height: 40px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-tbl.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
tbody {
min-height: 42px; margin-left: 2px; margin-top: 1px;
padding-left: 17px;
padding-left: 17px;
content: url(chrome://editor/content/images/tag-tbd.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
td {
min-height: 22px; margin-left: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-td.gif);
background-repeat: no-repeat;
@ -659,81 +659,81 @@ td {
textarea {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 59px;
padding-left: 59px;
background-image: url(chrome://editor/content/images/tag-txt.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
tfoot {
min-height: 42px; margin-left: 2px; margin-top: 1px;
padding-left: 17px;
padding-left: 17px;
content: url(chrome://editor/content/images/tag-tft.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
th {
min-height: 22px; margin-left: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-th.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
thead {
min-height: 42px; margin-left: 2px; margin-top: 1px;
padding-left: 17px;
padding-left: 17px;
content: url(chrome://editor/content/images/tag-thd.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
tr {
min-height: 22px; margin-left: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-tr.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
tt {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 23px;
padding-left: 23px;
background-image: url(chrome://editor/content/images/tag-tt.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
u {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 23px;
padding-left: 23px;
background-image: url(chrome://editor/content/images/tag-u.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
ul {
min-height: 20px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-ul.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
var {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-var.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
xmp {
min-height: 35px; margin-left: 2px; margin-top: 2px;
padding-left: 31px;
padding-left: 31px;
background-image: url(chrome://editor/content/images/tag-xmp.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
@ -744,17 +744,17 @@ xmp {
html {
min-height: 36px; margin-left: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-html.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
head {
min-height: 36px; margin-left: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-hed.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
@ -762,41 +762,41 @@ These are tags that are ONLY allowed as children of HEAD:
title {
min-height: 40px; margin-left: 2px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-ttl.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
base {
min-height: 36px; margin-left: 2px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-bas.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
style {
min-height: 40px; margin-left: 2px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-stl.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
meta {
min-height: 36px; margin-left: 2px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-met.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
link {
min-height: 30px; margin-left: 2px; margin-top: 2px;
padding-left: 17px;
padding-left: 17px;
background-image: url(chrome://editor/content/images/tag-lnk.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
*/

10
editor/ui/composer/content/EditorContent.css
Просмотреть файл

@ -2,10 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* Styles to alter look of things in the Editor content window
/* Styles to alter look of things in the Editor content window
* for the "Normal Edit Mode" These settings will be removed
* when we display in completely WYSIWYG "Edit Preview" mode
* Anything that should never change, like cursors, should be
* Anything that should never change, like cursors, should be
* place in EditorOverride.css, instead of here.
*/
@ -13,13 +13,13 @@
a[name] {
min-height: 17px; margin-left: 2px; margin-top: 2px;
padding-left: 20px;
padding-left: 20px;
background-image: url(chrome://editor/content/images/tag-anchor.gif);
background-repeat: no-repeat;
background-repeat: no-repeat;
background-position: top left;
}
/* Force border display for empty cells
/* Force border display for empty cells
and tables with 0 border
*/
table {

2
editor/ui/composer/content/EditorContextMenu.js
Просмотреть файл

@ -62,7 +62,7 @@ nsContextMenu.prototype.initEditorItems = function (aShow)
this.hideDisabledItem("context-copy", true);
this.hideDisabledItem("context-paste", true);
this.hideDisabledItem("context-delete", true);
this.showItem("context-sep-undo",
this.shouldShowSeparator("context-sep-undo"));
this.showItem("context-sep-paste",

2
editor/ui/composer/content/composerOverlay.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

62
editor/ui/composer/content/editor.js
Просмотреть файл

@ -97,7 +97,7 @@ function ShowHideToolbarButtons()
ShowHideToolbarSeparators(document.getElementById("EditToolbar"));
ShowHideToolbarSeparators(document.getElementById("FormatToolbar"));
}
function nsPrefListener(prefName)
{
this.startup(prefName);
@ -131,7 +131,7 @@ nsPrefListener.prototype =
// verify that we're changing a button pref
if (topic != "nsPref:changed")
return;
let editor = GetCurrentEditor();
if (prefName == kUseCssPref)
{
@ -144,7 +144,7 @@ nsPrefListener.prototype =
let state = editor.getHighlightColorState(mixedObj);
cmd.setAttribute("state", state);
cmd.collapsed = false;
}
}
else {
cmd.setAttribute("state", "transparent");
cmd.collapsed = true;
@ -216,7 +216,7 @@ var DocumentReloadListener =
// implements nsIObserver
var gEditorDocumentObserver =
{
{
observe: function(aSubject, aTopic, aData)
{
// Should we allow this even if NOT the focused editor?
@ -257,7 +257,7 @@ var gEditorDocumentObserver =
case nsIEditingSession.eEditorErrorUnknown:
errorStringId = "CantEditDocumentMsg";
break;
// Note that for "eEditorErrorFileNotFound,
// Note that for "eEditorErrorFileNotFound,
// network code popped up an alert dialog, so we don't need to
}
if (errorStringId)
@ -267,7 +267,7 @@ var gEditorDocumentObserver =
// We have a bad editor -- nsIEditingSession will rebuild an editor
// with a blank page, so simply abort here
if (editorStatus)
return;
return;
if (!("InsertCharWindow" in window))
window.InsertCharWindow = null;
@ -331,7 +331,7 @@ var gEditorDocumentObserver =
/* XXX When paste actually converts formatted rich text to pretty formatted plain text
and pasteNoFormatting is fixed to paste the text without formatting (what paste
currently does), then this item shouldn't be hidden: */
HideItem("menu_pasteNoFormatting");
HideItem("menu_pasteNoFormatting");
HideItem("cmd_viewFormatToolbar");
HideItem("cmd_viewEditModeToolbar");
@ -349,7 +349,7 @@ var gEditorDocumentObserver =
for (let i = 0; i < menuPopupChildren.length; i++)
menuPopupChildren.item(i).hidden = true;
}
// Set window title
UpdateWindowTitle();
@ -430,7 +430,7 @@ function EditorSharedStartup()
else
SetupTextEditorCommands();
// add observer to be called when document is really done loading
// add observer to be called when document is really done loading
// and is modified
// Note: We're really screwed if we fail to install this observer!
try {
@ -521,7 +521,7 @@ async function CheckAndSaveDocument(command, allowDontSave)
// call window.focus, since we need to pop up a dialog
// and therefore need to be visible (to prevent user confusion)
top.document.commandDispatcher.focusedWindow.focus();
top.document.commandDispatcher.focusedWindow.focus();
var scheme = GetScheme(GetDocumentUrl());
var doPublish = (scheme && scheme != "file");
@ -542,7 +542,7 @@ async function CheckAndSaveDocument(command, allowDontSave)
strID = "BeforeValidate";
break;
}
var reasonToSave = strID ? GetString(strID) : "";
var title = document.title || GetString("untitledDefaultFilename");
@ -560,7 +560,7 @@ async function CheckAndSaveDocument(command, allowDontSave)
{
promptFlags += Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0;
button1Title = GetString("Publish");
button3Title = GetString("DontPublish");
button3Title = GetString("DontPublish");
}
else
{
@ -572,7 +572,7 @@ async function CheckAndSaveDocument(command, allowDontSave)
promptFlags += doPublish ?
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_2)
: (Services.prompt.BUTTON_TITLE_DONT_SAVE * Services.prompt.BUTTON_POS_2);
result = Services.prompt.confirmEx(window, dialogTitle, dialogMsg, promptFlags,
button1Title, null, button3Title, null, {value:0});
@ -612,7 +612,7 @@ function EditorSetCharacterSet(aEvent)
var docUrl = GetDocumentUrl();
if( !IsUrlAboutBlank(docUrl))
{
// reloading the document will reverse any changes to the META charset,
// reloading the document will reverse any changes to the META charset,
// we need to put them back in, which is achieved by a dedicated listener
editor.addDocumentStateListener( DocumentReloadListener );
EditorLoadUrl(docUrl);
@ -1031,7 +1031,7 @@ function initLocalFontFaceMenu(menuPopup)
if (!gLocalFonts)
{
// Build list of all local fonts once per editor
try
try
{
var enumerator = Cc["@mozilla.org/gfx/fontenumerator;1"]
.getService(Ci.nsIFontEnumerator);
@ -1610,7 +1610,7 @@ function EditorDblClick(event)
!["body","p","h1","h2","h3","h4","h5","h6","blockquote","div","pre"]
.includes(element.nodeName.toLowerCase()))
{
goDoCommand("cmd_objectProperties");
goDoCommand("cmd_objectProperties");
event.preventDefault();
}
}
@ -1631,7 +1631,7 @@ function EditorClick(event)
Ci.nsIDOMElement);
var name = element.localName;
if (!["body", "caption", "table", "td", "th", "tr"].includes(name))
{
{
GetCurrentEditor().selectElement(event.explicitOriginalTarget);
event.preventDefault();
}
@ -1758,7 +1758,7 @@ function SetEditMode(mode)
var flags = (editor.documentCharacterSet == "ISO-8859-1")
? kOutputEncodeLatin1Entities
: kOutputEncodeBasicEntities;
try {
try {
let encodeEntity = Services.prefs.getCharPref("editor.encode_entity");
switch (encodeEntity) {
case "basic" : flags = kOutputEncodeBasicEntities; break;
@ -1793,7 +1793,7 @@ function SetEditMode(mode)
inlineSpellCheckItem.removeAttribute('checked');
// Reduce the undo count so we don't use too much memory
// during multiple uses of source window
// during multiple uses of source window
// (reinserting entire doc caches all nodes)
try {
editor.transactionManager.maxTransactionCount = 1;
@ -1905,7 +1905,7 @@ function SetDisplayMode(mode)
switch (mode)
{
case kDisplayModePreview:
// Disable all extra "edit mode" style sheets
// Disable all extra "edit mode" style sheets
editor.enableStyleSheet(kNormalStyleSheet, false);
editor.enableStyleSheet(kAllTagsStyleSheet, false);
editor.objectResizingEnabled = true;
@ -1952,7 +1952,7 @@ function SetDisplayMode(mode)
if (previousMode >= 0)
document.getElementById(kDisplayModeMenuIDs[previousMode]).setAttribute("checked","false");
document.getElementById(kDisplayModeMenuIDs[mode]).setAttribute("checked","true");
return true;
}
@ -1983,7 +1983,7 @@ function UpdateWindowTitle()
document.title = (title || filename || gUntitledString) +
windowTitle +
xulWin.getAttribute("titlemenuseparator") +
xulWin.getAttribute("titlemenuseparator") +
xulWin.getAttribute("titlemodifier");
} catch (e) { dump(e); }
}
@ -2008,7 +2008,7 @@ function SaveRecentFilesPrefs(aTitle, aFileType)
{
let url = GetStringPref("editor.history_url_" + i);
// Continue if URL pref is missing because
// Continue if URL pref is missing because
// a URL not found during loading may have been removed
// Skip over current an "data" URLs
@ -2074,7 +2074,7 @@ function InitObjectPropertiesMenuitem()
name = "href";
}
} catch(e) {}
if (objStr == "")
objStr = GetString("Image");
break;
@ -2273,7 +2273,7 @@ function EditorSetDefaultPrefsAndDoctype()
var editor = GetCurrentEditor();
var domdoc;
try {
try {
domdoc = editor.document;
} catch (e) { dump( e + "\n"); }
if ( !domdoc )
@ -2282,7 +2282,7 @@ function EditorSetDefaultPrefsAndDoctype()
return;
}
// Insert a doctype element
// Insert a doctype element
// if it is missing from existing doc
if (!domdoc.doctype)
{
@ -2290,7 +2290,7 @@ function EditorSetDefaultPrefsAndDoctype()
if (newdoctype)
domdoc.insertBefore(newdoctype, domdoc.firstChild);
}
// search for head; we'll need this for meta tag additions
let headelement = domdoc.querySelector("head");
if (!headelement)
@ -2582,7 +2582,7 @@ function InitJoinCellMenuitem(id)
// Use "Join selected cells if there's more than 1 cell selected
var numSelected;
var foundElement;
try {
var tagNameObj = {};
var countObj = {value:0}
@ -2626,7 +2626,7 @@ function InitRemoveStylesMenuitems(removeStylesId, removeLinksId, removeNamedAnc
try {
SetElementEnabled(linkItem, !isCollapsed ||
editor.getElementOrParentByTagName("href", null));
} catch(e) {}
} catch(e) {}
}
// Disable if selection is collapsed
SetElementEnabledById(removeNamedAnchorsId, !isCollapsed);
@ -2716,7 +2716,7 @@ function IsInTableCell()
var editor = GetCurrentEditor();
var flags = editor.flags;
return (IsHTMLEditor() &&
!(flags & nsIPlaintextEditor.eEditorReadonlyMask) &&
!(flags & nsIPlaintextEditor.eEditorReadonlyMask) &&
IsEditingRenderedHTML() &&
null != editor.getElementOrParentByTagName("td", null));
} catch (e) {}
@ -2757,7 +2757,7 @@ function EditorInsertOrEditTable(insertAllowed)
// Edit properties of existing table
window.openDialog("chrome://editor/content/EdTableProps.xul", "_blank", "chrome,close,titlebar,modal", "","TablePanel");
gContentWindow.focus();
}
}
else if (insertAllowed)
{
try {

16
editor/ui/composer/content/editorApplicationOverlay.js
Просмотреть файл

@ -10,13 +10,13 @@ function initEditorContextMenuItems(aEvent)
var shouldShowEditPage = !gContextMenu.onImage && !gContextMenu.onLink && !gContextMenu.onTextInput && !gContextMenu.inDirList;
gContextMenu.showItem( "context-editpage", shouldShowEditPage );
var shouldShowEditLink = gContextMenu.onSaveableLink;
var shouldShowEditLink = gContextMenu.onSaveableLink;
gContextMenu.showItem( "context-editlink", shouldShowEditLink );
// Hide the applications separator if there's no add-on apps present.
// Hide the applications separator if there's no add-on apps present.
gContextMenu.showItem("context-sep-apps", gContextMenu.shouldShowSeparator("context-sep-apps"));
}
function initEditorContextMenuListener(aEvent)
{
var popup = document.getElementById("contentAreaContextMenu");
@ -26,19 +26,19 @@ function initEditorContextMenuListener(aEvent)
addEventListener("load", initEditorContextMenuListener, false);
function editDocument(aDocument)
function editDocument(aDocument)
{
if (!aDocument)
aDocument = window.content.document;
editPage(aDocument.URL);
editPage(aDocument.URL);
}
function editPageOrFrame()
{
var focusedWindow = document.commandDispatcher.focusedWindow;
// if the uri is a specific frame, grab it, else use the frameset uri
// if the uri is a specific frame, grab it, else use the frameset uri
// and let Composer handle error if necessary
editPage(getContentFrameURI(focusedWindow));
}
@ -65,7 +65,7 @@ function editPage(url, aFileType)
// Always strip off "view-source:" and #anchors
url = url.replace(/^view-source:/, "").replace(/#.*/, "");
// if the current window is a browser window, then extract the current charset menu setting from the current
// if the current window is a browser window, then extract the current charset menu setting from the current
// document and use it to initialize the new composer window...
var wintype = document.documentElement.getAttribute('windowtype');
@ -131,7 +131,7 @@ function CheckOpenWindowForURIMatch(uri, win)
try {
return createURI(win.content.document.URL).equals(uri);
} catch (e) {}
return false;
}

2
editor/ui/composer/content/editorMailOverlay.xul
Просмотреть файл

@ -14,7 +14,7 @@
<commandset id="tasksCommands">
<!-- XXX insert commands here -->
</commandset>
<!-- navigator specific UI items -->
<menupopup id="menu_NewPopup">
<!-- XXX insert File->New Menu add-ins here -->

4
editor/ui/composer/content/editorNavigatorOverlay.xul
Просмотреть файл

@ -14,7 +14,7 @@
<commandset id="tasksCommands">
<!-- XXX insert commands here -->
</commandset>
<!-- navigator specific UI items -->
<menupopup id="menu_NewPopup">
<!-- XXX insert File->New Menu add-ins here -->
@ -22,6 +22,6 @@
<menupopup id="menu_FilePopup">
<!-- XXX insert File Menu add-ins here -->
</menupopup>
</menupopup>
</overlay>

2
editor/ui/composer/content/editorPrefsOverlay.xul
Просмотреть файл

@ -52,4 +52,4 @@
</treeitem>
</treechildren>
</overlay>
</overlay>

78
editor/ui/composer/content/editorSmileyOverlay.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
@ -13,55 +13,55 @@
type="menu"
observes="cmd_smiley">
<menupopup id="smilyPopup">
<menuitem class="smiley insert-smile menuitem-iconic" label="&smiley1Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-)' )"
<menuitem class="smiley insert-smile menuitem-iconic" label="&smiley1Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-)' )"
tooltiptext="&smiley1Cmd.tooltip;" />
<menuitem class="smiley insert-frown menuitem-iconic" label="&smiley2Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-(' )"
tooltiptext="&smiley2Cmd.tooltip;" />
oncommand="doStatefulCommand('cmd_smiley', ':-(' )"
tooltiptext="&smiley2Cmd.tooltip;" />
<menuitem class="smiley insert-wink menuitem-iconic" label="&smiley3Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ';-)' )"
tooltiptext="&smiley3Cmd.tooltip;" />
oncommand="doStatefulCommand('cmd_smiley', ';-)' )"
tooltiptext="&smiley3Cmd.tooltip;" />
<menuitem class="smiley insert-tongue menuitem-iconic" label="&smiley4Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-P' )"
oncommand="doStatefulCommand('cmd_smiley', ':-P' )"
tooltiptext="&smiley4Cmd.tooltip;" />
<menuitem class="smiley insert-laughing menuitem-iconic" label="&smiley5Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-D' )"
oncommand="doStatefulCommand('cmd_smiley', ':-D' )"
tooltiptext="&smiley5Cmd.tooltip;" />
<menuitem class="smiley insert-embarrassed menuitem-iconic" label="&smiley6Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-[' )"
oncommand="doStatefulCommand('cmd_smiley', ':-[' )"
tooltiptext="&smiley6Cmd.tooltip;" />
<menuitem class="smiley insert-undecided menuitem-iconic" label="&smiley7Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-\\' )"
oncommand="doStatefulCommand('cmd_smiley', ':-\\' )"
tooltiptext="&smiley7Cmd.tooltip;" />
<menuitem class="smiley insert-surprise menuitem-iconic" label="&smiley8Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', '=-O' )"
tooltiptext="&smiley8Cmd.tooltip;" />
oncommand="doStatefulCommand('cmd_smiley', '=-O' )"
tooltiptext="&smiley8Cmd.tooltip;" />
<menuitem class="smiley insert-kiss menuitem-iconic" label="&smiley9Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-*' )"
tooltiptext="&smiley9Cmd.tooltip;" />
oncommand="doStatefulCommand('cmd_smiley', ':-*' )"
tooltiptext="&smiley9Cmd.tooltip;" />
<menuitem class="smiley insert-yell menuitem-iconic" label="&smiley10Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', '>:o' )"
tooltiptext="&smiley10Cmd.tooltip;" />
oncommand="doStatefulCommand('cmd_smiley', '>:o' )"
tooltiptext="&smiley10Cmd.tooltip;" />
<menuitem class="smiley insert-cool menuitem-iconic" label="&smiley11Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', '8-)' )"
tooltiptext="&smiley11Cmd.tooltip;" />
oncommand="doStatefulCommand('cmd_smiley', '8-)' )"
tooltiptext="&smiley11Cmd.tooltip;" />
<menuitem class="smiley insert-money menuitem-iconic" label="&smiley12Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-$' )"
tooltiptext="&smiley12Cmd.tooltip;" />
oncommand="doStatefulCommand('cmd_smiley', ':-$' )"
tooltiptext="&smiley12Cmd.tooltip;" />
<menuitem class="smiley insert-foot menuitem-iconic" label="&smiley13Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-!' )"
tooltiptext="&smiley13Cmd.tooltip;" />
oncommand="doStatefulCommand('cmd_smiley', ':-!' )"
tooltiptext="&smiley13Cmd.tooltip;" />
<menuitem class="smiley insert-innocent menuitem-iconic" label="&smiley14Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', 'O:-)' )"
tooltiptext="&smiley14Cmd.tooltip;" />
tooltiptext="&smiley14Cmd.tooltip;" />
<menuitem class="smiley insert-cry menuitem-iconic" label="&smiley15Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':\'(' )"
tooltiptext="&smiley15Cmd.tooltip;" />
<menuitem class="smiley insert-sealed menuitem-iconic" label="&smiley16Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-X' )"
tooltiptext="&smiley16Cmd.tooltip;" />
tooltiptext="&smiley16Cmd.tooltip;" />
</menupopup>
</toolbarbutton>
@ -69,12 +69,12 @@
<menupopup id="insertMenuPopup">
<menu id="insertSmiley" label="&insertSmiley.label;" accesskey="&insertSmiley.accesskey;" insertbefore="insertMenuSeparator">
<menupopup id="smilyMenuPopup">
<menuitem class="smiley insert-smile menuitem-iconic" label="&smiley1Cmd.label;"
<menuitem class="smiley insert-smile menuitem-iconic" label="&smiley1Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-)' )" accesskey="&smiley1Cmd.accesskey;"/>
<menuitem class="smiley insert-frown menuitem-iconic" label="&smiley2Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-(' )" accesskey="&smiley2Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', ':-(' )" accesskey="&smiley2Cmd.accesskey;"/>
<menuitem class="smiley insert-wink menuitem-iconic" label="&smiley3Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ';-)' )" accesskey="&smiley3Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', ';-)' )" accesskey="&smiley3Cmd.accesskey;"/>
<menuitem class="smiley insert-tongue menuitem-iconic" label="&smiley4Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-P' )" accesskey="&smiley4Cmd.accesskey;"/>
<menuitem class="smiley insert-laughing menuitem-iconic" label="&smiley5Cmd.label;"
@ -84,25 +84,25 @@
<menuitem class="smiley insert-undecided menuitem-iconic" label="&smiley7Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-\\' )" accesskey="&smiley7Cmd.accesskey;"/>
<menuitem class="smiley insert-surprise menuitem-iconic" label="&smiley8Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', '=-O' )" accesskey="&smiley8Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', '=-O' )" accesskey="&smiley8Cmd.accesskey;"/>
<menuitem class="smiley insert-kiss menuitem-iconic" label="&smiley9Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-*' )" accesskey="&smiley9Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', ':-*' )" accesskey="&smiley9Cmd.accesskey;"/>
<menuitem class="smiley insert-yell menuitem-iconic" label="&smiley10Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', '>:o' )" accesskey="&smiley10Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', '>:o' )" accesskey="&smiley10Cmd.accesskey;"/>
<menuitem class="smiley insert-cool menuitem-iconic" label="&smiley11Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', '8-)' )" accesskey="&smiley11Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', '8-)' )" accesskey="&smiley11Cmd.accesskey;"/>
<menuitem class="smiley insert-money menuitem-iconic" label="&smiley12Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-$' )" accesskey="&smiley12Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', ':-$' )" accesskey="&smiley12Cmd.accesskey;"/>
<menuitem class="smiley insert-foot menuitem-iconic" label="&smiley13Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-!' )" accesskey="&smiley13Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', ':-!' )" accesskey="&smiley13Cmd.accesskey;"/>
<menuitem class="smiley insert-innocent menuitem-iconic" label="&smiley14Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', 'O:-)' )" accesskey="&smiley14Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', 'O:-)' )" accesskey="&smiley14Cmd.accesskey;"/>
<menuitem class="smiley insert-cry menuitem-iconic" label="&smiley15Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':\'(' )" accesskey="&smiley15Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', ':\'(' )" accesskey="&smiley15Cmd.accesskey;"/>
<menuitem class="smiley insert-sealed menuitem-iconic" label="&smiley16Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-X' )" accesskey="&smiley16Cmd.accesskey;"/>
oncommand="doStatefulCommand('cmd_smiley', ':-X' )" accesskey="&smiley16Cmd.accesskey;"/>
</menupopup>
</menu>
</menu>
</menupopup>
</menu>
</overlay>

8
editor/ui/composer/content/editorTasksOverlay.xul
Просмотреть файл

@ -20,13 +20,13 @@
</commandset>
<statusbarpanel id="component-bar">
<toolbarbutton class="taskbutton" id="mini-comp" command="Tasks:Editor"
<toolbarbutton class="taskbutton" id="mini-comp" command="Tasks:Editor"
tooltiptext="&taskComposer.tooltip;" insertafter="mini-nav"/>
</statusbarpanel>
<menupopup id="windowPopup">
<menuitem label="&editorCmd.label;" accesskey="&editorCmd.accesskey;" key="key_editor" command="Tasks:Editor" id="tasksMenuEditor" insertafter="IMMenuItem,tasksMenuNavigator" class="menuitem-iconic icon-composer16 menu-iconic"/>
</menupopup>
</overlay>
</overlay>

2
editor/ui/composer/content/pref-editing.js
Просмотреть файл

@ -91,7 +91,7 @@ function UpdateDependent(aCustomEnabled)
function ToggleElements(aCustomEnabled)
{
var buttons = document.getElementById("color-rows").getElementsByTagName("button");
for (var i = 0; i < buttons.length; i++)
{
let isLocked = CheckLocked(buttons[i].id);

18
editor/ui/composer/content/pref-editing.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
@ -50,7 +50,7 @@
src="chrome://editor/locale/editor.properties"/>
<vbox>
<label value="&authorName.label;"
<label value="&authorName.label;"
accesskey="&authorName.accesskey;"
control="editorAuthor">
</label>
@ -63,14 +63,14 @@
</vbox>
<spacer class="smallspacer"/>
<groupbox align="start">
<caption label="&pageColorHeader;"/>
<caption label="&pageColorHeader;"/>
<radiogroup id="useCustomColors"
preference="editor.use_custom_colors">
<radio id="defaultColorsRadio"
value="false"
value="false"
label="&defaultColors.label;"
accesskey="&defaultColors.accesskey;"/>
<radio id="customColorsRadio"
<radio id="customColorsRadio"
value="true"
label="&customColors.label;"
accesskey="&customColors.accesskey;"/>
@ -81,7 +81,7 @@
<rows id="color-rows">
<row align="center">
<label id="textLabel"
value="&normalText.label;&colon.character;"
value="&normalText.label;&colon.character;"
accesskey="&normalText.accesskey;"
control="text"/>
<button id="text"
@ -92,7 +92,7 @@
</row>
<row align="center">
<label id="linkLabel"
value="&linkText.label;&colon.character;"
value="&linkText.label;&colon.character;"
accesskey="&linkText.accesskey;"
control="link"/>
<button id="link"
@ -103,7 +103,7 @@
</row>
<row align="center">
<label id="activeLinkLabel"
value="&activeLinkText.label;&colon.character;"
value="&activeLinkText.label;&colon.character;"
accesskey="&activeLinkText.accesskey;"
control="active_link"/>
<button id="active_link"
@ -114,7 +114,7 @@
</row>
<row align="center">
<label id="visitedLinkLabel"
value ="&visitedLinkText.label;&colon.character;"
value ="&visitedLinkText.label;&colon.character;"
accesskey="&visitedLinkText.accesskey;"
control="followed_link"/>
<button id="followed_link"

2
editor/ui/composer/content/pref-toolbars.xul
Просмотреть файл

@ -111,7 +111,7 @@
label="&publish.label;"
preference="editor.toolbars.showbutton.publish"/>
<checkbox id="showPreview"
label="&preview.label;"
label="&preview.label;"
preference="editor.toolbars.showbutton.preview"/>
</vbox>
<vbox flex="1">

46
editor/ui/composer/content/publishprefs.js
Просмотреть файл

@ -59,7 +59,7 @@ function GetPublishSiteData()
function GetDefaultPublishSiteName()
{
var publishBranch = GetPublishPrefsBranch();
var name = "";
var name = "";
if (publishBranch)
name = GetPublishStringPref(publishBranch, "default_site");
@ -84,7 +84,7 @@ function CreatePublishDataFromUrl(docUrl)
publishData = pubSiteData[index];
publishData.docDir = FormatDirForPublishing(dirObj.value)
//XXX Problem: OtherDir: How do we decide when to use the dir in
//XXX Problem: OtherDir: How do we decide when to use the dir in
// publishSiteData (default DocDir) or docDir from current filepath?
publishData.otherDir = FormatDirForPublishing(pubSiteData[index].otherDir);
@ -109,7 +109,7 @@ function CreatePublishDataFromUrl(docUrl)
var siteName = CreateSiteNameFromUrl(pubUrl, pubSiteData);
publishData = {
publishData = {
siteName : siteName,
previousSiteName : siteName,
filename : GetFilename(docUrl),
@ -141,7 +141,7 @@ function CreateSiteNameFromUrl(url, publishSiteData)
var i = 1;
var exists = false;
do {
exists = PublishSiteNameExists(siteName, publishSiteData, -1)
exists = PublishSiteNameExists(siteName, publishSiteData, -1)
if (exists)
siteName = host + "-" + i + schemePostfix;
i++;
@ -202,7 +202,7 @@ function GetPublishData_internal(publishBranch, siteName)
var prefPrefix = "site_data." + siteName + ".";
// We must have a publish url, else we ignore this site
// (siteData and siteNames for sites with incomplete data
// (siteData and siteNames for sites with incomplete data
// will get deleted by SavePublishSiteDataToPrefs)
var publishUrl = GetPublishStringPref(publishBranch, prefPrefix+"url");
if (!publishUrl)
@ -215,7 +215,7 @@ function GetPublishData_internal(publishBranch, siteName)
publishOtherFiles = publishBranch.getBoolPref(prefPrefix+"publish_other_files");
} catch (e) {}
var publishData = {
var publishData = {
siteName : siteName,
previousSiteName : siteName,
filename : "",
@ -245,8 +245,8 @@ function GetPublishData_internal(publishBranch, siteName)
publishData.savePassword = true;
}
// Build history list of directories
// Always supply the root dir
// Build history list of directories
// Always supply the root dir
publishData.dirList = [""];
// Get the rest from prefs
@ -303,7 +303,7 @@ function SavePublishSiteDataToPrefs(siteArray, defaultName)
// Save default site name
SetPublishStringPref(publishBranch, "default_site", defaultName);
// Force saving to file so next page edited finds these values
SavePrefFile();
}
@ -341,7 +341,7 @@ function SavePublishDataToPrefs(publishData)
}
// Use "previous" name if available in case it was changed
var previousSiteName = ("previousSiteName" in publishData && publishData.previousSiteName) ?
var previousSiteName = ("previousSiteName" in publishData && publishData.previousSiteName) ?
publishData.previousSiteName : publishData.siteName;
// Find site number of existing site or fall through at next available one
@ -368,7 +368,7 @@ function SavePublishDataToPrefs(publishData)
{
// Check if siteName was the default and we need to update that
var defaultSiteName = GetPublishStringPref(publishBranch, "default_site");
if (previousSiteName == defaultSiteName
if (previousSiteName == defaultSiteName
&& publishData.siteName != defaultSiteName)
SetPublishStringPref(publishBranch, "default_site", publishData.siteName);
@ -396,17 +396,17 @@ function SavePublishData_Internal(publishPrefsBranch, publishData, siteIndex)
SetPublishStringPref(publishPrefsBranch, prefPrefix+"url", publishData.publishUrl);
SetPublishStringPref(publishPrefsBranch, prefPrefix+"browse_url", publishData.browseUrl);
SetPublishStringPref(publishPrefsBranch, prefPrefix+"username", publishData.username);
try {
publishPrefsBranch.setBoolPref(prefPrefix+"save_password", publishData.savePassword);
publishPrefsBranch.setBoolPref(prefPrefix+"publish_other_files", publishData.publishOtherFiles);
} catch (e) {}
// Save password using PasswordManager
// Save password using PasswordManager
// (If publishData.savePassword = false, this clears existing password)
SavePassword(publishData);
SetPublishStringPref(publishPrefsBranch, prefPrefix+"doc_dir",
SetPublishStringPref(publishPrefsBranch, prefPrefix+"doc_dir",
FormatDirForPublishing(publishData.docDir));
if (publishData.publishOtherFiles && publishData.otherDir)
@ -418,7 +418,7 @@ function SavePublishData_Internal(publishPrefsBranch, publishData, siteIndex)
if (publishData.docDir)
AppendNewDirToList(publishData, publishData.docDir);
if (publishData.publishOtherFiles && publishData.otherDir
if (publishData.publishOtherFiles && publishData.otherDir
&& publishData.otherDir != publishData.docDir)
AppendNewDirToList(publishData, publishData.otherDir);
}
@ -629,7 +629,7 @@ function PublishSiteNameExists(name, publishSiteData, skipSiteIndex)
// Find index of a site record in supplied publish site database
// docUrl: Document URL with or without filename
// (Must end in "/" if no filename)
// dirObj.value = the directory of the document URL
// dirObj.value = the directory of the document URL
// relative to the base publishing URL, using "" if none
//
// XXX: Currently finds the site with the longest-matching url;
@ -644,7 +644,7 @@ function FindSiteIndexAndDocDir(publishSiteData, docUrl, dirObj)
var siteIndex = -1;
var siteUrlLen = 0;
for (var i = 0; i < publishSiteData.length; i++)
{
// Site publish or browse url needs to be contained in document URL,
@ -674,7 +674,7 @@ function FindSiteIndexAndDocDir(publishSiteData, docUrl, dirObj)
// (We need to look at both "publishUrl" and "browseUrl" in case we are editing
// an http: document but using ftp: to publish.)
// If match is found:
// Fill in the filename and subirectory based on the docUrl and
// Fill in the filename and subirectory based on the docUrl and
// return the length of the docUrl with username+password stripped out
function FillInMatchingPublishData(publishData, docUrl)
{
@ -685,24 +685,24 @@ function FillInMatchingPublishData(publishData, docUrl)
var lastSlash = docUrl.lastIndexOf("\/");
var baseUrl = docUrl.slice(0, lastSlash+1);
var filename = docUrl.slice(lastSlash+1);
// Strip username+password from docUrl because these
// are stored separately in publishData, never embedded in the publishUrl
// If both docUrl and publishData contain usernames,
// we must match that as well as the url
var username = {value:""};
baseUrl = StripUsernamePassword(baseUrl, username);
baseUrl = StripUsernamePassword(baseUrl, username);
username = username.value;
var matchedLength = 0;
let pubUrlFound = publishData.publishUrl && baseUrl.startsWith(publishData.publishUrl);
let browseUrlFound = publishData.browseUrl && baseUrl.startsWith(publishData.browseUrl);
if ((pubUrlFound || browseUrlFound)
if ((pubUrlFound || browseUrlFound)
&& (!username || !publishData.username || username == publishData.username))
{
// We found a match
matchedLength = pubUrlFound ? publishData.publishUrl.length
matchedLength = pubUrlFound ? publishData.publishUrl.length
: publishData.browseUrl.length;
if (matchedLength > 0)
@ -755,7 +755,7 @@ function FormatUrlForPublishing(url)
}
// Username and password present in publish url are
// extracted into the separate "username" and "password" fields
// extracted into the separate "username" and "password" fields
// of the publishData object
// Returns true if we did change the publishData
function FixupUsernamePasswordInPublishData(publishData)

14
editor/ui/dialogs/content/EdAEAttributes.js
Просмотреть файл

@ -121,7 +121,7 @@ var gTarget =
/*
Most elements have the "dir" attribute,
so we use this value array
for all elements instead of specifying
for all elements instead of specifying
separately for each element
*/
gHTMLAttr.all_dir =
@ -307,7 +307,7 @@ gHTMLAttr.basefont =
"color",
"face"
];
gHTMLAttr.basefont_color = gHTMLColors;
gHTMLAttr.bdo =
@ -331,7 +331,7 @@ gHTMLAttr.big =
"^lang",
"dir"
];
gHTMLAttr.blockquote =
[
"cite",
@ -788,7 +788,7 @@ gHTMLAttr.hr =
gHTMLAttr.hr_align = gHAlign;
gHTMLAttr.hr_noshade =
gHTMLAttr.hr_noshade =
[
"noshade"
];
@ -1202,7 +1202,7 @@ gHTMLAttr.ol_type =
"1",
"a",
"A",
"i",
"i",
"I"
];
@ -1718,8 +1718,8 @@ gHTMLAttr._var =
];
// ================ JS Attributes ================ //
// These are element specific even handlers.
/* Most all elements use gCoreJSEvents, so those
// These are element specific even handlers.
/* Most all elements use gCoreJSEvents, so those
are assumed except for those listed here with "noEvents"
*/

4
editor/ui/dialogs/content/EdAECSSAttributes.js
Просмотреть файл

@ -115,7 +115,7 @@ function UpdateCSSAttributes()
// Use editor transactions if modifying the element directly in the document
doRemoveAttribute("style");
doSetAttribute("style", styleString); // NOTE BUG 18894!!!
}
}
else if (gElement.getAttribute("style"))
doRemoveAttribute("style");
}
@ -127,7 +127,7 @@ function RemoveCSSAttribute()
{
// Remove the item from the tree
// We always rebuild complete "style" string,
// so no list of "removed" items
// so no list of "removed" items
getSelectedItem(gDialog.AddCSSAttributeTree).remove();
ClearCSSInputWidgets();

22
editor/ui/dialogs/content/EdAEHTMLAttributes.js
Просмотреть файл

@ -5,7 +5,7 @@
function BuildHTMLAttributeNameList()
{
gDialog.AddHTMLAttributeNameInput.removeAllItems();
var elementName = gElement.localName;
var attNames = gHTMLAttr[elementName];
@ -44,7 +44,7 @@ function BuildHTMLAttributeNameList()
var sep = document.createElementNS(XUL_NS, "menuseparator");
if (sep)
popup.appendChild(sep);
}
}
}
else
{
@ -90,7 +90,7 @@ function BuildHTMLAttributeTable()
{
var nodeMap = gElement.attributes;
var i;
if (nodeMap.length > 0)
if (nodeMap.length > 0)
{
var added = false;
for(i = 0; i < nodeMap.length; i++)
@ -154,7 +154,7 @@ function onInputHTMLAttributeName()
// Clear value widget, but prevent triggering update in tree
gUpdateTreeValue = false;
gDialog.AddHTMLAttributeValueInput.value = "";
gUpdateTreeValue = true;
gUpdateTreeValue = true;
if (attName)
{
@ -187,7 +187,7 @@ function onInputHTMLAttributeName()
if (listLen == 1)
newValue = valueList[0];
// Note: For case where "value list" is actually just
// Note: For case where "value list" is actually just
// one (default) item, don't use menulist for that
if (listLen > 1)
{
@ -211,14 +211,14 @@ function onInputHTMLAttributeName()
var sep = document.createElementNS(XUL_NS, "menuseparator");
if (sep)
popup.appendChild(sep);
}
}
} else {
gDialog.AddHTMLAttributeValueMenulist.appendItem(valueList[i]);
}
}
}
}
if (listLen <= 1 && deckIndex != "0")
{
// No list: Use textbox for input instead
@ -231,7 +231,7 @@ function onInputHTMLAttributeName()
var existingValue = GetAndSelectExistingAttributeValue(attName, "HTMLAList");
if (existingValue)
newValue = existingValue;
gDialog.AddHTMLAttributeValueInput.value = newValue;
if (!existingValue)
@ -284,11 +284,11 @@ function onInputHTMLAttributeValue()
if (sign == "+" || sign == "-")
value = sign + value;
}
// Special case attributes
// Special case attributes
if (selectedItem.getAttribute("limitFirstChar") == "true")
{
// Limit first character to letter, and all others to
// Limit first character to letter, and all others to
// letters, numbers, and a few others
value = value.replace(/^[^a-zA-Z\u0080-\uFFFF]/, "").replace(/[^a-zA-Z0-9_\.\-\:\u0080-\uFFFF]+/g,'');
}

12
editor/ui/dialogs/content/EdAEJSEAttributes.js
Просмотреть файл

@ -5,7 +5,7 @@
function BuildJSEAttributeNameList()
{
gDialog.AddJSEAttributeNameList.removeAllItems();
// Get events specific to current element
var elementName = gElement.localName;
if (elementName in gJSAttr)
@ -37,7 +37,7 @@ function BuildJSEAttributeNameList()
sep = document.createElementNS(XUL_NS, "menuseparator");
if (sep)
popup.appendChild(sep);
}
}
}
}
@ -57,7 +57,7 @@ function BuildJSEAttributeNameList()
else
gDialog.AddJSEAttributeNameList.appendItem(gCoreJSEvents[i], gCoreJSEvents[i]);
}
gDialog.AddJSEAttributeNameList.selectedIndex = 0;
// Use current name and value of first tree item if it exists
@ -94,7 +94,7 @@ function onSelectJSEAttribute()
if(!gDoOnSelectTree)
return;
gDialog.AddJSEAttributeValueInput.value =
gDialog.AddJSEAttributeValueInput.value =
GetAndSelectExistingAttributeValue(gDialog.AddJSEAttributeNameList.label, "JSEAList");
}
@ -122,7 +122,7 @@ function onInputJSEAttributeValue()
var value = TrimString(gDialog.AddJSEAttributeValueInput.value);
// Update value in the tree list
// Since we have a non-editable menulist,
// Since we have a non-editable menulist,
// we MUST automatically add the event attribute if it doesn't exist
if (!UpdateExistingAttribute( name, value, "JSEAList" ) && value)
AddTreeItem( name, value, "JSEAList", JSEAttrs );
@ -161,7 +161,7 @@ function UpdateJSEAttributes()
function RemoveJSEAttribute()
{
// This differs from HTML and CSS panels:
// This differs from HTML and CSS panels:
// We reselect after removing, because there is not
// editable attribute name input, so we can't clear that
// like we do in other panels

6
editor/ui/dialogs/content/EdAdvancedEdit.js
Просмотреть файл

@ -70,7 +70,7 @@ function Startup()
BuildHTMLAttributeTable();
BuildCSSAttributeTable();
BuildJSEAttributeTable();
// Build attribute name arrays for menulists
BuildJSEAttributeNameList();
BuildHTMLAttributeNameList();
@ -180,7 +180,7 @@ function UpdateExistingAttribute( attName, attValue, treeChildrenId )
// Set the text in the "value' column treecell
SetTreeItemValueStr(item, attValue);
// Select item just changed,
// Select item just changed,
// but don't trigger the tree's onSelect handler
gDoOnSelectTree = false;
try {
@ -237,7 +237,7 @@ function GetAndSelectExistingAttributeValue( attName, treeChildrenId )
return "";
}
/* Tree structure:
/* Tree structure:
<treeItem>
<treeRow>
<treeCell> // Name Cell

4
editor/ui/dialogs/content/EdAdvancedEdit.xul
Просмотреть файл

@ -39,9 +39,9 @@
<label value="&currentattributesfor.label;"/>
<label class="header" id="tagLabel"/>
</hbox>
<separator class="thin"/>
<tabbox flex="1">
<tabs>
<tab label="&tabHTML.label;"/>

2
editor/ui/dialogs/content/EdButtonProps.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorButtonProperties.dtd">
<dialog title="&windowTitle.label;"

12
editor/ui/dialogs/content/EdColorPicker.js
Просмотреть файл

@ -19,7 +19,7 @@ var gColorObj;
// dialog initialization code
function Startup()
{
{
if (!window.arguments[1])
{
dump("EdColorPicker: Missing color object param\n");
@ -40,13 +40,13 @@ function Startup()
gDialog.ColorSwatch = document.getElementById("ColorPickerSwatch");
gDialog.Ok = document.documentElement.getButton("accept");
// The type of color we are setting:
// text: Text, Link, ActiveLink, VisitedLink,
// The type of color we are setting:
// text: Text, Link, ActiveLink, VisitedLink,
// or background: Page, Table, or Cell
if (gColorObj.Type)
{
ColorType = gColorObj.Type;
// Get string for dialog title from passed-in type
// Get string for dialog title from passed-in type
// (note constraint on editor.properties string name)
let IsCSSPrefChecked = Services.prefs.getBoolPref("editor.use_css");
@ -242,7 +242,7 @@ function ValidateData()
gColor = LastPickedColor;
else
gColor = gDialog.ColorInput.value;
gColor = TrimString(gColor).toLowerCase();
// TODO: Validate the color string!
@ -251,7 +251,7 @@ function ValidateData()
{
ShowInputErrorMessage(GetString("NoColorError"));
SetTextboxFocus(gDialog.ColorInput);
return false;
return false;
}
return true;
}

4
editor/ui/dialogs/content/EdColorPicker.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdColorPicker.dtd">
@ -30,7 +30,7 @@
<radio id="CellRadio" label="&cell.label;" accesskey="&cell.accessKey;"/>
</radiogroup>
</hbox>
<colorpicker id="ColorPicker" palettename="standard"
<colorpicker id="ColorPicker" palettename="standard"
persist="palettename"
onclick="SetDefaultToOk();"
ondblclick="if (onAccept()) window.close();"

10
editor/ui/dialogs/content/EdColorProps.js
Просмотреть файл

@ -124,7 +124,7 @@ function InitDialog()
customBackgroundColor = GetHTMLOrCSSStyleValue(globalElement, bgcolorStr, cssBackgroundColorStr);
customBackgroundColor = ConvertRGBColorIntoHEXColor(customBackgroundColor);
var haveCustomColor =
var haveCustomColor =
customTextColor ||
customLinkColor ||
customVisitedColor ||
@ -148,7 +148,7 @@ function InitDialog()
gDialog.PageColorGroup.selectedItem = gDialog.CustomColorsRadio;
UseCustomColors();
}
else
else
{
gDialog.PageColorGroup.selectedItem = gDialog.DefaultColorsRadio;
UseDefaultColors();
@ -216,7 +216,7 @@ function GetColorAndUpdate(ColorWellID)
break;
}
setColorWell(ColorWellID, color);
setColorWell(ColorWellID, color);
SetColorPreview(ColorWellID, color);
}
@ -402,9 +402,9 @@ function ValidateData()
globalElement.setAttribute(backgroundStr, gBackgroundImage);
else
editor.removeAttributeOrEquivalent(globalElement, backgroundStr, true);
return true;
}
}
} catch (e) {}
return false;
}

2
editor/ui/dialogs/content/EdColorProps.xul
Просмотреть файл

@ -7,7 +7,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorColorProperties.dtd">

24
editor/ui/dialogs/content/EdConvertToTable.js
Просмотреть файл

@ -102,7 +102,7 @@ function onAccept()
str = str.replace(/\s*<\/p>\s*/g, "");
// Trim whitespace adjacent to <p> and <br> tags
// and replace <p> with <br>
// and replace <p> with <br>
// (which will be replaced with </tr> below)
str = str.replace(/\s*<p>\s*|\s*<br>\s*/g, "<br>");
@ -142,12 +142,12 @@ function onAccept()
if (/^ol|^ul|^dl/.test(tagContent))
{
// Replace list tag with <BR> to start new row
// Replace list tag with <BR> to start new row
// at beginning of second or greater list tag
str = str.slice(0, start) + listSeparator + str.slice(end+1);
if (listSeparator == "")
listSeparator = "<br>";
// Reset for list item separation into cells
listItemSeparator = "";
}
@ -165,7 +165,7 @@ function onAccept()
endList = false;
}
else
else
{
// Find end tags
endList = /^\/ol|^\/ul|^\/dl/.test(tagContent);
@ -178,7 +178,7 @@ function onAccept()
{
// Not a list-related tag: Store tag contents in an array
stack.push(tagContent);
// Keep the "<" and ">" while removing from source string
start++;
str = str.slice(0, start) + str.slice(end);
@ -194,7 +194,7 @@ function onAccept()
if (gDialog.deleteSepCharacter.checked)
{
replaceString = "";
}
}
else
{
// Don't delete separator character,
@ -202,7 +202,7 @@ function onAccept()
replaceString = sepCharacter;
}
replaceString += "<td>";
replaceString += "<td>";
if (sepCharacter.length > 0)
{
@ -213,7 +213,7 @@ function onAccept()
if (gIndex == gSpaceIndex)
{
// If checkbox is checked,
// If checkbox is checked,
// one or more adjacent spaces are one separator
if (gDialog.collapseSpaces.checked)
tempStr = "\\s+"
@ -248,7 +248,7 @@ function onAccept()
str = "<table border=\"1\" width=\"100%\" cellpadding=\"2\" cellspacing=\"2\">\n<tr><td>" + str + "</tr>\n</table>\n";
editor.beginTransaction();
// Delete the selection -- makes it easier to find where table will insert
var nodeBeforeTable = null;
var nodeAfterTable = null;
@ -259,7 +259,7 @@ function onAccept()
var offset = editor.selection.anchorOffset;
if (anchorNodeBeforeInsert.nodeType == Node.TEXT_NODE)
{
// Text was split. Table should be right after the first or before
// Text was split. Table should be right after the first or before
nodeBeforeTable = anchorNodeBeforeInsert.previousSibling;
nodeAfterTable = anchorNodeBeforeInsert;
}
@ -271,7 +271,7 @@ function onAccept()
nodeAfterTable = anchorNodeBeforeInsert.childNodes.item(offset);
}
editor.insertHTML(str);
} catch (e) {}
@ -308,7 +308,7 @@ function onAccept()
if (node2.nodeName.toLowerCase() == "td" ||
node2.nodeName.toLowerCase() == "th")
{
try {
try {
editor.selection.collapse(node2, 0);
} catch(e) {}
break;

4
editor/ui/dialogs/content/EdConvertToTable.xul
Просмотреть файл

@ -7,7 +7,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdConvertToTable.dtd">
@ -40,7 +40,7 @@
<radio id="other" label="&otherRadio.label;" oncommand="SelectCharacter('2');"/>
<textbox class="narrow" id="SepCharacterInput" oninput="InputSepCharacter()"/>
</hbox>
</radiogroup>
</radiogroup>
<spacer class="spacer"/>
<checkbox id="DeleteSepCharacter" label="&deleteCharCheck.label;" persist="checked"/>
<separator class="groove"/>

18
editor/ui/dialogs/content/EdDialogCommon.js
Просмотреть файл

@ -30,7 +30,7 @@ var gLocation;
// The element being edited - so AdvancedEdit can have access to it
var globalElement;
/* Validate contents of an input field
/* Validate contents of an input field
*
* inputWidget The 'textbox' XUL element for text input of the attribute's value
* listWidget The 'menulist' XUL element for choosing "pixel" or "percent"
@ -43,8 +43,8 @@ var globalElement;
* attName Name of the attribute to set. May be null or ignored if "element" is null
* mustHaveValue If true, error dialog is displayed if "value" is empty string
*
* This calls "ValidateNumberRange()", which puts up an error dialog to inform the user.
* If error, we also:
* This calls "ValidateNumberRange()", which puts up an error dialog to inform the user.
* If error, we also:
* Shift focus and select contents of the inputWidget,
* Switch to appropriate panel of tabbed dialog if user implements "SwitchToValidate()",
* and/or will expand the dialog to full size if "More / Fewer" feature is implemented
@ -81,7 +81,7 @@ function ValidateNumber(inputWidget, listWidget, minVal, maxVal, element, attNam
SwitchToValidatePanel();
// or expand dialog for users of "More / Fewer" button
if ("dialog" in window && dialog &&
if ("dialog" in window && dialog &&
"MoreSection" in gDialog && gDialog.MoreSection)
{
if ( !SeeMore )
@ -105,7 +105,7 @@ function ValidateNumber(inputWidget, listWidget, minVal, maxVal, element, attNam
return numString;
}
/* Validate contents of an input field
/* Validate contents of an input field
*
* value number to validate
* minVal minimum allowed for input widget's value
@ -422,7 +422,7 @@ function GetLocalFileURL(filterType)
// set the file picker's current directory to last-opened location saved in prefs
SetFilePickerDirectory(fp, fileType);
return new Promise(resolve => {
fp.open(rv => {
if (rv != nsIFilePicker.returnOK || !fp.file) {
@ -619,7 +619,7 @@ function SetRelativeCheckbox(checkbox)
}
else
{
// Any other url is assumed
// Any other url is assumed
// to be ok to try to make absolute
enable = true;
}
@ -644,7 +644,7 @@ function MakeInputValueRelativeOrAbsolute(checkbox)
Services.prompt.alert(window, "", GetString("SaveToUseRelativeUrl"));
window.focus();
}
else
else
{
// Note that "checked" is opposite of its last state,
// which determines what we want to do here
@ -911,7 +911,7 @@ function FillLinkMenulist(linkMenulist, headingsArray)
anchorMap[anchor] = true;
}
}
// grab IDs
if (element.id)
{

6
editor/ui/dialogs/content/EdDialogTemplate.js
Просмотреть файл

@ -20,7 +20,7 @@ function Startup()
gDialog.fooButton = document.getElementById("fooButton");
initDialog();
// Set window location relative to parent window (based on persisted attributes)
SetWindowLocation();
@ -28,7 +28,7 @@ function Startup()
SetTextboxFocus(gDialog.fooButton);
}
function InitDialog()
function InitDialog()
{
// Initialize all dialog widgets here,
// e.g., get attributes from an element for property dialog
@ -38,7 +38,7 @@ function onAccept()
{
// Validate all user data and set attributes and possibly insert new element here
// If there's an error the user must correct, return false to keep dialog open.
SaveWindowLocation();
return true; // do close the window
}

2
editor/ui/dialogs/content/EdDialogTemplate.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/Ed?????????.dtd">
<!-- dialog containing a control requiring initial setup -->

12
editor/ui/dialogs/content/EdDictionary.js
Просмотреть файл

@ -25,10 +25,10 @@ function Startup()
}
// The word to add word is passed as the 2nd extra parameter in window.openDialog()
gWordToAdd = window.arguments[1];
gDialog.WordInput = document.getElementById("WordInput");
gDialog.DictionaryList = document.getElementById("DictionaryList");
gDialog.WordInput.value = gWordToAdd;
FillDictionaryList();
@ -46,7 +46,7 @@ function ValidateWordToAdd()
} else {
return false;
}
}
}
function SelectWordToAddInList()
{
@ -98,7 +98,7 @@ function ReplaceWord()
// Just change the text on the selected item
// instead of rebuilding the list
selItem.label = gWordToAdd;
selItem.label = gWordToAdd;
} catch (e) {
// Rebuild list and select the word - it was probably already in the list
dump("Exception occurred adding word in ReplaceWord\n");
@ -154,7 +154,7 @@ function FillDictionaryList()
haveList = true;
}
} while (word != "");
//XXX: BUG 74467: If list is empty, it doesn't layout to full height correctly
// (ignores "rows" attribute) (bug is latered, so we are fixing here for now)
if (!haveList)
@ -169,7 +169,7 @@ function ResetSelectedItem(index)
if (index > lastIndex)
index = lastIndex;
// If we didn't have a selected item,
// If we didn't have a selected item,
// set it to the first item
if (index == -1 && lastIndex >= 0)
index = 0;

4
editor/ui/dialogs/content/EdDictionary.xul
Просмотреть файл

@ -16,7 +16,7 @@
<script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
<script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
<script type="application/javascript" src="chrome://editor/content/EdDictionary.js"/>
<broadcaster id="args" value=""/>
<grid>
<columns><column style="width: 15em" flex="1"/><column flex="1"/></columns>
@ -48,7 +48,7 @@
accesskey="&RemoveButton.accessKey;"/>
<spacer class="spacer"/>
<spacer flex="1"/>
<button dlgtype="cancel" class="exit-dialog" id="close" label="&CloseButton.label;"
<button dlgtype="cancel" class="exit-dialog" id="close" label="&CloseButton.label;"
default="true" oncommand="onClose();"
accesskey="&CloseButton.accessKey;"/>
</vbox>

2
editor/ui/dialogs/content/EdFieldSetProps.js
Просмотреть файл

@ -143,7 +143,7 @@ function onAccept()
try {
editor.cloneAttributes(legendElement, globalElement);
if (insertNew)
{
if (gDialog.legendText.value)

2
editor/ui/dialogs/content/EdFieldSetProps.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorFieldSetProperties.dtd">
<dialog title="&windowTitle.label;"

2
editor/ui/dialogs/content/EdFormProps.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorFormProperties.dtd">
<dialog title="&windowTitle.label;"

2
editor/ui/dialogs/content/EdHLineProps.js
Просмотреть файл

@ -152,7 +152,7 @@ function ValidateData()
if (gValidationError)
return false;
width = ValidateNumber(gDialog.widthInput, gDialog.pixelOrPercentMenulist, 1, gMaxPixels,
width = ValidateNumber(gDialog.widthInput, gDialog.pixelOrPercentMenulist, 1, gMaxPixels,
globalElement, "width", false);
if (gValidationError)
return false;

40
editor/ui/dialogs/content/EdImageOverlay.xul
Просмотреть файл

@ -16,7 +16,7 @@
<tab id="imageAppearanceTab" label="&imageAppearanceTab.label;"/>
<tab id="imageLinkTab" label="&imageLinkTab.label;"/>
<vbox id="imageLocation">
<vbox id="imageLocation">
<spacer class="spacer"/>
<label control = "srcInput"
value = "&locationEditField.label;"
@ -29,7 +29,7 @@
<textbox id="srcInput" oninput="ChangeImageSrc();" tabindex="1" class="uri-element"
tooltiptext="&locationEditField.tooltip;"/>
<hbox id="MakeRelativeHbox">
<checkbox
<checkbox
id = "MakeRelativeCheckbox"
for = "srcInput"
tabindex="2"/>
@ -44,7 +44,7 @@
<columns><column/><column flex="1"/></columns>
<rows>
<row align="center">
<label
<label
style = "margin-left: 26px"
control = "titleInput"
accesskey = "&title.accessKey;"
@ -58,7 +58,7 @@
tabindex="4"/>
</row>
<row align="center">
<radio id = "altTextRadio"
<radio id = "altTextRadio"
label = "&altText.label;"
accesskey = "&altText.accessKey;"
tooltiptext="&altTextEditField.tooltip;"
@ -74,7 +74,7 @@
</rows>
</grid>
<radio id = "noAltTextRadio"
<radio id = "noAltTextRadio"
label = "&noAltText.label;"
accesskey = "&noAltText.accessKey;"
oncommand = "SetAltTextDisabled(true);"/>
@ -110,13 +110,13 @@
<hbox>
<radiogroup id="imgSizeGroup">
<radio
id = "actualSizeRadio"
id = "actualSizeRadio"
label = "&actualSizeRadio.label;"
accesskey = "&actualSizeRadio.accessKey;"
tooltiptext="&actualSizeRadio.tooltip;"
oncommand = "SetActualSize()"/>
<radio
id = "customSizeRadio"
id = "customSizeRadio"
label = "&customSizeRadio.label;"
selected = "true"
accesskey = "&customSizeRadio.accessKey;"
@ -143,7 +143,7 @@
accesskey = "&widthEditField.accessKey;"
value = "&widthEditField.label;" />
<textbox
id = "widthInput"
id = "widthInput"
class = "narrow"
oninput = "constrainProportions(this.id, 'heightInput')"/>
<menulist id = "widthUnitsMenulist"
@ -156,14 +156,14 @@
accesskey = "&heightEditField.accessKey;"
value = "&heightEditField.label;" />
<textbox
id = "heightInput"
id = "heightInput"
class = "narrow"
oninput = "constrainProportions(this.id, 'widthInput')"/>
<menulist id = "heightUnitsMenulist"
oncommand = "doDimensionEnabling();" />
<!-- contents are appended by JS -->
</row>
</rows>
</rows>
</grid>
<spacer flex="1"/>
</vbox>
@ -175,31 +175,31 @@
<columns><column/><column/><column/></columns>
<rows>
<row align="center">
<label
class = "align-right"
<label
class = "align-right"
id = "leftrightLabel"
control = "imageleftrightInput"
accesskey = "&leftRightEditField.accessKey;"
value = "&leftRightEditField.label;"/>
<textbox
class = "narrow"
id = "imageleftrightInput"
id = "imageleftrightInput"
oninput = "forceInteger(this.id)"/>
<label
<label
id = "leftrighttypeLabel"
value = "&pixelsPopup.value;" />
</row>
<spacer class="spacer"/>
<row align="center">
<label
class = "align-right"
<label
class = "align-right"
id = "topbottomLabel"
control = "imagetopbottomInput"
accesskey = "&topBottomEditField.accessKey;"
value = "&topBottomEditField.label;"/>
<textbox
class = "narrow"
id = "imagetopbottomInput"
id = "imagetopbottomInput"
oninput = "forceInteger(this.id)"/>
<label
id = "topbottomtypeLabel"
@ -207,16 +207,16 @@
</row>
<spacer class="spacer"/>
<row align="center">
<label class = "align-right"
<label class = "align-right"
id = "borderLabel"
control = "border"
accesskey = "&borderEditField.accessKey;"
value = "&borderEditField.label;"/>
<textbox
class = "narrow"
id = "border"
id = "border"
oninput = "forceInteger(this.id)"/>
<label
<label
id = "bordertypeLabel"
value = "&pixelsPopup.value;" />
</row>

4
editor/ui/dialogs/content/EdInputImage.xul
Просмотреть файл

@ -6,8 +6,8 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdImageOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdImageOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInputProperties.dtd">
<dialog title="&windowTitleImage.label;"

2
editor/ui/dialogs/content/EdInputProps.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInputProperties.dtd">
<dialog title="&windowTitle.label;"

2
editor/ui/dialogs/content/EdInsSrc.xul
Просмотреть файл

@ -7,7 +7,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInsertSource.dtd">

2
editor/ui/dialogs/content/EdInsertChars.js
Просмотреть файл

@ -45,7 +45,7 @@ function onAccept()
CategoryGroup.setAttribute("category", category);
CategoryGroup.setAttribute("letter_index", indexL);
CategoryGroup.setAttribute("char_index", indexM);
// Don't close the dialog
return false;
}

4
editor/ui/dialogs/content/EdInsertChars.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInsertChars.dtd">
@ -35,7 +35,7 @@
<radio id="Upper" label="&otherUpper.label;" oncommand="ChangeCategory(this.id)"/>
<radio id="Lower" label="&otherLower.label;" oncommand="ChangeCategory(this.id)"/>
<radio id="Symbol" label="&commonSymbols.label;" oncommand="ChangeCategory(this.id)"/>
</radiogroup>
</radiogroup>
<spacer class="spacer"/>
</groupbox>
<hbox equalsize="always">

2
editor/ui/dialogs/content/EdInsertMath.xul
Просмотреть файл

@ -7,7 +7,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInsertMath.dtd">

2
editor/ui/dialogs/content/EdInsertTOC.js
Просмотреть файл

@ -262,7 +262,7 @@ function BuildTOC(update)
}
else {
// we can keep the list itself but let's get rid of the TOC entries
while (toc.hasChildNodes())
while (toc.hasChildNodes())
toc.lastChild.remove();
}
}

12
editor/ui/dialogs/content/EdInsertTable.js
Просмотреть файл

@ -54,7 +54,7 @@ function Startup()
// Set initial number to 2 rows, 2 columns:
// Note, these are not attributes on the table,
// so don't put them in InitDialog(),
// else the user's values will be trashed when they use
// else the user's values will be trashed when they use
// the Advanced Edit dialog
gDialog.rowsInput.value = 2;
gDialog.columnsInput.value = 2;
@ -75,7 +75,7 @@ function Startup()
// We get them from globalElement copy so this can be used
// by AdvancedEdit(), which is shared by all property dialogs
function InitDialog()
{
{
// Get default attributes set on the created table:
// Get the width attribute of the element, stripping out "%"
// This sets contents of menu combobox list
@ -90,7 +90,7 @@ function ChangeRowOrColumn(id)
forceInteger(id);
// Enable OK only if both rows and columns have a value > 0
var enable = gDialog.rowsInput.value.length > 0 &&
var enable = gDialog.rowsInput.value.length > 0 &&
gDialog.rowsInput.value > 0 &&
gDialog.columnsInput.value.length > 0 &&
gDialog.columnsInput.value > 0;
@ -180,10 +180,10 @@ function onAccept()
// contiguous cells with a table, so
// join the selected cells
gActiveEditor.joinTableCells(false);
// Get the cell everything was merged into
element = gActiveEditor.getFirstSelectedCell();
// Collapse selection into just that cell
gActiveEditor.selection.collapse(element,0);
}
@ -192,7 +192,7 @@ function onAccept()
{
// Empty just the contents of the cell
gActiveEditor.deleteTableCellContents();
// Collapse selection to start of empty cell...
gActiveEditor.selection.collapse(element,0);
// ...but it will contain a <br> placeholder

4
editor/ui/dialogs/content/EdInsertTable.xul
Просмотреть файл

@ -7,7 +7,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorInsertTable.dtd">
@ -65,7 +65,7 @@
accesskey="&borderEditField.accessKey;"
tooltiptext="&borderEditField.tooltip;" />
<textbox class="narrow" id="borderInput" oninput="forceInteger(this.id)" />
<label value="&pixels.label;"/>
<label value="&pixels.label;"/>
</hbox>
<!-- from EdDialogOverlay -->
<vbox id="AdvancedEdit"/>

2
editor/ui/dialogs/content/EdLabelProps.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorLabelProperties.dtd">
<dialog title="&windowTitle.label;"

4
editor/ui/dialogs/content/EdLinkChecker.js
Просмотреть файл

@ -153,8 +153,8 @@ function SetItemStatus(url, status)
if (!status)
status = "busy";
// Just set attribute for status icon
// if we already have this url
// Just set attribute for status icon
// if we already have this url
let listitem = document.querySelector('listitem[label="' + url + '"]');
if (listitem)
{

2
editor/ui/dialogs/content/EdLinkChecker.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdLinkChecker.dtd">
<!-- dialog containing a control requiring initial setup -->

30
editor/ui/dialogs/content/EdLinkProps.js
Просмотреть файл

@ -77,7 +77,7 @@ function Startup()
// the user probably wants to extend existing link to new selection,
// so check if either end of selection is within a link
// POTENTIAL PROBLEM: This prevents user from selecting text in an existing
// link and making 2 links.
// link and making 2 links.
// Note that this isn't a problem with images, handled above
anchorElement = gActiveEditor.getElementOrParentByTagName("href", gActiveEditor.selection.anchorNode);
@ -108,11 +108,11 @@ function Startup()
dump("Failed to get selected element or create a new one!\n");
window.close();
return;
}
}
// We insert at caret only when nothing is selected
insertLinkAtCaret = gActiveEditor.selection.isCollapsed;
var selectedText;
if (insertLinkAtCaret)
{
@ -130,13 +130,13 @@ function Startup()
// We get here if selection is exactly around a link node
// Check if selection has some text - use that first
selectedText = GetSelectionAsText();
if (!selectedText)
if (!selectedText)
{
// No text, look for first image in the selection
var children = anchorElement.childNodes;
if (children)
{
for(var i=0; i < children.length; i++)
for(var i=0; i < children.length; i++)
{
var nodeName = children.item(i).nodeName.toLowerCase();
if (nodeName == "img")
@ -157,7 +157,7 @@ function Startup()
gDialog.linkTextMessage.setAttribute("value", imageElement.src);
} else {
gDialog.linkTextCaption.setAttribute("label", GetString("LinkText"));
if (selectedText)
if (selectedText)
{
// Use just the first 60 characters and add "..."
gDialog.linkTextMessage.setAttribute("value", TruncateStringAtWordEnd(ReplaceWhitespace(selectedText, " "), 60, true));
@ -178,10 +178,10 @@ function Startup()
// Set data for the dialog controls
InitDialog();
// Search for a URI pattern in the selected text
// as candidate href
selectedText = TrimString(selectedText);
selectedText = TrimString(selectedText);
if (!gDialog.hrefInput.value && TextIsURI(selectedText))
gDialog.hrefInput.value = selectedText;
@ -196,7 +196,7 @@ function Startup()
gDialog.linkTextInput.hidden = true;
gDialog.linkTextInput = null;
}
// This sets enable state on OK button
doEnabling();
@ -208,7 +208,7 @@ function Startup()
// by AdvancedEdit(), which is shared by all property dialogs
function InitDialog()
{
// Must use getAttribute, not "globalElement.href",
// Must use getAttribute, not "globalElement.href",
// or foreign chars aren't converted correctly!
gDialog.hrefInput.value = globalElement.getAttribute("href");
@ -220,7 +220,7 @@ function doEnabling()
{
// We disable Ok button when there's no href text only if inserting a new link
var enable = insertNew ? (TrimString(gDialog.hrefInput.value).length > 0) : true;
// anon. content, so can't use SetElementEnabledById here
var dialogNode = document.getElementById("linkDlg");
dialogNode.getButton("accept").disabled = !enable;
@ -288,7 +288,7 @@ function onAccept()
// Get text to use for a new link
if (insertLinkAtCaret)
{
// Append the link text as the last child node
// Append the link text as the last child node
// of the anchor node
var textNode = gActiveEditor.document.createTextNode(newLinkText);
if (textNode)
@ -311,7 +311,7 @@ function onAccept()
return true;
}
}
// Check if the link was to a heading
// Check if the link was to a heading
if (href in gHNodeArray)
{
var anchorNode = gActiveEditor.createElementWithDefaults("a");
@ -319,7 +319,7 @@ function onAccept()
{
anchorNode.name = href.substr(1);
// Insert the anchor into the document,
// Insert the anchor into the document,
// but don't let the transaction change the selection
gActiveEditor.setShouldTxnSetSelection(false);
gActiveEditor.insertNode(anchorNode, gHNodeArray[href], 0);
@ -327,7 +327,7 @@ function onAccept()
}
}
gActiveEditor.endTransaction();
}
}
else if (!insertNew)
{
// We already had a link, but empty HREF means remove it

30
editor/ui/dialogs/content/EdListProps.js
Просмотреть файл

@ -46,7 +46,7 @@ function Startup()
gDialog.RadioGroup = document.getElementById("RadioGroup");
gDialog.ChangeAllRadio = document.getElementById("ChangeAll");
gDialog.ChangeSelectedRadio = document.getElementById("ChangeSelected");
// Try to get an existing list(s)
var mixedObj = { value: null };
try {
@ -85,17 +85,17 @@ function Startup()
function InitDialog()
{
// Note that if mixed, we we pay attention
// Note that if mixed, we we pay attention
// only to the anchor node's list type
// (i.e., don't confuse user with "mixed" designation)
if (gListElement)
gListType = gListElement.nodeName.toLowerCase();
else
gListType = "";
gDialog.ListTypeList.value = gListType;
gDialog.StartingNumberInput.value = "";
// Last param = true means attribute value is case-sensitive
var type = globalElement ? GetHTMLOrCSSStyleValue(globalElement, "type", "list-style-type") : null;
@ -137,7 +137,7 @@ function InitDialog()
}
// Convert attribute number to appropriate letter or roman numeral
gDialog.StartingNumberInput.value =
gDialog.StartingNumberInput.value =
ConvertStartAttrToUserString(globalElement.getAttribute("start"), type);
}
BuildBulletStyleList();
@ -201,15 +201,15 @@ function BuildBulletStyleList()
gDialog.BulletStyleList.appendItem(GetString("Style_a"), gLowerLetters);
gDialog.BulletStyleList.value = gNumberStyleType;
}
else
}
else
{
gDialog.BulletStyleList.setAttribute("disabled", "true");
gDialog.BulletStyleLabel.setAttribute("disabled", "true");
gDialog.StartingNumberInput.setAttribute("disabled", "true");
gDialog.StartingNumberLabel.setAttribute("disabled", "true");
}
// Disable advanced edit button if changing to "normal"
if (gListType)
gDialog.AdvancedEditButton.removeAttribute("disabled");
@ -231,7 +231,7 @@ function SelectListType()
if (gListType != NewType)
{
gListType = NewType;
// Create a newlist object for Advanced Editing
try {
if (gListType)
@ -256,7 +256,7 @@ function SelectBulletStyle()
{
// Convert existing input value to attr number first,
// then convert to the appropriate format for the newly-selected
gDialog.StartingNumberInput.value =
gDialog.StartingNumberInput.value =
ConvertStartAttrToUserString( ConvertUserStringToStartAttr(gNumberStyleType), type);
gNumberStyleType = type;
@ -268,7 +268,7 @@ function SelectBulletStyle()
function ValidateData()
{
gBulletStyleType = gDialog.BulletStyleList.value;
// globalElement should already be of the correct type
// globalElement should already be of the correct type
if (globalElement)
{
@ -282,7 +282,7 @@ function ValidateData()
editor.removeAttributeOrEquivalent(globalElement, "type", true);
} catch (e) {}
}
}
else if (gListType == "ol")
{
if (gBulletStyleType)
@ -291,7 +291,7 @@ function ValidateData()
try {
editor.removeAttributeOrEquivalent(globalElement, "type", true);
} catch (e) {}
var startingNumber = ConvertUserStringToStartAttr(gBulletStyleType);
if (startingNumber)
globalElement.setAttribute("start", startingNumber);
@ -403,7 +403,7 @@ function onAccept()
changeList = true;
}
else
changeList = gMixedListSelection || gListType != gOriginalListType ||
changeList = gMixedListSelection || gListType != gOriginalListType ||
gBulletStyleType != gOriginalStyleType;
if (changeList)
{
@ -432,7 +432,7 @@ function onAccept()
}
editor.endTransaction();
SaveWindowLocation();
return true;

6
editor/ui/dialogs/content/EdListProps.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorListProperties.dtd">
<dialog title="&windowTitle.label;"
@ -35,8 +35,8 @@
</groupbox>
<spacer class="spacer"/>
<!-- message text and list items are set in JS
text value should be identical to string with id=BulletStyle in editor.properties
<!-- message text and list items are set in JS
text value should be identical to string with id=BulletStyle in editor.properties
-->
<groupbox flex="1"><caption id="BulletStyleLabel" label="&bulletStyle.label;"/>
<menulist class="MinWidth10em" id="BulletStyle" oncommand="SelectBulletStyle()">

6
editor/ui/dialogs/content/EdNamedAnchorProps.js
Просмотреть файл

@ -32,7 +32,7 @@ function Startup()
gOriginalName = ConvertToCDATAString(gAnchorElement.name);
} else {
gInsertNew = true;
// We don't have an element selected,
// We don't have an element selected,
// so create one with default attributes
gAnchorElement = editor.createElementWithDefaults(kTagName);
if (gAnchorElement) {
@ -58,7 +58,7 @@ function Startup()
}
InitDialog();
DoEnabling();
SetTextboxFocus(gDialog.NameInput);
SetWindowLocation();
@ -122,7 +122,7 @@ function ValidateData()
if (gOriginalName != name && AnchorNameExists(name))
{
ShowInputErrorMessage(GetString("DuplicateAnchorNameError").replace(/%name%/,name));
ShowInputErrorMessage(GetString("DuplicateAnchorNameError").replace(/%name%/,name));
SetTextboxFocus(gDialog.NameInput);
return false;
}

4
editor/ui/dialogs/content/EdNamedAnchorProps.xul
Просмотреть файл

@ -7,7 +7,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdNamedAnchorProperties.dtd">
@ -27,7 +27,7 @@
<label control="nameInput"
value="&anchorNameEditField.label;"
accesskey="&anchorNameEditField.accessKey;"/>
<textbox class="MinWidth20em" id="nameInput" oninput="ChangeName()"
<textbox class="MinWidth20em" id="nameInput" oninput="ChangeName()"
tooltiptext="&nameInput.tooltip;"/>
<spacer class="spacer"/>
<!-- from EdDialogOverlay -->

6
editor/ui/dialogs/content/EdPageProps.js
Просмотреть файл

@ -29,7 +29,7 @@ function Startup()
gDialog.TitleInput = document.getElementById("TitleInput");
gDialog.AuthorInput = document.getElementById("AuthorInput");
gDialog.DescriptionInput = document.getElementById("DescriptionInput");
// Default string for new page is set from DTD string in XUL,
// so set only if not new doc URL
var location = GetDocumentUrl();
@ -83,7 +83,7 @@ function Startup()
gInsertNewDescription = true;
}
InitDialog();
SetTextboxFocus(gDialog.TitleInput);
@ -140,7 +140,7 @@ function onAccept()
// because TITLE is a required HTML element
if (gTitleWasEdited)
SetDocumentTitle(gNewTitle);
if (gAuthorWasEdited)
SetMetaElementContent(gAuthorElement, gAuthor, gInsertNewAuthor, false);

2
editor/ui/dialogs/content/EdPageProps.xul
Просмотреть файл

@ -7,7 +7,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorPageProperties.dtd">

4
editor/ui/dialogs/content/EdReplace.js
Просмотреть файл

@ -126,7 +126,7 @@ function onFindNext()
gReplaceDialog.findInput.select();
gReplaceDialog.findInput.focus();
return false;
}
}
return true;
}
@ -242,7 +242,7 @@ function onReplaceAll()
// and to make sure we close the transaction, guard against exceptions:
try {
// Make a range containing the current selection,
// Make a range containing the current selection,
// so we don't go past it when we wrap.
var selection = gEditor.selection;
var selecRange;

2
editor/ui/dialogs/content/EdSelectProps.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorSelectProperties.dtd">
<dialog title="&windowTitle.label;"

14
editor/ui/dialogs/content/EdSpellCheck.js
Просмотреть файл

@ -77,12 +77,12 @@ function spellCheckStarted() {
}
InitLanguageMenu(curLang);
// Get the first misspelled word and setup all UI
NextWord();
// When startup param is true, setup different UI when spell checking
// just before sending mail message
// When startup param is true, setup different UI when spell checking
// just before sending mail message
if (window.arguments[0])
{
// If no misspelled words found, simply close dialog and send message
@ -236,14 +236,14 @@ function SetWidgetsForMisspelledWord()
function CheckWord()
{
var word = gDialog.ReplaceWordInput.value;
if (word)
if (word)
{
if (gSpellChecker.CheckCurrentWord(word))
{
FillSuggestedList(word);
SetReplaceEnable();
}
else
}
else
{
ClearListbox(gDialog.SuggestedList);
var item = gDialog.SuggestedList.appendItem(GetString("CorrectSpelling"), "");
@ -449,7 +449,7 @@ function FillSuggestedList(misspelledWord)
// Initialize with first suggested list by selecting it
gDialog.SuggestedList.selectedIndex = 0;
}
}
}
else
{
item = list.appendItem("", "");

6
editor/ui/dialogs/content/EdSpellCheck.xul
Просмотреть файл

@ -4,8 +4,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorSpellCheck.dtd">
<!-- dialog containing a control requiring initial setup -->
@ -77,7 +77,7 @@
<button id="IgnoreAll" oncommand="IgnoreAll();" label="&ignoreAllButton.label;"
accesskey="&ignoreAllButton.accessKey;"/>
</row>
</rows>
</rows>
</grid>
<separator/>
<label value="&userDictionary.label;"/>

6
editor/ui/dialogs/content/EdTableProps.js
Просмотреть файл

@ -715,7 +715,7 @@ function DoCellSelection()
// else we ignore CSS, JS, and HTML attributes not already in dialog
SetElementEnabled(gDialog.AdvancedEditCell, gSelectedCellCount == 1);
gDialog.AdvancedEditCell.setAttribute("tooltiptext",
gDialog.AdvancedEditCell.setAttribute("tooltiptext",
gSelectedCellCount > 1 ? GetString("AdvancedEditForCellMsg") :
gDialog.AdvancedEditCellToolTipText);
}
@ -781,9 +781,9 @@ function ValidateTableData()
// (This is a global to the dialog and we ask only once per dialog session)
if ( !gCanDelete &&
(gNewRowCount < gRowCount ||
gNewColCount < gColCount) )
gNewColCount < gColCount) )
{
if (ConfirmWithTitle(GetString("DeleteTableTitle"),
if (ConfirmWithTitle(GetString("DeleteTableTitle"),
GetString("DeleteTableMsg"),
GetString("DeleteCells")) )
{

6
editor/ui/dialogs/content/EdTableProps.xul
Просмотреть файл

@ -7,7 +7,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorTableProperties.dtd">
@ -171,7 +171,7 @@
</hbox>
</vbox>
<spacer class="bigspacer"/>
<description class="wrap" flex="1">&applyBeforeChange.label;</description>
<description class="wrap" flex="1">&applyBeforeChange.label;</description>
</groupbox>
<hbox align="center">
<!-- cell size groupbox -->
@ -260,7 +260,7 @@
</hbox>
<spacer flex="1"/>
</vbox><!-- Cell Panel -->
</tabpanels>
</tabpanels>
</tabbox>
<spacer class="spacer"/>
</dialog>

2
editor/ui/dialogs/content/EdTextAreaProps.js
Просмотреть файл

@ -72,7 +72,7 @@ function Startup()
InitMoreFewer();
SetTextboxFocus(gDialog.textareaName);
SetWindowLocation();
}

2
editor/ui/dialogs/content/EdTextAreaProps.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorTextAreaProperties.dtd">
<dialog title="&windowTitle.label;"

2
editor/ui/dialogs/content/EditConflict.js
Просмотреть файл

@ -10,7 +10,7 @@ function Startup()
window.close();
return;
}
SetWindowLocation();
}

4
editor/ui/dialogs/content/EditConflict.xul
Просмотреть файл

@ -7,7 +7,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditConflict.dtd">
@ -22,7 +22,7 @@
<script type="application/javascript" src="chrome://editor/content/EditConflict.js"/>
<spacer id="location" offsetY="50" persist="offsetX offsetY"/>
<label value ="&conflictWarning.label;"/>
<spacer class="bigspacer"/>
<label value ="&conflictResolve.label;"/>

34
editor/ui/dialogs/content/EditorPublish.js
Просмотреть файл

@ -106,7 +106,7 @@ function Startup()
}
if (!siteFound)
{
// Not found in site database
// Not found in site database
// Setup for a new site and use data from a remote URL
if (!addNewSite)
AddNewSite();
@ -133,7 +133,7 @@ function Startup()
gDialog.PageTitleInput.value = gPreviousTitle;
gDialog.FilenameInput.value = decodeURIComponent(filename);
if (!addNewSite)
{
// If not adding a site and we haven't selected a site -- use initial or default site
@ -150,7 +150,7 @@ function Startup()
// No selected site -- assume same directory
gDialog.OtherDirRadiogroup.selectedItem = gDialog.SameLocationRadio;
}
else if (gPublishSiteData[gDialog.SiteList.selectedIndex].docDir ==
else if (gPublishSiteData[gDialog.SiteList.selectedIndex].docDir ==
gPublishSiteData[gDialog.SiteList.selectedIndex].otherDir)
{
// For now, check "same location" if dirs are already set to same directory
@ -205,7 +205,7 @@ function doEnabling()
function SelectSiteList()
{
var selectedSiteIndex = gDialog.SiteList.selectedIndex;
var selectedSiteIndex = gDialog.SiteList.selectedIndex;
var siteName = "";
var publishUrl = "";
@ -265,11 +265,11 @@ function AddNewSite()
// to automatically switch to "Settings" panel
// to enter data for new site
SwitchPanel(gDialog.SettingsTab);
gDialog.SiteList.selectedIndex = -1;
SelectSiteList();
gSettingsChanged = true;
SetTextboxFocus(gDialog.SiteNameInput);
@ -329,7 +329,7 @@ function GetOtherDirInput()
function ChooseDir(menulist)
{
//TODO: For FTP publish destinations, get file listing of just dirs
//TODO: For FTP publish destinations, get file listing of just dirs
// and build a tree to let user select dir
}
@ -344,7 +344,7 @@ function ValidateSettings()
if (PublishSiteNameExists(siteName, gPublishSiteData, gDialog.SiteList.selectedIndex))
{
SwitchPanel(gDialog.SettingsTab);
ShowInputErrorMessage(GetString("DuplicateSiteNameError").replace(/%name%/, siteName));
ShowInputErrorMessage(GetString("DuplicateSiteNameError").replace(/%name%/, siteName));
SetTextboxFocus(gDialog.SiteNameInput);
return false;
}
@ -360,7 +360,7 @@ function ValidateSettings()
// Assume scheme = "ftp://" if missing
// This compensates when user enters hostname w/o scheme (as most ISPs provide)
if (!GetScheme(publishUrl))
publishUrl = "ftp://" + publishUrl;
publishUrl = "ftp://" + publishUrl;
gDialog.PublishUrlInput.value = publishUrl;
}
@ -375,10 +375,10 @@ function ValidateSettings()
var savePassword = gDialog.SavePassword.checked;
var password = gDialog.PasswordInput.value;
var publishOtherFiles = gDialog.OtherDirCheckbox.checked;
//XXX If there was a username and/or password in the publishUrl
//XXX If there was a username and/or password in the publishUrl
// AND in the input field, which do we use?
// Let's use those in url only if input is empty
// Let's use those in url only if input is empty
if (!username)
{
username = urlUserObj.value;
@ -392,7 +392,7 @@ function ValidateSettings()
gSettingsChanged = true;
}
// Update or add data for a site
// Update or add data for a site
var siteIndex = gDialog.SiteList.selectedIndex;
var newSite = false;
@ -410,7 +410,7 @@ function ValidateSettings()
siteIndex = 0;
gDefaultSiteIndex = 0;
gDefaultSiteName = siteName;
}
}
gPublishSiteData[siteIndex] = {};
gPublishSiteData[siteIndex].docDir = "";
gPublishSiteData[siteIndex].otherDir = "";
@ -451,7 +451,7 @@ function ValidateSettings()
}
else
{
// Update selected item if sitename changed
// Update selected item if sitename changed
var selectedItem = gDialog.SiteList.selectedItem;
if (selectedItem)
{
@ -466,7 +466,7 @@ function ValidateSettings()
}
}
}
// Get the directory name in site to publish to
var docDir = GetDocDirInput();
@ -487,7 +487,7 @@ function ValidateSettings()
gReturnData.publishUrl = publishUrl;
gReturnData.browseUrl = browseUrl;
gReturnData.username = username;
// Note that we use the password for the next publish action
// Note that we use the password for the next publish action
// even if savePassword is false; but we won't save it in PasswordManager database
gReturnData.password = password;
gReturnData.savePassword = savePassword;

12
editor/ui/dialogs/content/EditorPublish.xul
Просмотреть файл

@ -7,8 +7,8 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EditorPublishOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EditorPublishOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorPublish.dtd">
@ -47,7 +47,7 @@
accesskey="&siteList.accesskey;"
control="SiteList"/>
<!-- Contents filled in at runtime -->
<menulist id="SiteList"
<menulist id="SiteList"
style="min-width:18em; max-width:18em;" crop="right"
tooltiptext="&siteList.tooltip;"
oncommand="SelectSiteList();"/>
@ -62,7 +62,7 @@
<row align="center">
<label value="&pageTitle.label;" accesskey="&pageTitle.accesskey;"
control="PageTitleInput"/>
<textbox id="PageTitleInput"
<textbox id="PageTitleInput"
tooltiptext="&pageTitle.tooltip;" class="minWidth15"/>
<label value="&pageTitleExample.label;"/>
</row>
@ -87,7 +87,7 @@
<spacer class="spacer"/>
<groupbox>
<caption>
<checkbox id="OtherDirCheckbox" label="&publishImgCheckbox.label;"
<checkbox id="OtherDirCheckbox" label="&publishImgCheckbox.label;"
accesskey="&publishImgCheckbox.accesskey;"
tooltiptext="&publishImgCheckbox.tooltip;"
oncommand="doEnabling();"/>
@ -127,6 +127,6 @@
<!-- from EditorPublishOverlay.xul -->
<vbox id="PublishSettingsInputs" flex="1"/>
</hbox><!-- Settings Panel -->
</tabpanels>
</tabpanels>
</tabbox>
</dialog>

6
editor/ui/dialogs/content/EditorPublishOverlay.xul
Просмотреть файл

@ -29,7 +29,7 @@
<spacer class="spacer"/>
<label value="&browseUrl.label;" accesskey="&browseUrl.accesskey;"
control="BrowseUrlInput"/>
<textbox id="BrowseUrlInput" class="MinWidth20em uri-element"
<textbox id="BrowseUrlInput" class="MinWidth20em uri-element"
tooltiptext="&browseUrl.tooltip;" oninput="onInputSettings();"/>
<spacer class="spacer"/>
</groupbox>
@ -48,11 +48,11 @@
<label value="&password.label;" accesskey="&password.accesskey;"
control="PasswordInput"/>
<hbox>
<textbox id="PasswordInput" type="password" class="MinWidth5em"
<textbox id="PasswordInput" type="password" class="MinWidth5em"
oninput="onInputSettings();"
tooltiptext="&password.tooltip;"/>
<checkbox id="SavePassword" label="&savePassword.label;"
accesskey="&savePassword.accesskey;"
accesskey="&savePassword.accesskey;"
tooltiptext="&savePassword.tooltip;"
oncommand="onInputSettings();"/>
</hbox>

22
editor/ui/dialogs/content/EditorPublishProgress.js
Просмотреть файл

@ -79,12 +79,12 @@ function Startup()
title = "(" + opener.gUntitledString + ")";
document.title = GetString("PublishProgressCaption").replace(/%title%/, title);
document.getElementById("PublishToSite").value =
GetString("PublishToSite").replace(/%title%/, TruncateStringAtWordEnd(gPublishData.siteName, 25));
document.getElementById("PublishToSite").value =
GetString("PublishToSite").replace(/%title%/, TruncateStringAtWordEnd(gPublishData.siteName, 25));
// Show publishing destination URL
document.getElementById("PublishUrl").value = gPublishData.publishUrl;
// Show subdirectories only if not empty
if (gPublishData.docDir || gPublishData.otherDir)
{
@ -92,7 +92,7 @@ function Startup()
document.getElementById("docDir").value = gPublishData.docDir;
else
document.getElementById("DocSubdir").hidden = true;
if (gPublishData.publishOtherFiles && gPublishData.otherDir)
document.getElementById("otherDir").value = gPublishData.otherDir;
else
@ -197,8 +197,8 @@ function SetProgressFinished(filename, networkStatus)
break;
case kNetReset:
// We get this when subdir doesn't exist AND
// if filename used is same as an existing subdir
var dir = (gPublishData.filename == filename) ?
// if filename used is same as an existing subdir
var dir = (gPublishData.filename == filename) ?
gPublishData.docDir : gPublishData.otherDir;
if (dir)
@ -209,9 +209,9 @@ function SetProgressFinished(filename, networkStatus)
gStatusMessage = gStatusMessage.replace(/%file%/, filename);
// Remove directory from saved prefs
// XXX Note that if subdir is good,
// but filename = next level subdirectory name,
// we really shouldn't remove subdirectory,
// XXX Note that if subdir is good,
// but filename = next level subdirectory name,
// we really shouldn't remove subdirectory,
// but it's impossible to differentiate this case!
RemovePublishSubdirectoryFromPrefs(gPublishData, dir);
}
@ -340,7 +340,7 @@ function RequestCloseDialog()
if (!gDialog.KeepOpen.checked)
{
// Leave window open a minimum amount of time
// Leave window open a minimum amount of time
gTimerID = setTimeout(CloseDialog, 3000);
}
@ -353,7 +353,7 @@ function RequestCloseDialog()
if (gFileNotFound && gTotalFileCount-gSucceededCount)
{
// Show number of files that failed to upload
gStatusMessage =
gStatusMessage =
(GetString("FailedFileMsg").replace(/%x%/,(gTotalFileCount-gSucceededCount)))
.replace(/%total%/,gTotalFileCount);

2
editor/ui/dialogs/content/EditorPublishProgress.xul
Просмотреть файл

@ -6,7 +6,7 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorPublishProgress.dtd">
<!-- dialog containing a control requiring initial setup -->

14
editor/ui/dialogs/content/EditorPublishSettings.js
Просмотреть файл

@ -153,7 +153,7 @@ function SetDefault()
{
gDefaultSiteIndex = index;
gDefaultSiteName = gPublishSiteData[index].siteName;
// Set bold style on new default
var item = gDialog.SiteList.firstChild;
while (item)
@ -194,10 +194,10 @@ function SetSelectedSiteIndex(index)
}
function InitSiteSettings(selectedSiteIndex)
{
{
// Index to the site we will need to update if settings changed
gCurrentSiteIndex = selectedSiteIndex;
SetSelectedSiteIndex(selectedSiteIndex);
var haveData = (gPublishSiteData && selectedSiteIndex != -1);
@ -244,7 +244,7 @@ function UpdateSettings()
}
if (PublishSiteNameExists(newName, gPublishSiteData, gCurrentSiteIndex))
{
ShowInputErrorMessage(GetString("DuplicateSiteNameError").replace(/%name%/, newName));
ShowInputErrorMessage(GetString("DuplicateSiteNameError").replace(/%name%/, newName));
SetTextboxFocus(gDialog.SiteNameInput);
return false;
}
@ -274,7 +274,7 @@ function UpdateSettings()
gCurrentSiteIndex = gPublishSiteData.length;
newSiteData = true;
}
if (newSiteData)
{
// Init new site profile
@ -304,12 +304,12 @@ function UpdateSettings()
FillSiteList();
// Select current site in list
// Select current site in list
SetSelectedSiteIndex(gCurrentSiteIndex);
// Signal saving data to prefs
gSiteDataChanged = true;
// Clear current site flags
gSettingsChanged = false;
gAddNewSite = false;

4
editor/ui/dialogs/content/EditorPublishSettings.xul
Просмотреть файл

@ -7,8 +7,8 @@
<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EditorPublishOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?>
<?xul-overlay href="chrome://editor/content/EditorPublishOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorPublish.dtd">

28
editor/ui/dialogs/content/EditorSaveAsCharset.js
Просмотреть файл

@ -54,14 +54,14 @@ function Startup()
}
gDialog.TitleInput = document.getElementById("TitleInput");
gDialog.charsetTree = document.getElementById('CharsetTree');
gDialog.charsetTree = document.getElementById('CharsetTree');
gDialog.exportToText = document.getElementById('ExportToText');
gContenttypeElement = GetMetaElementByAttribute("http-equiv", "content-type");
if (!gContenttypeElement && (editor.contentsMIMEType != 'text/plain'))
if (!gContenttypeElement && (editor.contentsMIMEType != 'text/plain'))
{
gContenttypeElement = CreateMetaElementWithAttribute("http-equiv", "content-type");
if (!gContenttypeElement )
if (!gContenttypeElement )
{
window.close();
return;
@ -87,17 +87,17 @@ function Startup()
var helpText = document.createTextNode(GetString("DocTitleHelp"));
if (helpTextParent)
helpTextParent.appendChild(helpText);
// SET FOCUS TO FIRST CONTROL
SetTextboxFocus(gDialog.TitleInput);
gInitDone = true;
SetWindowLocation();
}
function InitDialog()
function InitDialog()
{
gDialog.TitleInput.value = GetDocumentTitle();
@ -115,17 +115,17 @@ function onAccept()
var editor = GetCurrentEditor();
editor.beginTransaction();
if(gCharsetWasChanged)
if(gCharsetWasChanged)
{
try {
SetMetaElementContent(gContenttypeElement, "text/html; charset=" + gCharset, gInsertNewContentType, true);
SetMetaElementContent(gContenttypeElement, "text/html; charset=" + gCharset, gInsertNewContentType, true);
editor.documentCharacterSet = gCharset;
} catch (e) {}
}
editor.endTransaction();
if(gTitleWasEdited)
if(gTitleWasEdited)
SetDocumentTitle(TrimString(gDialog.TitleInput.value));
window.opener.ok = true;
@ -137,9 +137,9 @@ function onAccept()
function SelectCharset()
{
if(gInitDone)
if(gInitDone)
{
try
try
{
gCharset = gCharsetInfo[gDialog.charsetTree.currentIndex].value;
if (gCharset)
@ -152,5 +152,5 @@ function SelectCharset()
function TitleChanged()
{
gTitleWasEdited = true;
gTitleWasEdited = true;
}

144
editor/ui/jar.mn
Просмотреть файл

@ -12,75 +12,75 @@ comm.jar:
% overlay chrome://navigator/content/navigatorOverlay.xul chrome://editor/content/editorNavigatorOverlay.xul
% content editor-region %content/editor-region/
#endif
content/editor/editor.js (composer/content/editor.js)
content/editor/editorUtilities.js (composer/content/editorUtilities.js)
content/editor/ComposerCommands.js (composer/content/ComposerCommands.js)
content/editor/EditorContent.css (composer/content/EditorContent.css)
content/editor/editorSmileyOverlay.xul (composer/content/editorSmileyOverlay.xul)
content/editor/editorApplicationOverlay.js (composer/content/editorApplicationOverlay.js)
content/editor/editor.js (composer/content/editor.js)
content/editor/editorUtilities.js (composer/content/editorUtilities.js)
content/editor/ComposerCommands.js (composer/content/ComposerCommands.js)
content/editor/EditorContent.css (composer/content/EditorContent.css)
content/editor/editorSmileyOverlay.xul (composer/content/editorSmileyOverlay.xul)
content/editor/editorApplicationOverlay.js (composer/content/editorApplicationOverlay.js)
content/editor/images/tag-anchor.gif (composer/content/images/tag-anchor.gif)
content/editor/EdDialogCommon.js (dialogs/content/EdDialogCommon.js)
content/editor/EdLinkProps.xul (dialogs/content/EdLinkProps.xul)
content/editor/EdLinkProps.js (dialogs/content/EdLinkProps.js)
content/editor/EdImageProps.xul (dialogs/content/EdImageProps.xul)
content/editor/EdImageProps.js (dialogs/content/EdImageProps.js)
content/editor/EdImageOverlay.xul (dialogs/content/EdImageOverlay.xul)
content/editor/EdImageOverlay.js (dialogs/content/EdImageOverlay.js)
content/editor/EdHLineProps.xul (dialogs/content/EdHLineProps.xul)
content/editor/EdHLineProps.js (dialogs/content/EdHLineProps.js)
content/editor/EdReplace.xul (dialogs/content/EdReplace.xul)
content/editor/EdReplace.js (dialogs/content/EdReplace.js)
content/editor/EdSpellCheck.xul (dialogs/content/EdSpellCheck.xul)
content/editor/EdSpellCheck.js (dialogs/content/EdSpellCheck.js)
content/editor/EdDictionary.xul (dialogs/content/EdDictionary.xul)
content/editor/EdDictionary.js (dialogs/content/EdDictionary.js)
content/editor/EdNamedAnchorProps.xul (dialogs/content/EdNamedAnchorProps.xul)
content/editor/EdNamedAnchorProps.js (dialogs/content/EdNamedAnchorProps.js)
content/editor/EdInsertTOC.xul (dialogs/content/EdInsertTOC.xul)
content/editor/EdInsertTOC.js (dialogs/content/EdInsertTOC.js)
content/editor/EdInsertTable.xul (dialogs/content/EdInsertTable.xul)
content/editor/EdInsertTable.js (dialogs/content/EdInsertTable.js)
content/editor/EdInsertMath.xul (dialogs/content/EdInsertMath.xul)
content/editor/EdInsertMath.js (dialogs/content/EdInsertMath.js)
content/editor/EdTableProps.xul (dialogs/content/EdTableProps.xul)
content/editor/EdTableProps.js (dialogs/content/EdTableProps.js)
content/editor/EdFormProps.xul (dialogs/content/EdFormProps.xul)
content/editor/EdFormProps.js (dialogs/content/EdFormProps.js)
content/editor/EdInputProps.xul (dialogs/content/EdInputProps.xul)
content/editor/EdInputProps.js (dialogs/content/EdInputProps.js)
content/editor/EdInputImage.xul (dialogs/content/EdInputImage.xul)
content/editor/EdInputImage.js (dialogs/content/EdInputImage.js)
content/editor/EdTextAreaProps.xul (dialogs/content/EdTextAreaProps.xul)
content/editor/EdTextAreaProps.js (dialogs/content/EdTextAreaProps.js)
content/editor/EdSelectProps.xul (dialogs/content/EdSelectProps.xul)
content/editor/EdSelectProps.js (dialogs/content/EdSelectProps.js)
content/editor/EdButtonProps.xul (dialogs/content/EdButtonProps.xul)
content/editor/EdButtonProps.js (dialogs/content/EdButtonProps.js)
content/editor/EdLabelProps.xul (dialogs/content/EdLabelProps.xul)
content/editor/EdLabelProps.js (dialogs/content/EdLabelProps.js)
content/editor/EdFieldSetProps.xul (dialogs/content/EdFieldSetProps.xul)
content/editor/EdFieldSetProps.js (dialogs/content/EdFieldSetProps.js)
content/editor/EdInsSrc.xul (dialogs/content/EdInsSrc.xul)
content/editor/EdInsSrc.js (dialogs/content/EdInsSrc.js)
content/editor/EdInsertChars.xul (dialogs/content/EdInsertChars.xul)
content/editor/EdInsertChars.js (dialogs/content/EdInsertChars.js)
content/editor/EdDialogOverlay.xul (dialogs/content/EdDialogOverlay.xul)
content/editor/EdAdvancedEdit.xul (dialogs/content/EdAdvancedEdit.xul)
content/editor/EdAdvancedEdit.js (dialogs/content/EdAdvancedEdit.js)
content/editor/EdListProps.xul (dialogs/content/EdListProps.xul)
content/editor/EdListProps.js (dialogs/content/EdListProps.js)
content/editor/EdPageProps.xul (dialogs/content/EdPageProps.xul)
content/editor/EdPageProps.js (dialogs/content/EdPageProps.js)
content/editor/EdColorProps.xul (dialogs/content/EdColorProps.xul)
content/editor/EdColorProps.js (dialogs/content/EdColorProps.js)
content/editor/EdColorPicker.xul (dialogs/content/EdColorPicker.xul)
content/editor/EdColorPicker.js (dialogs/content/EdColorPicker.js)
content/editor/EdAECSSAttributes.js (dialogs/content/EdAECSSAttributes.js)
content/editor/EdAEHTMLAttributes.js (dialogs/content/EdAEHTMLAttributes.js)
content/editor/EdAEJSEAttributes.js (dialogs/content/EdAEJSEAttributes.js)
content/editor/EdAEAttributes.js (dialogs/content/EdAEAttributes.js)
content/editor/EdConvertToTable.xul (dialogs/content/EdConvertToTable.xul)
content/editor/EdConvertToTable.js (dialogs/content/EdConvertToTable.js)
content/editor/EdDialogCommon.js (dialogs/content/EdDialogCommon.js)
content/editor/EdLinkProps.xul (dialogs/content/EdLinkProps.xul)
content/editor/EdLinkProps.js (dialogs/content/EdLinkProps.js)
content/editor/EdImageProps.xul (dialogs/content/EdImageProps.xul)
content/editor/EdImageProps.js (dialogs/content/EdImageProps.js)
content/editor/EdImageOverlay.xul (dialogs/content/EdImageOverlay.xul)
content/editor/EdImageOverlay.js (dialogs/content/EdImageOverlay.js)
content/editor/EdHLineProps.xul (dialogs/content/EdHLineProps.xul)
content/editor/EdHLineProps.js (dialogs/content/EdHLineProps.js)
content/editor/EdReplace.xul (dialogs/content/EdReplace.xul)
content/editor/EdReplace.js (dialogs/content/EdReplace.js)
content/editor/EdSpellCheck.xul (dialogs/content/EdSpellCheck.xul)
content/editor/EdSpellCheck.js (dialogs/content/EdSpellCheck.js)
content/editor/EdDictionary.xul (dialogs/content/EdDictionary.xul)
content/editor/EdDictionary.js (dialogs/content/EdDictionary.js)
content/editor/EdNamedAnchorProps.xul (dialogs/content/EdNamedAnchorProps.xul)
content/editor/EdNamedAnchorProps.js (dialogs/content/EdNamedAnchorProps.js)
content/editor/EdInsertTOC.xul (dialogs/content/EdInsertTOC.xul)
content/editor/EdInsertTOC.js (dialogs/content/EdInsertTOC.js)
content/editor/EdInsertTable.xul (dialogs/content/EdInsertTable.xul)
content/editor/EdInsertTable.js (dialogs/content/EdInsertTable.js)
content/editor/EdInsertMath.xul (dialogs/content/EdInsertMath.xul)
content/editor/EdInsertMath.js (dialogs/content/EdInsertMath.js)
content/editor/EdTableProps.xul (dialogs/content/EdTableProps.xul)
content/editor/EdTableProps.js (dialogs/content/EdTableProps.js)
content/editor/EdFormProps.xul (dialogs/content/EdFormProps.xul)
content/editor/EdFormProps.js (dialogs/content/EdFormProps.js)
content/editor/EdInputProps.xul (dialogs/content/EdInputProps.xul)
content/editor/EdInputProps.js (dialogs/content/EdInputProps.js)
content/editor/EdInputImage.xul (dialogs/content/EdInputImage.xul)
content/editor/EdInputImage.js (dialogs/content/EdInputImage.js)
content/editor/EdTextAreaProps.xul (dialogs/content/EdTextAreaProps.xul)
content/editor/EdTextAreaProps.js (dialogs/content/EdTextAreaProps.js)
content/editor/EdSelectProps.xul (dialogs/content/EdSelectProps.xul)
content/editor/EdSelectProps.js (dialogs/content/EdSelectProps.js)
content/editor/EdButtonProps.xul (dialogs/content/EdButtonProps.xul)
content/editor/EdButtonProps.js (dialogs/content/EdButtonProps.js)
content/editor/EdLabelProps.xul (dialogs/content/EdLabelProps.xul)
content/editor/EdLabelProps.js (dialogs/content/EdLabelProps.js)
content/editor/EdFieldSetProps.xul (dialogs/content/EdFieldSetProps.xul)
content/editor/EdFieldSetProps.js (dialogs/content/EdFieldSetProps.js)
content/editor/EdInsSrc.xul (dialogs/content/EdInsSrc.xul)
content/editor/EdInsSrc.js (dialogs/content/EdInsSrc.js)
content/editor/EdInsertChars.xul (dialogs/content/EdInsertChars.xul)
content/editor/EdInsertChars.js (dialogs/content/EdInsertChars.js)
content/editor/EdDialogOverlay.xul (dialogs/content/EdDialogOverlay.xul)
content/editor/EdAdvancedEdit.xul (dialogs/content/EdAdvancedEdit.xul)
content/editor/EdAdvancedEdit.js (dialogs/content/EdAdvancedEdit.js)
content/editor/EdListProps.xul (dialogs/content/EdListProps.xul)
content/editor/EdListProps.js (dialogs/content/EdListProps.js)
content/editor/EdPageProps.xul (dialogs/content/EdPageProps.xul)
content/editor/EdPageProps.js (dialogs/content/EdPageProps.js)
content/editor/EdColorProps.xul (dialogs/content/EdColorProps.xul)
content/editor/EdColorProps.js (dialogs/content/EdColorProps.js)
content/editor/EdColorPicker.xul (dialogs/content/EdColorPicker.xul)
content/editor/EdColorPicker.js (dialogs/content/EdColorPicker.js)
content/editor/EdAECSSAttributes.js (dialogs/content/EdAECSSAttributes.js)
content/editor/EdAEHTMLAttributes.js (dialogs/content/EdAEHTMLAttributes.js)
content/editor/EdAEJSEAttributes.js (dialogs/content/EdAEJSEAttributes.js)
content/editor/EdAEAttributes.js (dialogs/content/EdAEAttributes.js)
content/editor/EdConvertToTable.xul (dialogs/content/EdConvertToTable.xul)
content/editor/EdConvertToTable.js (dialogs/content/EdConvertToTable.js)
#ifdef MOZ_SUITE
content/editor/editor.xul (composer/content/editor.xul)
content/editor/editingOverlay.js (composer/content/editingOverlay.js)
@ -88,10 +88,10 @@ comm.jar:
content/editor/EditorContextMenu.js (composer/content/EditorContextMenu.js)
content/editor/EditorContextMenuOverlay.xul (composer/content/EditorContextMenuOverlay.xul)
content/editor/EditorAllTags.css (composer/content/EditorAllTags.css)
content/editor/editorNavigatorOverlay.xul (composer/content/editorNavigatorOverlay.xul)
content/editor/editorMailOverlay.xul (composer/content/editorMailOverlay.xul)
content/editor/editorTasksOverlay.xul (composer/content/editorTasksOverlay.xul)
content/editor/editorOverlay.xul (composer/content/editorOverlay.xul)
content/editor/editorNavigatorOverlay.xul (composer/content/editorNavigatorOverlay.xul)
content/editor/editorMailOverlay.xul (composer/content/editorMailOverlay.xul)
content/editor/editorTasksOverlay.xul (composer/content/editorTasksOverlay.xul)
content/editor/editorOverlay.xul (composer/content/editorOverlay.xul)
content/editor/editingOverlay.xul (composer/content/editingOverlay.xul)
content/editor/composerOverlay.xul (composer/content/composerOverlay.xul)
content/editor/pref-toolbars.xul (composer/content/pref-toolbars.xul)

2
editor/ui/locales/en-US/chrome/composer/editor.dtd
Просмотреть файл

@ -4,7 +4,7 @@
<!-- Window title -->
<!-- LOCALIZATION NOTE (editorWindow.titlemodifier): DONT_TRANSLATE -->
<!ENTITY editorWindow.titlemodifier "Composer">
<!ENTITY editorWindow.titlemodifier "Composer">
<!ENTITY editorWindow.titlemodifiermenuseparator " - ">
<!-- Menu items: the . means that the menu item isn't implemented yet -->

14
editor/ui/locales/en-US/chrome/composer/editor.properties
Просмотреть файл

@ -4,7 +4,7 @@
# LOCALIZATION NOTE FILE: embedded "\n" represent HTML breaks (<br>)
# Don't translate embedded "\n".
# Don't translate strings like this: %variable%
# Don't translate strings like this: %variable%
# as they will be replaced using JavaScript
#
No=No
@ -42,8 +42,8 @@ BeforeClosing=before closing
BeforePreview=before viewing in the browser
BeforeValidate=before validating the document
# LOCALIZATION NOTE (SaveFilePrompt, PublishPrompt): Don't translate %title% and %reason% (this is the reason for asking user to close, such as "before closing")
SaveFilePrompt=Save changes to "%title%" %reason%?
PublishPrompt=Save changes to "%title%" %reason%?
SaveFilePrompt=Save changes to "%title%" %reason%?
PublishPrompt=Save changes to "%title%" %reason%?
SaveFileFailed=Saving file failed!
# Publishing error strings:
@ -64,7 +64,7 @@ AllFilesPublished=All files published
FailedFileMsg=%x% of %total% files failed to publish.
# End-Publishing error strings
Prompt=Prompt
# LOCALIZATION NOTE (PromptFTPUsernamePassword): Don't translate %host%
# LOCALIZATION NOTE (PromptFTPUsernamePassword): Don't translate %host%
PromptFTPUsernamePassword=Enter username and password for FTP server at %host%
RevertCaption=Revert To Last Saved
Revert=Revert
@ -121,7 +121,7 @@ untitledTitle=untitled-%S
untitledDefaultFilename=untitled
ShowToolbar=Show Toolbar
HideToolbar=Hide Toolbar
ImapError=Unable to load image
ImapError=Unable to load image
ImapCheck=\nPlease select a new location (URL) and try again.
SaveToUseRelativeUrl=Relative URLs can only be used on pages which have been saved
NoNamedAnchorsOrHeadings=(No named anchors or headings in this page)
@ -166,10 +166,10 @@ AdvancedEditForCellMsg=Advanced Edit is unavailable when multiple cells are sele
ObjectProperties=%obj% Properties…
# LOCALIZATION NOTE This character must be in the above string and not conflict with other accesskeys in Format menu
ObjectPropertiesAccessKey=o
# LOCALIZATION NOTE (JoinSelectedCells): This variable should contain the "tableJoinCells.accesskey"
# LOCALIZATION NOTE (JoinSelectedCells): This variable should contain the "tableJoinCells.accesskey"
# letter as defined in editorOverlay.dtd
JoinSelectedCells=Join Selected Cells
# LOCALIZATION NOTE (JoinCellToRight): This variable should contain the "tableJoinCells.accesskey"
# LOCALIZATION NOTE (JoinCellToRight): This variable should contain the "tableJoinCells.accesskey"
# letter as defined in editorOverlay.dtd
JoinCellToRight=Join with Cell to the Right
JoinCellAccesskey=j