Merge pull request #209 from tomijarvi/update-tinymce-3.5.12

Update TinyMCE to version 3.5.12
jazzband · Feb 15, 2017 · 3c5e5f9 · 3c5e5f9
2 parents b6f8086 + a9382fe
commit 3c5e5f9
Show file tree

Hide file tree

Showing 40 changed files with 20,500 additions and 19,779 deletions.
diff --git a/tinymce/static/tiny_mce/langs/en.js b/tinymce/static/tiny_mce/langs/en.js
diff --git a/tinymce/static/tiny_mce/license.txt b/tinymce/static/tiny_mce/license.txt
@@ -20,7 +20,7 @@ free software--to make sure the software is free for all its users.
   This license, the Lesser General Public License, applies to some
 specially designated software packages--typically libraries--of the
 Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
+can use it too, but we suggest you first think carefuly about whether
 this license or the ordinary General Public License is the better
 strategy to use in any particular case, based on the explanations below.
 

diff --git a/tinymce/static/tiny_mce/plugins/emotions/langs/en_dlg.js b/tinymce/static/tiny_mce/plugins/emotions/langs/en_dlg.js
diff --git a/tinymce/static/tiny_mce/plugins/example/editor_plugin_src.js b/tinymce/static/tiny_mce/plugins/example/editor_plugin_src.js
@@ -49,7 +49,7 @@
 		},
 
 		/**
-		 * Creates control instances based in the incomming name. This method is normally not
+		 * Creates control instances based in the incoming name. This method is normally not
 		 * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
 		 * but you sometimes need to create more complex controls like listboxes, split buttons etc then this
 		 * method can be used to create those.