Changeset 7916

Timestamp:

06/25/10 05:42:56 (2 years ago)

Author:

PaulHarvey

Message:

Item9155: Item1482: Sync doc, attach dialogue fix

Actually, the new matchAll implementation is good for IE6, much faster

Location:

trunk/TinyMCEPlugin

Files:

• data/System/TinyMCEPlugin.txt (modified) (1 diff)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach.htm (modified) (1 diff)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/langs/en_dlg.js (modified) (1 diff)

trunk/TinyMCEPlugin/data/System/TinyMCEPlugin.txt

@@ -64 +64 @@
 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,

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/attach.htm

@@ -39 +39 @@
               </div>
             </fieldset>
-            <label>{#foswikibuttons_dlg.attach_help}</label>
           </div>
           <div id="upload_panel" class="panel">

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/langs/en_dlg.js

@@ -9 +9 @@
     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",