aboutsummaryrefslogtreecommitdiffstats
path: root/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-20 20:47:31 -0700
committerfriendica <info@friendica.com>2012-03-20 20:47:31 -0700
commitf55779fd831029f764c885bf1fd026a7e94f08eb (patch)
tree8a441c0bc5f519f7cf303e5065cba750141b05a8 /library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras
parent810e69ef0a88a959ce9f5358377cdc1c7d4bd53a (diff)
downloadvolse-hubzilla-f55779fd831029f764c885bf1fd026a7e94f08eb.tar.gz
volse-hubzilla-f55779fd831029f764c885bf1fd026a7e94f08eb.tar.bz2
volse-hubzilla-f55779fd831029f764c885bf1fd026a7e94f08eb.zip
update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
Diffstat (limited to 'library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras')
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm11
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm11
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm11
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm9
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css0
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css0
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm17
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js2
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js24
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm21
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js0
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js0
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js17
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js0
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js14
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js8
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js17
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js33
18 files changed, 61 insertions, 134 deletions
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
index 3aeac0deb..30a894f7c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
@@ -10,11 +10,12 @@
<script type="text/javascript" src="js/abbr.js"></script>
<link rel="stylesheet" type="text/css" href="css/popup.css" />
</head>
-<body style="display: none">
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_abbr_element}</span>
<form onsubmit="insertAbbr();return false;" action="#">
<div class="tabs">
<ul>
- <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+ <li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
</ul>
</div>
@@ -23,7 +24,7 @@
<div id="general_panel" class="panel current">
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td>
@@ -41,7 +42,7 @@
</td>
</tr>
<tr>
- <td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
+ <td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
<td><input id="style" name="style" type="text" value="" class="field" /></td>
</tr>
<tr>
@@ -67,7 +68,7 @@
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label for="onfocus">onfocus</label>:</td>
<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td>
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
index 31ee7b70f..c10934592 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
@@ -10,11 +10,12 @@
<script type="text/javascript" src="js/acronym.js"></script>
<link rel="stylesheet" type="text/css" href="css/popup.css" />
</head>
-<body style="display: none">
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_acronym_element}</span>
<form onsubmit="insertAcronym();return false;" action="#">
<div class="tabs">
<ul>
- <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+ <li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
</ul>
</div>
@@ -23,7 +24,7 @@
<div id="general_panel" class="panel current">
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td>
@@ -41,7 +42,7 @@
</td>
</tr>
<tr>
- <td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
+ <td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
<td><input id="style" name="style" type="text" value="" class="field" /></td>
</tr>
<tr>
@@ -67,7 +68,7 @@
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label for="onfocus">onfocus</label>:</td>
<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td>
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
index 17054da3e..e8d606a34 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
@@ -9,12 +9,13 @@
<script type="text/javascript" src="js/attributes.js"></script>
<link rel="stylesheet" type="text/css" href="css/attributes.css" />
</head>
-<body style="display: none">
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.attribs_title}</span>
<form onsubmit="insertAction();return false;" action="#">
<div class="tabs">
<ul>
- <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>
- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>
+ <li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>
+ <li id="events_tab" aria-controls="events_panel"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>
</ul>
</div>
@@ -22,7 +23,7 @@
<div id="general_panel" class="panel current">
<fieldset>
<legend>{#xhtmlxtras_dlg.attribute_attrib_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
<td><input id="title" name="title" type="text" value="" class="mceFocus" /></td>
@@ -75,7 +76,7 @@
<fieldset>
<legend>{#xhtmlxtras_dlg.attribute_events_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label for="onfocus">onfocus</label>:</td>
<td><input id="onfocus" name="onfocus" type="text" value="" /></td>
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
index d0a3e3a8e..0ac6bdb66 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
@@ -10,11 +10,12 @@
<script type="text/javascript" src="js/cite.js"></script>
<link rel="stylesheet" type="text/css" href="css/popup.css" />
</head>
-<body style="display: none">
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_cite_element}</span>
<form onsubmit="insertCite();return false;" action="#">
<div class="tabs">
<ul>
- <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+ <li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
</ul>
</div>
@@ -23,7 +24,7 @@
<div id="general_panel" class="panel current">
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td>
@@ -67,7 +68,7 @@
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label for="onfocus">onfocus</label>:</td>
<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td>
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
index 9a6a235c3..9a6a235c3 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
index e67114dba..e67114dba 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
index 8b07fa842..5f667510f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
@@ -10,11 +10,12 @@
<script type="text/javascript" src="js/del.js"></script>
<link rel="stylesheet" type="text/css" href="css/popup.css" />
</head>
-<body id="xhtmlxtrasins" style="display: none">
+<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_del_element}</span>
<form onsubmit="insertDel();return false;" action="#">
<div class="tabs">
<ul>
- <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+ <li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
</ul>
</div>
@@ -23,14 +24,14 @@
<div id="general_panel" class="panel current">
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>
<td>
- <table border="0" cellspacing="0" cellpadding="0">
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
<tr>
<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td>
- <td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
+ <td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
</tr>
</table>
</td>
@@ -43,7 +44,7 @@
</fieldset>
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
<td><input id="title" name="title" type="text" value="" class="field" /></td>
@@ -61,7 +62,7 @@
</td>
</tr>
<tr>
- <td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
+ <td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
<td><input id="style" name="style" type="text" value="" class="field" /></td>
</tr>
<tr>
@@ -87,7 +88,7 @@
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label for="onfocus">onfocus</label>:</td>
<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td>
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
index e5195265e..9b98a5154 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(b,c){b.addCommand("mceCite",function(){b.windowManager.open({file:c+"/cite.htm",width:350+parseInt(b.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:c})});b.addCommand("mceAcronym",function(){b.windowManager.open({file:c+"/acronym.htm",width:350+parseInt(b.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.acronym_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceAbbr",function(){b.windowManager.open({file:c+"/abbr.htm",width:350+parseInt(b.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.abbr_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceDel",function(){b.windowManager.open({file:c+"/del.htm",width:340+parseInt(b.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(b.getLang("xhtmlxtras.del_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceIns",function(){b.windowManager.open({file:c+"/ins.htm",width:340+parseInt(b.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(b.getLang("xhtmlxtras.ins_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceAttributes",function(){b.windowManager.open({file:c+"/attributes.htm",width:380,height:370,inline:1},{plugin_url:c})});b.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});b.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});b.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});b.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});b.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});b.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});if(tinymce.isIE){function a(d,e){if(e.set){e.content=e.content.replace(/<abbr([^>]+)>/gi,"<html:abbr $1>");e.content=e.content.replace(/<\/abbr>/gi,"</html:abbr>")}}b.onBeforeSetContent.add(a);b.onPostProcess.add(a)}b.onNodeChange.add(function(e,d,g,f){g=e.dom.getParent(g,"CITE,ACRONYM,ABBR,DEL,INS");d.setDisabled("cite",f);d.setDisabled("acronym",f);d.setDisabled("abbr",f);d.setDisabled("del",f);d.setDisabled("ins",f);d.setDisabled("attribs",g&&g.nodeName=="BODY");d.setActive("cite",0);d.setActive("acronym",0);d.setActive("abbr",0);d.setActive("del",0);d.setActive("ins",0);if(g){do{d.setDisabled(g.nodeName.toLowerCase(),0);d.setActive(g.nodeName.toLowerCase(),1)}while(g=g.parentNode)}});b.onPreInit.add(function(){b.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})(); \ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380+parseInt(a.getLang("xhtmlxtras.attr_delta_width",0)),height:370+parseInt(a.getLang("xhtmlxtras.attr_delta_height",0)),inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})(); \ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
index 9b51b8368..f24057211 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
@@ -27,7 +27,7 @@
ed.windowManager.open({
file : url + '/acronym.htm',
width : 350 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
- height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
+ height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_height', 0)),
inline : 1
}, {
plugin_url : url
@@ -38,7 +38,7 @@
ed.windowManager.open({
file : url + '/abbr.htm',
width : 350 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
- height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
+ height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_height', 0)),
inline : 1
}, {
plugin_url : url
@@ -49,7 +49,7 @@
ed.windowManager.open({
file : url + '/del.htm',
width : 340 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
- height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
+ height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_height', 0)),
inline : 1
}, {
plugin_url : url
@@ -60,7 +60,7 @@
ed.windowManager.open({
file : url + '/ins.htm',
width : 340 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
- height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
+ height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_height', 0)),
inline : 1
}, {
plugin_url : url
@@ -70,8 +70,8 @@
ed.addCommand('mceAttributes', function() {
ed.windowManager.open({
file : url + '/attributes.htm',
- width : 380,
- height : 370,
+ width : 380 + parseInt(ed.getLang('xhtmlxtras.attr_delta_width', 0)),
+ height : 370 + parseInt(ed.getLang('xhtmlxtras.attr_delta_height', 0)),
inline : 1
}, {
plugin_url : url
@@ -86,18 +86,6 @@
ed.addButton('ins', {title : 'xhtmlxtras.ins_desc', cmd : 'mceIns'});
ed.addButton('attribs', {title : 'xhtmlxtras.attribs_desc', cmd : 'mceAttributes'});
- if (tinymce.isIE) {
- function fix(ed, o) {
- if (o.set) {
- o.content = o.content.replace(/<abbr([^>]+)>/gi, '<html:abbr $1>');
- o.content = o.content.replace(/<\/abbr>/gi, '</html:abbr>');
- }
- };
-
- ed.onBeforeSetContent.add(fix);
- ed.onPostProcess.add(fix);
- }
-
ed.onNodeChange.add(function(ed, cm, n, co) {
n = ed.dom.getParent(n, 'CITE,ACRONYM,ABBR,DEL,INS');
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
index 6c5470cfc..d001ac7c4 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
@@ -10,11 +10,12 @@
<script type="text/javascript" src="js/ins.js"></script>
<link rel="stylesheet" type="text/css" href="css/popup.css" />
</head>
-<body id="xhtmlxtrasins" style="display: none">
+<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_ins_element}</span>
<form onsubmit="insertIns();return false;" action="#">
<div class="tabs">
<ul>
- <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+ <li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
</ul>
</div>
@@ -23,19 +24,19 @@
<div id="general_panel" class="panel current">
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>
<td>
- <table border="0" cellspacing="0" cellpadding="0">
+ <table role="presentation" border="0" cellspacing="0" cellpadding="0">
<tr>
<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td>
- <td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
+ <td ><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
</tr>
</table>
</td>
</tr>
- <tr>
+ <tr >
<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td>
<td><input id="cite" name="cite" type="text" value="" class="field" /></td>
</tr>
@@ -43,9 +44,9 @@
</fieldset>
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
- <td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
+ <td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
<td><input id="title" name="title" type="text" value="" class="field" /></td>
</tr>
<tr>
@@ -61,7 +62,7 @@
</td>
</tr>
<tr>
- <td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
+ <td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
<td><input id="style" name="style" type="text" value="" class="field" /></td>
</tr>
<tr>
@@ -87,7 +88,7 @@
<fieldset>
<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
- <table border="0" cellpadding="0" cellspacing="4">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="4">
<tr>
<td class="label"><label for="onfocus">onfocus</label>:</td>
<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td>
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
index 4b51a2572..4b51a2572 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
index 6ec2f8871..6ec2f8871 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
index d62a219e6..9c99995ad 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
@@ -53,7 +53,6 @@ function insertAction() {
var inst = tinyMCEPopup.editor;
var elm = inst.selection.getNode();
- tinyMCEPopup.execCommand("mceBeginUndoLevel");
setAllAttribs(elm);
tinyMCEPopup.execCommand("mceEndUndoLevel");
tinyMCEPopup.close();
@@ -72,21 +71,7 @@ function setAttrib(elm, attrib, value) {
value = valueElm.value;
}
- if (value != "") {
- dom.setAttrib(elm, attrib.toLowerCase(), value);
-
- if (attrib == "style")
- attrib = "style.cssText";
-
- if (attrib.substring(0, 2) == 'on')
- value = 'return true;' + value;
-
- if (attrib == "class")
- attrib = "className";
-
- elm[attrib]=value;
- } else
- elm.removeAttribute(attrib);
+ dom.setAttrib(elm, attrib.toLowerCase(), value);
}
function setAllAttribs(elm) {
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
index 009b71546..009b71546 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
index 9e5d8c571..1f957dc78 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
@@ -21,17 +21,17 @@ function setElementAttribs(elm) {
setAllCommonAttribs(elm);
setAttrib(elm, 'datetime');
setAttrib(elm, 'cite');
+ elm.removeAttribute('data-mce-new');
}
function insertDel() {
var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'DEL');
- tinyMCEPopup.execCommand('mceBeginUndoLevel');
if (elm == null) {
var s = SXE.inst.selection.getContent();
if(s.length > 0) {
insertInlineElement('del');
- var elementArray = tinymce.grep(SXE.inst.dom.select('del'), function(n) {return n.id == '#sxe_temp_del#';});
+ var elementArray = SXE.inst.dom.select('del[data-mce-new]');
for (var i=0; i<elementArray.length; i++) {
var elm = elementArray[i];
setElementAttribs(elm);
@@ -45,16 +45,6 @@ function insertDel() {
tinyMCEPopup.close();
}
-function insertInlineElement(en) {
- var ed = tinyMCEPopup.editor, dom = ed.dom;
-
- ed.getDoc().execCommand('FontName', false, 'mceinline');
- tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {
- if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')
- dom.replace(dom.create(en), n, 1);
- });
-}
-
function removeDel() {
SXE.removeElement('del');
tinyMCEPopup.close();
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
index 5b494a566..4e5d9c3bb 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
@@ -154,7 +154,6 @@ SXE.initElementDialog = function(element_name) {
SXE.insertElement = function(element_name) {
var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName;
- tinyMCEPopup.execCommand('mceBeginUndoLevel');
if (elm == null) {
var s = SXE.inst.selection.getContent();
if(s.length > 0) {
@@ -165,11 +164,11 @@ SXE.insertElement = function(element_name) {
for (var i=0; i<elementArray.length; i++) {
var elm = elementArray[i];
- if (SXE.inst.dom.getAttrib(elm, '_mce_new')) {
+ if (SXE.inst.dom.getAttrib(elm, 'data-mce-new')) {
elm.id = '';
elm.setAttribute('id', '');
elm.removeAttribute('id');
- elm.removeAttribute('_mce_new');
+ elm.removeAttribute('data-mce-new');
setAllCommonAttribs(elm);
}
@@ -186,7 +185,6 @@ SXE.removeElement = function(element_name){
element_name = element_name.toLowerCase();
elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
if(elm && elm.nodeName.toUpperCase() == element_name.toUpperCase()){
- tinyMCEPopup.execCommand('mceBeginUndoLevel');
tinyMCE.execCommand('mceRemoveNode', false, elm);
SXE.inst.nodeChanged();
tinyMCEPopup.execCommand('mceEndUndoLevel');
@@ -226,6 +224,6 @@ function insertInlineElement(en) {
ed.getDoc().execCommand('FontName', false, 'mceinline');
tinymce.each(dom.select('span,font'), function(n) {
if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')
- dom.replace(dom.create(en, {_mce_new : 1}), n, 1);
+ dom.replace(dom.create(en, {'data-mce-new' : 1}), n, 1);
});
}
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
index 3774f0a18..c4addfb01 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
@@ -21,16 +21,17 @@ function setElementAttribs(elm) {
setAllCommonAttribs(elm);
setAttrib(elm, 'datetime');
setAttrib(elm, 'cite');
+ elm.removeAttribute('data-mce-new');
}
function insertIns() {
var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'INS');
- tinyMCEPopup.execCommand('mceBeginUndoLevel');
+
if (elm == null) {
var s = SXE.inst.selection.getContent();
if(s.length > 0) {
- insertInlineElement('INS');
- var elementArray = tinymce.grep(SXE.inst.dom.select('ins'), function(n) {return n.id == '#sxe_temp_ins#';});
+ insertInlineElement('ins');
+ var elementArray = SXE.inst.dom.select('ins[data-mce-new]');
for (var i=0; i<elementArray.length; i++) {
var elm = elementArray[i];
setElementAttribs(elm);
@@ -49,14 +50,4 @@ function removeIns() {
tinyMCEPopup.close();
}
-function insertInlineElement(en) {
- var ed = tinyMCEPopup.editor, dom = ed.dom;
-
- ed.getDoc().execCommand('FontName', false, 'mceinline');
- tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {
- if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')
- dom.replace(dom.create(en), n, 1);
- });
-}
-
tinyMCEPopup.onInit.add(init);
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
index 45b6b267b..c4569f85e 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
@@ -1,32 +1 @@
-tinyMCE.addI18n('en.xhtmlxtras_dlg',{
-attribute_label_title:"Title",
-attribute_label_id:"ID",
-attribute_label_class:"Class",
-attribute_label_style:"Style",
-attribute_label_cite:"Cite",
-attribute_label_datetime:"Date/Time",
-attribute_label_langdir:"Text Direction",
-attribute_option_ltr:"Left to right",
-attribute_option_rtl:"Right to left",
-attribute_label_langcode:"Language",
-attribute_label_tabindex:"TabIndex",
-attribute_label_accesskey:"AccessKey",
-attribute_events_tab:"Events",
-attribute_attrib_tab:"Attributes",
-general_tab:"General",
-attrib_tab:"Attributes",
-events_tab:"Events",
-fieldset_general_tab:"General Settings",
-fieldset_attrib_tab:"Element Attributes",
-fieldset_events_tab:"Element Events",
-title_ins_element:"Insertion Element",
-title_del_element:"Deletion Element",
-title_acronym_element:"Acronym Element",
-title_abbr_element:"Abbreviation Element",
-title_cite_element:"Citation Element",
-remove:"Remove",
-insert_date:"Insert current date/time",
-option_ltr:"Left to right",
-option_rtl:"Right to left",
-attribs_title:"Insert/Edit Attributes"
-}); \ No newline at end of file
+tinyMCE.addI18n('en.xhtmlxtras_dlg',{"attribs_title":"Insert/Edit Attributes","option_rtl":"Right to Left","option_ltr":"Left to Right","insert_date":"Insert Current Date/Time",remove:"Remove","title_cite_element":"Citation Element","title_abbr_element":"Abbreviation Element","title_acronym_element":"Acronym Element","title_del_element":"Deletion Element","title_ins_element":"Insertion Element","fieldset_events_tab":"Element Events","fieldset_attrib_tab":"Element Attributes","fieldset_general_tab":"General Settings","events_tab":"Events","attrib_tab":"Attributes","general_tab":"General","attribute_attrib_tab":"Attributes","attribute_events_tab":"Events","attribute_label_accesskey":"AccessKey","attribute_label_tabindex":"TabIndex","attribute_label_langcode":"Language","attribute_option_rtl":"Right to Left","attribute_option_ltr":"Left to Right","attribute_label_langdir":"Text Direction","attribute_label_datetime":"Date/Time","attribute_label_cite":"Cite","attribute_label_style":"Style","attribute_label_class":"Class","attribute_label_id":"ID","attribute_label_title":"Title"}); \ No newline at end of file