aboutsummaryrefslogtreecommitdiff
path: root/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2013-02-21 13:34:49 -0800
committerBrett Profitt <brett.profitt@gmail.com>2013-02-21 13:34:49 -0800
commit556b3f68be6d568e1ab19a6e02a073da8f49ea38 (patch)
tree4d5b09112ec2199ae9008109ba97e1478b915a21 /mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm
parent88b7f8a3a32542e8b016c2163f44e1ebce7211fc (diff)
parent4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23 (diff)
downloadelgg-556b3f68be6d568e1ab19a6e02a073da8f49ea38.tar.gz
elgg-556b3f68be6d568e1ab19a6e02a073da8f49ea38.tar.bz2
Merge pull request #5095 from iionly/tinymce_update_3_5_8
Tinymce plugin: update to version 3.5.8 of Tinymce editor
Diffstat (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm')
-rw-r--r--mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm7
1 files changed, 6 insertions, 1 deletions
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm
index 76ab68d89..7dc087a30 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm
@@ -118,7 +118,7 @@
<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
</tr>
<tr>
- <td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td>
+ <td><input id="text_none" name="text_none" class="checkbox" type="checkbox" onclick="updateTextDecorations();"/></td>
<td><label for="text_none">{#style_dlg.text_none}</label></td>
</tr>
</table>
@@ -825,6 +825,11 @@
</div>
</div>
+<div class="panel_toggle_insert_span">
+ <input type="checkbox" class="checkbox" id="toggle_insert_span" name="toggle_insert_span" onClick="toggleApplyAction();" />
+ <label for="toggle_insert_span">{#style_dlg.toggle_insert_span}</label>
+</div>
+
<div class="mceActionPanel">
<input type="submit" id="insert" name="insert" value="{#update}" />
<input type="button" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" />