Skip to content
Permalink
Browse files

Update TinyMCE to 3.5.6

  • Loading branch information...
perlDreamer committed Aug 30, 2012
1 parent 4f74c4c commit 3cfc42d38fdac6101165e15265040516458743f6
Showing with 14,394 additions and 10,136 deletions.
  1. +445 −1,303 www/extras/tinymce/changelog.txt
  2. +3 −3 www/extras/tinymce/examples/full.html
  3. +1 −1 www/extras/tinymce/examples/lists/media_list.js
  4. +1 −1 www/extras/tinymce/jscripts/tiny_mce/langs/en.js
  5. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
  6. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
  7. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
  8. +17 −11 www/extras/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
  9. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
  10. +9 −2 www/extras/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
  11. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
  12. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
  13. +23 −8 www/extras/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
  14. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
  15. +27 −12 www/extras/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js
  16. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
  17. +30 −39 www/extras/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
  18. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
  19. +5 −3 www/extras/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
  20. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
  21. +15 −13 www/extras/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
  22. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
  23. +22 −19 www/extras/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
  24. +18 −17 www/extras/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
  25. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
  26. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
  27. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
  28. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
  29. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
  30. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
  31. +21 −0 www/extras/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
  32. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
  33. +1 −0 www/extras/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js
  34. +50 −0 www/extras/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin_src.js
  35. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
  36. +10 −4 www/extras/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
  37. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
  38. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
  39. +7 −7 www/extras/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
  40. +2 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
  41. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
  42. +4 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
  43. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
  44. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
  45. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
  46. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
  47. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
  48. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
  49. +53 −5 www/extras/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
  50. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
  51. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
  52. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
  53. +455 −117 www/extras/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
  54. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
  55. +168 −40 www/extras/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
  56. +185 −36 www/extras/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
  57. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
  58. +126 −16 www/extras/tinymce/jscripts/tiny_mce/plugins/media/media.htm
  59. BIN www/extras/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
  60. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
  61. +3 −2 www/extras/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
  62. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
  63. +499 −54 www/extras/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
  64. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
  65. +52 −114 www/extras/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
  66. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
  67. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
  68. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
  69. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
  70. +36 −35 www/extras/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
  71. +1 −0 www/extras/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
  72. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
  73. +19 −3 www/extras/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
  74. +77 −3 www/extras/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
  75. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
  76. +9 −2 www/extras/tinymce/jscripts/tiny_mce/plugins/style/props.htm
  77. +19 −0 www/extras/tinymce/jscripts/tiny_mce/plugins/style/readme.txt
  78. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
  79. +122 −114 www/extras/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
  80. +4 −2 www/extras/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
  81. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
  82. +1,449 −1,202 www/extras/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
  83. +35 −0 www/extras/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
  84. +5 −0 www/extras/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
  85. +64 −13 www/extras/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
  86. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
  87. +2 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/table/row.htm
  88. +3 −3 www/extras/tinymce/jscripts/tiny_mce/plugins/table/table.htm
  89. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
  90. +21 −0 www/extras/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/visualblocks.css
  91. +1 −0 www/extras/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin.js
  92. +63 −0 www/extras/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin_src.js
  93. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
  94. +16 −8 www/extras/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
  95. +1 −1 www/extras/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
  96. +5 −1 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
  97. +2 −6 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
  98. +1 −1 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
  99. +180 −50 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
  100. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
  101. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif
  102. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
  103. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif
  104. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif
  105. +20 −6 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
  106. +11 −3 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
  107. +345 −329 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
  108. +13 −7 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
  109. +9 −3 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
  110. +27 −5 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
  111. +1 −1 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
  112. +1 −1 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
  113. +5 −2 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
  114. +3 −2 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
  115. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
  116. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
  117. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
  118. +7 −1 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
  119. +2 −1 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
  120. +4 −3 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
  121. +6 −1 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
  122. +3 −1 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
  123. +3 −2 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
  124. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
  125. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
  126. BIN www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
  127. +9 −3 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
  128. +1 −1 www/extras/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
  129. BIN www/extras/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
  130. +1 −1 www/extras/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
  131. +1 −1 www/extras/tinymce/jscripts/tiny_mce/tiny_mce.js
  132. +1 −1 www/extras/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
  133. +9,497 −6,450 www/extras/tinymce/jscripts/tiny_mce/tiny_mce_src.js
  134. +1 −1 www/extras/tinymce/jscripts/tiny_mce/utils/editable_selects.js

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -10,13 +10,13 @@
// General options
mode : "textareas",
theme : "advanced",
plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave,visualblocks",
// Theme options
theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",
theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",
theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft,visualblocks",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_statusbar_location : "bottom",
@@ -52,7 +52,7 @@
<!-- /TinyMCE -->

</head>
<body>
<body role="application">

<form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">
<div>
@@ -10,5 +10,5 @@ var tinyMCEMediaList = [
["Some RealMedia", "media/sample.rm"],
["Some Shockwave", "media/sample.dcr"],
["Some Video", "media/sample.mp4"],
["Some FLV", "media/sample.flv"],
["Some FLV", "media/sample.flv"]
];

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -14,7 +14,7 @@
// Register commands
ed.addCommand('mceAdvImage', function() {
// Internal image object like a flash placeholder
if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)
if (ed.dom.getAttrib(ed.selection.getNode(), 'class', '').indexOf('mceItem') != -1)
return;

ed.windowManager.open({
@@ -9,13 +9,13 @@ var ImageDialog = {
},

init : function(ed) {
var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();
var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode(), fl = tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList');

tinyMCEPopup.resizeToInnerSize();
this.fillClassList('class_list');
this.fillFileList('src_list', 'tinyMCEImageList');
this.fillFileList('over_list', 'tinyMCEImageList');
this.fillFileList('out_list', 'tinyMCEImageList');
this.fillFileList('src_list', fl);
this.fillFileList('over_list', fl);
this.fillFileList('out_list', fl);
TinyMCE_EditableSelects.init();

if (n.nodeName == 'IMG') {
@@ -171,9 +171,13 @@ var ImageDialog = {
if (el && el.nodeName == 'IMG') {
ed.dom.setAttribs(el, args);
} else {
ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
ed.dom.setAttribs('__mce_tmp', args);
ed.dom.setAttrib('__mce_tmp', 'id', '');
tinymce.each(args, function(value, name) {
if (value === "") {
delete args[name];
}
});

ed.execCommand('mceInsertContent', false, tinyMCEPopup.editor.dom.createHTML('img', args), {skip_undo : 1});
ed.undoManager.add();
}

@@ -287,7 +291,7 @@ var ImageDialog = {
fillFileList : function(id, l) {
var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;

l = window[l];
l = typeof(l) === 'function' ? l() : window[l];
lst.options.length = 0;

if (l && l.length > 0) {
@@ -391,12 +395,14 @@ var ImageDialog = {
if (v == '0')
img.style.border = isIE ? '0' : '0 none none';
else {
if (b.length == 3 && b[isIE ? 2 : 1])
bStyle = b[isIE ? 2 : 1];
var isOldIE = tinymce.isIE && (!document.documentMode || document.documentMode < 9);

if (b.length == 3 && b[isOldIE ? 2 : 1])
bStyle = b[isOldIE ? 2 : 1];
else if (!bStyle || bStyle == 'none')
bStyle = 'solid';
if (b.length == 3 && b[isIE ? 0 : 2])
bColor = b[isIE ? 0 : 2];
bColor = b[isOldIE ? 0 : 2];
else if (!bColor || bColor == 'none')
bColor = 'black';
img.style.border = v + 'px ' + bStyle + ' ' + bColor;
Oops, something went wrong.

0 comments on commit 3cfc42d

Please sign in to comment.
You can’t perform that action at this time.