Refs #3853. Upgraded TinyMCE to 3.4.6. Embed still inserts the content in the wrong place for IE 8.

2 files changed, 2 insertions, 122 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
index fbf29893f..6e5848187 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
@@ -1,68 +1 @@
-tinyMCE.addI18n('en.advanced',{

-style_select:"Styles",

-font_size:"Font size",

-fontdefault:"Font family",

-block:"Format",

-paragraph:"Paragraph",

-div:"Div",

-address:"Address",

-pre:"Preformatted",

-h1:"Heading 1",

-h2:"Heading 2",

-h3:"Heading 3",

-h4:"Heading 4",

-h5:"Heading 5",

-h6:"Heading 6",

-blockquote:"Blockquote",

-code:"Code",

-samp:"Code sample",

-dt:"Definition term ",

-dd:"Definition description",

-bold_desc:"Bold (Ctrl+B)",

-italic_desc:"Italic (Ctrl+I)",

-underline_desc:"Underline (Ctrl+U)",

-striketrough_desc:"Strikethrough",

-justifyleft_desc:"Align left",

-justifycenter_desc:"Align center",

-justifyright_desc:"Align right",

-justifyfull_desc:"Align full",

-bullist_desc:"Unordered list",

-numlist_desc:"Ordered list",

-outdent_desc:"Outdent",

-indent_desc:"Indent",

-undo_desc:"Undo (Ctrl+Z)",

-redo_desc:"Redo (Ctrl+Y)",

-link_desc:"Insert/edit link",

-unlink_desc:"Unlink",

-image_desc:"Insert/edit image",

-cleanup_desc:"Cleanup messy code",

-code_desc:"Edit HTML Source",

-sub_desc:"Subscript",

-sup_desc:"Superscript",

-hr_desc:"Insert horizontal ruler",

-removeformat_desc:"Remove formatting",

-custom1_desc:"Your custom description here",

-forecolor_desc:"Select text color",

-backcolor_desc:"Select background color",

-charmap_desc:"Insert custom character",

-visualaid_desc:"Toggle guidelines/invisible elements",

-anchor_desc:"Insert/edit anchor",

-cut_desc:"Cut",

-copy_desc:"Copy",

-paste_desc:"Paste",

-image_props_desc:"Image properties",

-newdocument_desc:"New document",

-help_desc:"Help",

-blockquote_desc:"Blockquote",

-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?",

-path:"Path",

-newdocument:"Are you sure you want clear all contents?",

-toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",

-more_colors:"More colors",

-

-// Accessibility Strings

-shortcuts_desc:'Accessibility Help',

-help_shortcut:'. Press ALT F10 for toolbar. Press ALT 0 for help.',

-rich_text_area:"Rich Text Area",

-toolbar:"Toolbar"

-});

+tinyMCE.addI18n('en.advanced',{"underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)",dd:"Definition Description",dt:"Definition Term ",samp:"Code Sample",code:"Code",blockquote:"Block Quote",h6:"Heading 6",h5:"Heading 5",h4:"Heading 4",h3:"Heading 3",h2:"Heading 2",h1:"Heading 1",pre:"Preformatted",address:"Address",div:"DIV",paragraph:"Paragraph",block:"Format",fontdefault:"Font Family","font_size":"Font Size","style_select":"Styles","anchor_delta_height":"","anchor_delta_width":"","charmap_delta_height":"","charmap_delta_width":"","colorpicker_delta_height":"","colorpicker_delta_width":"","link_delta_height":"","link_delta_width":"","image_delta_height":"","image_delta_width":"","more_colors":"More Colors...","toolbar_focus":"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",newdocument:"Are you sure you want clear all contents?",path:"Path","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","blockquote_desc":"Block Quote","help_desc":"Help","newdocument_desc":"New Document","image_props_desc":"Image Properties","paste_desc":"Paste (Ctrl+V)","copy_desc":"Copy (Ctrl+C)","cut_desc":"Cut (Ctrl+X)","anchor_desc":"Insert/Edit Anchor","visualaid_desc":"show/Hide Guidelines/Invisible Elements","charmap_desc":"Insert Special Character","backcolor_desc":"Select Background Color","forecolor_desc":"Select Text Color","custom1_desc":"Your Custom Description Here","removeformat_desc":"Remove Formatting","hr_desc":"Insert Horizontal Line","sup_desc":"Superscript","sub_desc":"Subscript","code_desc":"Edit HTML Source","cleanup_desc":"Cleanup Messy Code","image_desc":"Insert/Edit Image","unlink_desc":"Unlink","link_desc":"Insert/Edit Link","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","indent_desc":"Increase Indent","outdent_desc":"Decrease Indent","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","justifyfull_desc":"Align Full","justifyright_desc":"Align Right","justifycenter_desc":"Align Center","justifyleft_desc":"Align Left","striketrough_desc":"Strikethrough","help_shortcut":"Press ALT-F10 for toolbar. Press ALT-0 for help","rich_text_area":"Rich Text Area","shortcuts_desc":"Accessability Help",toolbar:"Toolbar"});
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
index 0a459beb5..aae6a6b50 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
@@ -1,54 +1 @@
-tinyMCE.addI18n('en.advanced_dlg',{

-about_title:"About TinyMCE",

-about_general:"About",

-about_help:"Help",

-about_license:"License",

-about_plugins:"Plugins",

-about_plugin:"Plugin",

-about_author:"Author",

-about_version:"Version",

-about_loaded:"Loaded plugins",

-anchor_title:"Insert/edit anchor",

-anchor_name:"Anchor name",

-anchor_invalid:"Please specify a valid anchor name.",

-code_title:"HTML Source Editor",

-code_wordwrap:"Word wrap",

-colorpicker_title:"Select a color",

-colorpicker_picker_tab:"Picker",

-colorpicker_picker_title:"Color picker",

-colorpicker_palette_tab:"Palette",

-colorpicker_palette_title:"Palette colors",

-colorpicker_named_tab:"Named",

-colorpicker_named_title:"Named colors",

-colorpicker_color:"Color:",

-colorpicker_name:"Name:",

-charmap_title:"Select custom character",

-image_title:"Insert/edit image",

-image_src:"Image URL",

-image_alt:"Image description",

-image_list:"Image list",

-image_border:"Border",

-image_dimensions:"Dimensions",

-image_vspace:"Vertical space",

-image_hspace:"Horizontal space",

-image_align:"Alignment",

-image_align_baseline:"Baseline",

-image_align_top:"Top",

-image_align_middle:"Middle",

-image_align_bottom:"Bottom",

-image_align_texttop:"Text top",

-image_align_textbottom:"Text bottom",

-image_align_left:"Left",

-image_align_right:"Right",

-link_title:"Insert/edit link",

-link_url:"Link URL",

-link_target:"Target",

-link_target_same:"Open link in the same window",

-link_target_blank:"Open link in a new window",

-link_titlefield:"Title",

-link_is_email:"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",

-link_is_external:"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",

-link_list:"Link list",

-accessibility_help:"Accessibility Help",

-accessibility_usage_title:"General Usage"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.advanced_dlg',{"link_list":"Link List","link_is_external":"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?","link_is_email":"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?","link_titlefield":"Title","link_target_blank":"Open Link in a New Window","link_target_same":"Open Link in the Same Window","link_target":"Target","link_url":"Link URL","link_title":"Insert/Edit Link","image_align_right":"Right","image_align_left":"Left","image_align_textbottom":"Text Bottom","image_align_texttop":"Text Top","image_align_bottom":"Bottom","image_align_middle":"Middle","image_align_top":"Top","image_align_baseline":"Baseline","image_align":"Alignment","image_hspace":"Horizontal Space","image_vspace":"Vertical Space","image_dimensions":"Dimensions","image_alt":"Image Description","image_list":"Image List","image_border":"Border","image_src":"Image URL","image_title":"Insert/Edit Image","charmap_title":"Select Special Character","colorpicker_name":"Name:","colorpicker_color":"Color:","colorpicker_named_title":"Named Colors","colorpicker_named_tab":"Named","colorpicker_palette_title":"Palette Colors","colorpicker_palette_tab":"Palette","colorpicker_picker_title":"Color Picker","colorpicker_picker_tab":"Picker","colorpicker_title":"Select a Color","code_wordwrap":"Word Wrap","code_title":"HTML Source Editor","anchor_name":"Anchor Name","anchor_title":"Insert/Edit Anchor","about_loaded":"Loaded Plugins","about_version":"Version","about_author":"Author","about_plugin":"Plugin","about_plugins":"Plugins","about_license":"License","about_help":"Help","about_general":"About","about_title":"About TinyMCE","anchor_invalid":"Please specify a valid anchor name.","accessibility_help":"Accessibility Help","accessibility_usage_title":"General Usage"});
\ No newline at end of file