Merge commit 'upstream/master'

1 files changed, 6 insertions, 2 deletions

diff --git a/library/tinymce/examples/custom_formats.html b/library/tinymce/examples/custom_formats.html
index 7c475b19b..ba9d1eb0c 100755..100644
--- a/library/tinymce/examples/custom_formats.html
+++ b/library/tinymce/examples/custom_formats.html
@@ -10,7 +10,7 @@
 		// General options

 		mode : "textareas",

 		theme : "advanced",

-		plugins : "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",

 

 		// Theme options

 		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

@@ -102,6 +102,10 @@
 		<input type="reset" name="reset" value="Reset" />

 	</div>

 </form>

-

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

 </body>

 </html>