Skip to content

Commit

Permalink
Item9155: Item1482: Sync doc, attach dialogue fix
Browse files Browse the repository at this point in the history
Actually, the new matchAll implementation is good for IE6, much faster

git-svn-id: http://svn.foswiki.org/trunk@7916 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
PaulHarvey authored and PaulHarvey committed Jun 25, 2010
1 parent 41713b7 commit c9075b2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
26 changes: 13 additions & 13 deletions TinyMCEPlugin/data/System/TinyMCEPlugin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ plugins : "table,searchreplace,autosave,paste,legacyoutput,inlinepopups,fullscre
foswiki_secret_id : "%WYSIWYG_SECRET_ID%",
foswiki_vars : { PUBURLPATH : "%PUBURLPATH%", PUBURL : "%PUBURL%", WEB : "%WEB%", TOPIC : "%TOPIC%", ATTACHURL : "%ATTACHURL%", ATTACHURLPATH : "%ATTACHURLPATH%", VIEWSCRIPTURL : "%SCRIPTURL{view}%", SCRIPTSUFFIX: "%SCRIPTSUFFIX%", SCRIPTURL : "%SCRIPTURL%", SYSTEMWEB: "%SYSTEMWEB%" },
theme_advanced_toolbar_align : "left",
foswikibuttons_formats : [
{ name: "Normal", remove: "all" },
{ name: "Heading 1", block: "h1", remove: "all" },
{ name: "Heading 2", block: "h2", remove: "all" },
{ name: "Heading 3", block: "h3", remove: "all" },
{ name: "Heading 4", block: "h4", remove: "all" },
{ name: "Heading 5", block: "h5", remove: "all" },
{ name: "Heading 6", block: "h6", remove: "all" },
{ name: "VERBATIM", block: "pre", remove: "all", classes: "TMLverbatim" },
{ name: "LITERAL", block: "div", remove: "all", classes: "WYSIWYG_LITERAL" },
{ name: "Protect on save", block: "div", remove: "all", classes: "WYSIWYG_PROTECTED" },
{ name: "Protect forever", block: "div", remove: "all", classes: "WYSIWYG_STICKY" }
],
foswikibuttons_formats : {
"Normal" : { remove: "all" },
"Heading 1" : { block: "h1", remove: "all" },
"Heading 2" : { block: "h2", remove: "all" },
"Heading 3" : { block: "h3", remove: "all" },
"Heading 4" : { block: "h4", remove: "all" },
"Heading 5" : { block: "h5", remove: "all" },
"Heading 6" : { block: "h6", remove: "all" },
"VERBATIM" : { block: "pre", remove: "all", classes: "TMLverbatim" },
"LITERAL" : { block: "div", remove: "all", classes: "WYSIWYG_LITERAL" },
"Protect on save" : { block: "div", remove: "all", classes: "WYSIWYG_PROTECTED" },
"Protect forever" : { block: "div", remove: "all", classes: "WYSIWYG_STICKY" }
},
paste_create_paragraphs : true,
paste_create_linebreaks : false,
paste_convert_middot_lists : true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<input type="button" id="cancel" name="close" value="{#foswikibuttons_dlg.close}" onclick="tinyMCEPopup.close();" />
</div>
</fieldset>
<label>{#foswikibuttons_dlg.attach_help}</label>
</div>
<div id="upload_panel" class="panel">
<legend>{#foswikibuttons_dlg.fieldset_upload_tab}</legend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ tinyMCE.addI18n('en.foswikibuttons_dlg', {
fieldset_general_tab: "Attachments",
fieldset_upload_tab: "Upload",
insert_attachment_link: "Insert link",
attach_help: "If recently uploaded files are not in the list, then close and re-open this dialog",
attach_file: "Upload new attachment",
attach_comment: "Comment",
attach_hide: "Hide attachment",
Expand Down

0 comments on commit c9075b2

Please sign in to comment.