update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks

This commit is contained in:
friendica 2012-03-20 20:47:31 -07:00
parent 810e69ef0a
commit f55779fd83
296 changed files with 17157 additions and 10477 deletions

22
library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm vendored Executable file → Normal file
View file

@ -7,20 +7,20 @@
<script type="text/javascript" src="../../utils/validate.js"></script>
<script type="text/javascript" src="js/merge_cells.js"></script>
</head>
<body style="margin: 8px">
<body style="margin: 8px" role="application">
<form onsubmit="MergeCellsDialog.merge();return false;" action="#">
<fieldset>
<legend>{#table_dlg.merge_cells_title}</legend>
<table border="0" cellpadding="0" cellspacing="3" width="100%">
<tr>
<td>{#table_dlg.cols}:</td>
<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>
</tr>
<tr>
<td>{#table_dlg.rows}:</td>
<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>
</tr>
</table>
<table role="presentation" border="0" cellpadding="0" cellspacing="3" width="100%">
<tr>
<td><label for="numcols">{#table_dlg.cols}</label>:</td>
<td align="right"><input type="text" id="numcols" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" aria-required="true" /></td>
</tr>
<tr>
<td><label for="numrows">{#table_dlg.rows}</label>:</td>
<td align="right"><input type="text" id="numrows" name="numrows" value="" class="number min1" style="width: 30px" aria-required="true" /></td>
</tr>
</table>
</fieldset>
<div class="mceActionPanel">