\r
// Generates a preview for a format\r
function getPreviewCss(ed, fmt) {\r
- var previewElm, dom = ed.dom, previewCss = '', parentFontSize, previewStylesName;\r
+ var name, previewElm, dom = ed.dom, previewCss = '', parentFontSize, previewStylesName;\r
\r
previewStyles = ed.settings.preview_styles;\r
\r
\r
init : function(ed, url) {\r
var t = this, s, v, o;\r
- \r
+\r
t.editor = ed;\r
t.url = url;\r
t.onResolveName = new tinymce.util.Dispatcher(this);\r
+ s = ed.settings;\r
\r
ed.forcedHighContrastMode = ed.settings.detect_highcontrast && t._isHighContrast();\r
ed.settings.skin = ed.forcedHighContrastMode ? 'highcontrast' : ed.settings.skin;\r
\r
+ // Setup default buttons\r
+ if (!s.theme_advanced_buttons1) {\r
+ s = extend({\r
+ theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",\r
+ theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",\r
+ theme_advanced_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap"\r
+ }, s);\r
+ }\r
+\r
// Default settings\r
t.settings = s = extend({\r
theme_advanced_path : true,\r
- theme_advanced_toolbar_location : 'bottom',\r
- theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",\r
- theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",\r
- theme_advanced_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap",\r
+ theme_advanced_toolbar_location : 'top',\r
theme_advanced_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6",\r
- theme_advanced_toolbar_align : "center",\r
+ theme_advanced_toolbar_align : "left",\r
+ theme_advanced_statusbar_location : "bottom",\r
theme_advanced_fonts : "Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",\r
theme_advanced_more_colors : 1,\r
theme_advanced_row_height : 23,\r
theme_advanced_font_selector : "span",\r
theme_advanced_show_current_color: 0,\r
readonly : ed.settings.readonly\r
- }, ed.settings);\r
+ }, s);\r
\r
// Setup default font_size_style_values\r
if (!s.font_size_style_values)\r
if (DOM.get(ed.id + '_path_row')) {\r
Event.add(ed.id + '_tbl', 'mouseover', function(e) {\r
var re;\r
- \r
+\r
e = e.target;\r
\r
if (e.nodeName == 'SPAN' && DOM.hasClass(e.parentNode, 'mceButton')) {\r
var f = Event.add(ed.id + '_external_close', 'click', function() {\r
DOM.hide(ed.id + '_external');\r
Event.remove(ed.id + '_external_close', 'click', f);\r
+ return false;\r
});\r
\r
DOM.show(e);\r
a = s.theme_advanced_toolbar_align.toLowerCase();\r
a = 'mce' + t._ufirst(a);\r
\r
- n = DOM.add(DOM.add(c, 'tr', {role: 'presentation'}), 'td', {'class' : 'mceToolbar ' + a, "role":"presentation"});\r
+ n = DOM.add(DOM.add(c, 'tr', {role: 'presentation'}), 'td', {'class' : 'mceToolbar ' + a, "role":"toolbar"});\r
\r
// Create toolbar and add the controls\r
for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {\r
var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td;\r
\r
n = DOM.add(tb, 'tr');\r
- n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'}); \r
+ n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});\r
n = DOM.add(n, 'div', {id : ed.id + '_path_row', 'role': 'group', 'aria-labelledby': ed.id + '_path_voice'});\r
if (s.theme_advanced_path) {\r
DOM.add(n, 'span', {id: ed.id + '_path_voice'}, ed.translate('advanced.path'));\r
} else {\r
DOM.add(n, 'span', {}, ' ');\r
}\r
- \r
+\r
\r
if (s.theme_advanced_resizing) {\r
DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize', tabIndex:"-1"});\r
width = startWidth + (e.screenX - startX);\r
height = startHeight + (e.screenY - startY);\r
t.resizeTo(width, height, true);\r
+\r
+ ed.nodeChanged();\r
};\r
\r
e.preventDefault();\r
\r
p = getParent('A');\r
if (c = cm.get('link')) {\r
- if (!p || !p.name) {\r
- c.setDisabled(!p && co);\r
- c.setActive(!!p);\r
- }\r
+ c.setDisabled((!p && co) || (p && !p.href));\r
+ c.setActive(!!p && (!p.name && !p.id));\r
}\r
\r
if (c = cm.get('unlink')) {\r
c.setDisabled(!p && co);\r
- c.setActive(!!p && !p.name);\r
+ c.setActive(!!p && !p.name && !p.id);\r
}\r
\r
if (c = cm.get('anchor')) {\r
- c.setActive(!co && !!p && p.name);\r
+ c.setActive(!co && !!p && (p.name || (p.id && !p.href)));\r
}\r
\r
p = getParent('IMG');\r
\r
if (!fn && n.style.fontFamily)\r
fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase();\r
- \r
+\r
if (!fc && n.style.color)\r
fc = n.style.color;\r
\r
return true;\r
});\r
}\r
- \r
+\r
if (s.theme_advanced_show_current_color) {\r
function updateColor(controlId, color) {\r
if (c = cm.get(controlId)) {\r
ti += 'id: ' + v + ' ';\r
\r
if (v = n.className) {\r
- v = v.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g, '')\r
+ v = v.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g, '');\r
\r
if (v) {\r
ti += 'class: ' + v + ' ';\r
projects / friendica.git / blobdiff