Merge branch 'tinymce4'

Conflicts:
	program/js/app.js
	program/js/editor.js
	program/js/tiny_mce/tiny_mce.js
	program/steps/utils/spell_html.inc

17 files changed, 1 insertions, 0 deletions

diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-cool.gif b/program/js/tinymce/plugins/emoticons/img/smiley-cool.gif
new file mode 100644
index 000000000..ba90cc36f
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-cool.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-cry.gif b/program/js/tinymce/plugins/emoticons/img/smiley-cry.gif
new file mode 100644
index 000000000..74d897a4f
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-cry.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif b/program/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif
new file mode 100644
index 000000000..963a96b8a
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif b/program/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
new file mode 100644
index 000000000..c7cf1011d
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-frown.gif b/program/js/tinymce/plugins/emoticons/img/smiley-frown.gif
new file mode 100644
index 000000000..716f55e16
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-frown.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-innocent.gif b/program/js/tinymce/plugins/emoticons/img/smiley-innocent.gif
new file mode 100644
index 000000000..334d49e0e
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-innocent.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-kiss.gif b/program/js/tinymce/plugins/emoticons/img/smiley-kiss.gif
new file mode 100644
index 000000000..4efd549ed
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-kiss.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-laughing.gif b/program/js/tinymce/plugins/emoticons/img/smiley-laughing.gif
new file mode 100644
index 000000000..82c5b182e
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-laughing.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif b/program/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
new file mode 100644
index 000000000..ca2451e10
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-sealed.gif b/program/js/tinymce/plugins/emoticons/img/smiley-sealed.gif
new file mode 100644
index 000000000..fe66220c2
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-sealed.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-smile.gif b/program/js/tinymce/plugins/emoticons/img/smiley-smile.gif
new file mode 100644
index 000000000..fd27edfaa
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-smile.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-surprised.gif b/program/js/tinymce/plugins/emoticons/img/smiley-surprised.gif
new file mode 100644
index 000000000..0cc9bb71c
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-surprised.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif b/program/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
new file mode 100644
index 000000000..2075dc160
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-undecided.gif b/program/js/tinymce/plugins/emoticons/img/smiley-undecided.gif
new file mode 100644
index 000000000..bef7e2573
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-undecided.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-wink.gif b/program/js/tinymce/plugins/emoticons/img/smiley-wink.gif
new file mode 100644
index 000000000..0631c7616
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-wink.gif
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-yell.gif b/program/js/tinymce/plugins/emoticons/img/smiley-yell.gif
new file mode 100644
index 000000000..648e6e879
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/img/smiley-yell.gif
diff --git a/program/js/tinymce/plugins/emoticons/plugin.min.js b/program/js/tinymce/plugins/emoticons/plugin.min.js
new file mode 100644
index 000000000..737083f9c
--- /dev/null
+++ b/program/js/tinymce/plugins/emoticons/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("emoticons",function(t,e){function a(){var t;return t='<table role="list" class="mce-grid">',tinymce.each(i,function(a){t+="<tr>",tinymce.each(a,function(a){var i=e+"/img/smiley-"+a+".gif";t+='<td><a href="#" data-mce-url="'+i+'" data-mce-alt="'+a+'" tabindex="-1" role="option" aria-label="'+a+'"><img src="'+i+'" style="width: 18px; height: 18px" role="presentation" /></a></td>'}),t+="</tr>"}),t+="</table>"}var i=[["cool","cry","embarassed","foot-in-mouth"],["frown","innocent","kiss","laughing"],["money-mouth","sealed","smile","surprised"],["tongue-out","undecided","wink","yell"]];t.addButton("emoticons",{type:"panelbutton",panel:{role:"application",autohide:!0,html:a,onclick:function(e){var a=t.dom.getParent(e.target,"a");a&&(t.insertContent('<img src="'+a.getAttribute("data-mce-url")+'" alt="'+a.getAttribute("data-mce-alt")+'" />'),this.hide())}},tooltip:"Emoticons"})});
\ No newline at end of file