From ceab24db2a7bf459684a650c287770b4ff090f54 Mon Sep 17 00:00:00 2001
From: brettp
Date: Tue, 7 Jun 2011 22:46:47 +0000
Subject: Refs #3510, #9113. Updated tinyMCE version in trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@9140 36083f99-b078-4883-b0ff-0f9b5a30f544
---
.../vendor/tinymce/jscripts/tiny_mce/langs/en.js | 59 +-
.../tiny_mce/plugins/advhr/langs/en_dlg.js | 2 +
.../jscripts/tiny_mce/plugins/advhr/rule.htm | 59 +-
.../jscripts/tiny_mce/plugins/advimage/image.htm | 65 +-
.../jscripts/tiny_mce/plugins/advimage/js/image.js | 25 +-
.../tiny_mce/plugins/advimage/langs/en_dlg.js | 2 +
.../tiny_mce/plugins/advlink/js/advlink.js | 38 +-
.../tiny_mce/plugins/advlink/langs/en_dlg.js | 6 +-
.../jscripts/tiny_mce/plugins/advlink/link.htm | 65 +-
.../tiny_mce/plugins/advlist/editor_plugin.js | 2 +-
.../tiny_mce/plugins/advlist/editor_plugin_src.js | 13 +-
.../tiny_mce/plugins/autolink/editor_plugin.js | 1 +
.../tiny_mce/plugins/autolink/editor_plugin_src.js | 169 +
.../tiny_mce/plugins/autoresize/editor_plugin.js | 2 +-
.../plugins/autoresize/editor_plugin_src.js | 15 +-
.../tiny_mce/plugins/autosave/editor_plugin.js | 2 +-
.../tiny_mce/plugins/autosave/editor_plugin_src.js | 21 +-
.../tiny_mce/plugins/bbcode/editor_plugin.js | 2 +-
.../tiny_mce/plugins/bbcode/editor_plugin_src.js | 2 +-
.../tiny_mce/plugins/contextmenu/editor_plugin.js | 2 +-
.../plugins/contextmenu/editor_plugin_src.js | 49 +-
.../tiny_mce/plugins/emotions/emotions.htm | 29 +-
.../tiny_mce/plugins/fullpage/css/fullpage.css | 45 +-
.../tiny_mce/plugins/fullpage/editor_plugin.js | 2 +-
.../tiny_mce/plugins/fullpage/editor_plugin_src.js | 374 +-
.../tiny_mce/plugins/fullpage/fullpage.htm | 348 +-
.../tiny_mce/plugins/fullpage/js/fullpage.js | 637 +-
.../tiny_mce/plugins/fullscreen/editor_plugin.js | 2 +-
.../plugins/fullscreen/editor_plugin_src.js | 14 +-
.../tiny_mce/plugins/inlinepopups/editor_plugin.js | 2 +-
.../plugins/inlinepopups/editor_plugin_src.js | 91 +-
.../inlinepopups/skins/clearlooks2/window.css | 2 +-
.../tiny_mce/plugins/layer/editor_plugin.js | 2 +-
.../tiny_mce/plugins/layer/editor_plugin_src.js | 2 +
.../tiny_mce/plugins/legacyoutput/editor_plugin.js | 2 +-
.../plugins/legacyoutput/editor_plugin_src.js | 59 +-
.../tiny_mce/plugins/lists/editor_plugin.js | 1 +
.../tiny_mce/plugins/lists/editor_plugin_src.js | 617 +
.../tiny_mce/plugins/media/css/content.css | 6 -
.../jscripts/tiny_mce/plugins/media/css/media.css | 9 +-
.../tiny_mce/plugins/media/editor_plugin.js | 2 +-
.../tiny_mce/plugins/media/editor_plugin_src.js | 948 +-
.../jscripts/tiny_mce/plugins/media/img/flash.gif | Bin 241 -> 0 bytes
.../tiny_mce/plugins/media/img/flv_player.swf | Bin 11668 -> 0 bytes
.../tiny_mce/plugins/media/img/quicktime.gif | Bin 303 -> 0 bytes
.../tiny_mce/plugins/media/img/realmedia.gif | Bin 439 -> 0 bytes
.../tiny_mce/plugins/media/img/shockwave.gif | Bin 387 -> 0 bytes
.../jscripts/tiny_mce/plugins/media/img/trans.gif | Bin 43 -> 0 bytes
.../tiny_mce/plugins/media/img/windowsmedia.gif | Bin 415 -> 0 bytes
.../jscripts/tiny_mce/plugins/media/js/media.js | 930 +-
.../tiny_mce/plugins/media/langs/en_dlg.js | 10 +-
.../jscripts/tiny_mce/plugins/media/media.htm | 571 +-
.../tiny_mce/plugins/media/moxieplayer.swf | Bin 0 -> 33931 bytes
.../tiny_mce/plugins/nonbreaking/editor_plugin.js | 2 +-
.../plugins/nonbreaking/editor_plugin_src.js | 2 +-
.../tiny_mce/plugins/noneditable/editor_plugin.js | 2 +-
.../plugins/noneditable/editor_plugin_src.js | 2 +
.../tiny_mce/plugins/pagebreak/css/content.css | 1 -
.../tiny_mce/plugins/pagebreak/editor_plugin.js | 2 +-
.../plugins/pagebreak/editor_plugin_src.js | 5 +-
.../tiny_mce/plugins/pagebreak/img/pagebreak.gif | Bin 325 -> 0 bytes
.../tiny_mce/plugins/pagebreak/img/trans.gif | Bin 43 -> 0 bytes
.../tiny_mce/plugins/paste/editor_plugin.js | 2 +-
.../tiny_mce/plugins/paste/editor_plugin_src.js | 249 +-
.../plugins/searchreplace/editor_plugin.js | 2 +-
.../plugins/searchreplace/editor_plugin_src.js | 4 +
.../plugins/searchreplace/js/searchreplace.js | 24 +-
.../plugins/searchreplace/searchreplace.htm | 33 +-
.../tiny_mce/plugins/spellchecker/editor_plugin.js | 2 +-
.../plugins/spellchecker/editor_plugin_src.js | 118 +-
.../jscripts/tiny_mce/plugins/style/js/props.js | 10 +-
.../tiny_mce/plugins/style/langs/en_dlg.js | 9 +-
.../jscripts/tiny_mce/plugins/style/props.htm | 911 +-
.../tiny_mce/plugins/tabfocus/editor_plugin.js | 2 +-
.../tiny_mce/plugins/tabfocus/editor_plugin_src.js | 58 +-
.../jscripts/tiny_mce/plugins/table/cell.htm | 24 +-
.../tiny_mce/plugins/table/editor_plugin.js | 2 +-
.../tiny_mce/plugins/table/editor_plugin_src.js | 149 +-
.../jscripts/tiny_mce/plugins/table/js/cell.js | 20 +-
.../jscripts/tiny_mce/plugins/table/js/row.js | 31 +-
.../jscripts/tiny_mce/plugins/table/js/table.js | 33 +-
.../tiny_mce/plugins/table/langs/en_dlg.js | 2 +-
.../tiny_mce/plugins/table/merge_cells.htm | 22 +-
.../jscripts/tiny_mce/plugins/table/row.htm | 18 +-
.../jscripts/tiny_mce/plugins/table/table.htm | 107 +-
.../tiny_mce/plugins/template/js/template.js | 2 +-
.../tiny_mce/plugins/visualchars/editor_plugin.js | 2 +-
.../plugins/visualchars/editor_plugin_src.js | 33 +-
.../tiny_mce/plugins/wordcount/editor_plugin.js | 2 +-
.../plugins/wordcount/editor_plugin_src.js | 54 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm | 11 +-
.../tiny_mce/plugins/xhtmlxtras/acronym.htm | 11 +-
.../tiny_mce/plugins/xhtmlxtras/attributes.htm | 11 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm | 9 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/del.htm | 17 +-
.../tiny_mce/plugins/xhtmlxtras/editor_plugin.js | 2 +-
.../plugins/xhtmlxtras/editor_plugin_src.js | 24 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm | 21 +-
.../tiny_mce/plugins/xhtmlxtras/js/attributes.js | 17 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js | 14 +-
.../plugins/xhtmlxtras/js/element_common.js | 8 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js | 17 +-
.../jscripts/tiny_mce/themes/advanced/about.htm | 8 +-
.../jscripts/tiny_mce/themes/advanced/anchor.htm | 10 +-
.../jscripts/tiny_mce/themes/advanced/charmap.htm | 79 +-
.../tiny_mce/themes/advanced/color_picker.htm | 19 +-
.../tiny_mce/themes/advanced/editor_template.js | 2 +-
.../themes/advanced/editor_template_src.js | 298 +-
.../jscripts/tiny_mce/themes/advanced/image.htm | 102 +-
.../tiny_mce/themes/advanced/img/flash.gif | Bin 0 -> 241 bytes
.../tiny_mce/themes/advanced/img/iframe.gif | Bin 0 -> 600 bytes
.../tiny_mce/themes/advanced/img/pagebreak.gif | Bin 0 -> 325 bytes
.../tiny_mce/themes/advanced/img/quicktime.gif | Bin 0 -> 303 bytes
.../tiny_mce/themes/advanced/img/realmedia.gif | Bin 0 -> 439 bytes
.../tiny_mce/themes/advanced/img/shockwave.gif | Bin 0 -> 387 bytes
.../tiny_mce/themes/advanced/img/trans.gif | Bin 0 -> 43 bytes
.../tiny_mce/themes/advanced/img/video.gif | Bin 0 -> 597 bytes
.../tiny_mce/themes/advanced/img/windowsmedia.gif | Bin 0 -> 415 bytes
.../jscripts/tiny_mce/themes/advanced/js/about.js | 1 +
.../jscripts/tiny_mce/themes/advanced/js/anchor.js | 5 +
.../tiny_mce/themes/advanced/js/charmap.js | 32 +-
.../tiny_mce/themes/advanced/js/color_picker.js | 140 +-
.../jscripts/tiny_mce/themes/advanced/js/image.js | 4 +-
.../jscripts/tiny_mce/themes/advanced/js/link.js | 11 +-
.../tiny_mce/themes/advanced/js/source_editor.js | 18 +-
.../jscripts/tiny_mce/themes/advanced/langs/en.js | 10 +-
.../tiny_mce/themes/advanced/langs/en_dlg.js | 9 +-
.../jscripts/tiny_mce/themes/advanced/link.htm | 55 +-
.../tiny_mce/themes/advanced/shortcuts.htm | 47 +
.../themes/advanced/skins/default/content.css | 12 +
.../tiny_mce/themes/advanced/skins/default/ui.css | 8 +-
.../themes/advanced/skins/highcontrast/content.css | 23 +
.../themes/advanced/skins/highcontrast/dialog.css | 105 +
.../themes/advanced/skins/highcontrast/ui.css | 101 +
.../themes/advanced/skins/o2k7/content.css | 11 +
.../tiny_mce/themes/advanced/skins/o2k7/dialog.css | 1 +
.../tiny_mce/themes/advanced/skins/o2k7/ui.css | 9 +-
.../themes/advanced/skins/o2k7/ui_black.css | 2 +-
.../themes/advanced/skins/o2k7/ui_silver.css | 2 +-
.../tiny_mce/themes/advanced/source_editor.htm | 6 +-
.../tiny_mce/themes/simple/editor_template.js | 2 +-
.../tiny_mce/themes/simple/editor_template_src.js | 3 +-
.../vendor/tinymce/jscripts/tiny_mce/tiny_mce.js | 2 +-
.../tinymce/jscripts/tiny_mce/tiny_mce_popup.js | 2 +-
.../tinymce/jscripts/tiny_mce/tiny_mce_src.js | 12325 +++++++++++--------
.../tinymce/jscripts/tiny_mce/utils/form_utils.js | 18 +-
.../tinymce/jscripts/tiny_mce/utils/mctabs.js | 105 +-
.../tinymce/jscripts/tiny_mce/utils/validate.js | 38 +-
148 files changed, 12266 insertions(+), 8768 deletions(-)
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/pagebreak.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/realmedia.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/trans.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/windowsmedia.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
(limited to 'mod/tinymce/vendor/tinymce/jscripts')
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
index ea4a1b0e1..8a80d46b1 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
@@ -12,9 +12,54 @@ not_set:"-- Not set --",
clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
-invalid_data:"Error: Invalid values entered, these are marked in red.",
+invalid_data:"{#field} is invalid",
+invalid_data_number:"{#field} must be a number",
+invalid_data_min:"{#field} must be a number greater than {#min}",
+invalid_data_size:"{#field} must be a number or percentage",
more_colors:"More colors"
},
+colors:{
+'000000':'Black',
+'993300':'Burnt orange',
+'333300':'Dark olive',
+'003300':'Dark green',
+'003366':'Dark azure',
+'000080':'Navy Blue',
+'333399':'Indigo',
+'333333':'Very dark gray',
+'800000':'Maroon',
+'FF6600':'Orange',
+'808000':'Olive',
+'008000':'Green',
+'008080':'Teal',
+'0000FF':'Blue',
+'666699':'Grayish blue',
+'808080':'Gray',
+'FF0000':'Red',
+'FF9900':'Amber',
+'99CC00':'Yellow green',
+'339966':'Sea green',
+'33CCCC':'Turquoise',
+'3366FF':'Royal blue',
+'800080':'Purple',
+'999999':'Medium gray',
+'FF00FF':'Magenta',
+'FFCC00':'Gold',
+'FFFF00':'Yellow',
+'00FF00':'Lime',
+'00FFFF':'Aqua',
+'00CCFF':'Sky blue',
+'993366':'Brown',
+'C0C0C0':'Silver',
+'FF99CC':'Pink',
+'FFCC99':'Peach',
+'FFFF99':'Light yellow',
+'CCFFCC':'Pale green',
+'CCFFFF':'Pale cyan',
+'99CCFF':'Light sky blue',
+'CC99FF':'Plum',
+'FFFFFF':'White'
+},
contextmenu:{
align:"Alignment",
left:"Left",
@@ -151,7 +196,8 @@ langs:"Languages",
wait:"Please wait...",
sug:"Suggestions",
no_sug:"No suggestions",
-no_mpell:"No misspellings found."
+no_mpell:"No misspellings found.",
+learn_word:"Learn word"
},
pagebreak:{
desc:"Insert page break."
@@ -167,4 +213,11 @@ upper_roman:"Upper roman",
circle:"Circle",
disc:"Disc",
square:"Square"
-}}});
\ No newline at end of file
+},
+aria:{
+rich_text_area:"Rich Text Area"
+},
+wordcount:{
+words: 'Words: '
+}
+}});
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
index 873bfd8d3..ad6a7b698 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
@@ -1,5 +1,7 @@
tinyMCE.addI18n('en.advhr_dlg',{
+normal:"Normal",
width:"Width",
+widthunits:"Units",
size:"Height",
noshade:"No shadow"
});
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
index fc37b2aec..843e1f8f0 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
@@ -8,43 +8,44 @@
-
+
\n";h.foot="\n