changeset 379:7034d570abeb

more file:// support, fixed bracketed link icon (css class) imported from: moin--main--1.5--patch-383
author Thomas Waldmann <tw@waldmann-edv.de>
date Sun, 15 Jan 2006 23:06:22 +0000
parents 1127c4123b67
children f91064250ea7
files ChangeLog MoinMoin/action/fckdialog.py MoinMoin/parser/wiki.py docs/CHANGES wiki/htdocs/applets/moinFCKplugins/moinlink/fck_link.js
diffstat 5 files changed, 25 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jan 15 16:05:40 2006 +0000
+++ b/ChangeLog	Sun Jan 15 23:06:22 2006 +0000
@@ -2,6 +2,22 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-01-16 00:06:22 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-383
+
+    Summary:
+      more file:// support, fixed bracketed link icon (css class)
+    Revision:
+      moin--main--1.5--patch-383
+
+    more file:// support, fixed bracketed link icon (css class)
+    
+
+    modified files:
+     ChangeLog MoinMoin/action/fckdialog.py MoinMoin/parser/wiki.py
+     docs/CHANGES
+     wiki/htdocs/applets/moinFCKplugins/moinlink/fck_link.js
+
+
 2006-01-15 17:05:40 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-382
 
     Summary:
--- a/MoinMoin/action/fckdialog.py	Sun Jan 15 16:05:40 2006 +0000
+++ b/MoinMoin/action/fckdialog.py	Sun Jan 15 23:06:22 2006 +0000
@@ -345,6 +345,7 @@
         <option value="http://" selected="selected">http://</option>
         <option value="https://">https://</option>
         <option value="ftp://">ftp://</option>
+        <option value="file://">file://</option>
         <option value="news://">news://</option>
         <option value="mailto:">mailto:</option>
         <option value="" fckLang="DlgLnkProtoOther">&lt;other&gt;</option>
--- a/MoinMoin/parser/wiki.py	Sun Jan 15 16:05:40 2006 +0000
+++ b/MoinMoin/parser/wiki.py	Sun Jan 15 23:06:22 2006 +0000
@@ -427,7 +427,7 @@
                     self.formatter.image(title=words[0], alt=words[0], src=words[1]) +
                     self.formatter.url(0))
         else:
-            return (self.formatter.url(1, words[0], css='www', unescaped=1) +
+            return (self.formatter.url(1, words[0], css=scheme, unescaped=1) +
                     self.formatter.text(words[1]) +
                     self.formatter.url(0))
 
--- a/docs/CHANGES	Sun Jan 15 16:05:40 2006 +0000
+++ b/docs/CHANGES	Sun Jan 15 23:06:22 2006 +0000
@@ -15,11 +15,14 @@
         but differing 3600s.
         This affected pre-1.3 moin wiki servers running on win32 OS only.
         We now try to correct those inconsistencies in mig05 by fuzzy matching.
- 
+    * fixed bracketed link scheme icon (css class)
+
   Other changes:
     * Updated FCKeditor to current CVS (2006-01-08 == 2.2+)
     * Split up show_hosts into show_hosts and show_names
     * attachment:file%20with%20spaces.txt in attachment list
+    * added support for file:// in GUI editor link dialogue, see also:
+      MoinMoin:FileLinks
 
 
 Version 1.5.0:
--- a/wiki/htdocs/applets/moinFCKplugins/moinlink/fck_link.js	Sun Jan 15 16:05:40 2006 +0000
+++ b/wiki/htdocs/applets/moinFCKplugins/moinlink/fck_link.js	Sun Jan 15 23:06:22 2006 +0000
@@ -38,13 +38,13 @@
 var oRegex = new Object();
 
 oRegex.UriProtocol = new RegExp('');
-oRegex.UriProtocol.compile('^(((http|https|ftp|news):\/\/)|mailto:)', 'gi');
+oRegex.UriProtocol.compile('^(((http|https|ftp|file|news):\/\/)|mailto:)', 'gi');
 
 oRegex.UrlOnChangeProtocol = new RegExp('');
-oRegex.UrlOnChangeProtocol.compile('^(http|https|ftp|news)://(?=.)', 'gi');
+oRegex.UrlOnChangeProtocol.compile('^(http|https|ftp|file|news)://(?=.)', 'gi');
 
 oRegex.UrlOnChangeTestOther = new RegExp('');
-oRegex.UrlOnChangeTestOther.compile('^(javascript:|#|/)', 'gi');
+oRegex.UrlOnChangeTestOther.compile('^(javascript:|#)', 'gi'); // was: (...#|/)
 
 oRegex.ReserveTarget = new RegExp('');
 oRegex.ReserveTarget.compile('^_(blank|self|top|parent)$', 'i');