projects
/
euphorik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
23f92ff
)
FIX #76
author
Greg Burri
<greg.burri@gmail.com>
Sat, 4 Oct 2008 23:49:13 +0000
(23:49 +0000)
committer
Greg Burri
<greg.burri@gmail.com>
Sat, 4 Oct 2008 23:49:13 +0000
(23:49 +0000)
js/formateur.js
patch
|
blob
|
history
diff --git
a/js/formateur.js
b/js/formateur.js
index
5e8095a
..
1cc88c2
100644
(file)
--- a/
js/formateur.js
+++ b/
js/formateur.js
@@
-28,7
+28,7
@@
euphorik.Formateur = function() {
\r
this.regexUrl = new RegExp("(?:(?:" + this.protocoles + ")://|www\\.)[^ ]*", "gi");
\r
this.regexImg = new RegExp("^.*?\\.(gif|jpg|png|jpeg|bmp|tiff)$", "i");
\r
\r
this.regexUrl = new RegExp("(?:(?:" + this.protocoles + ")://|www\\.)[^ ]*", "gi");
\r
this.regexImg = new RegExp("^.*?\\.(gif|jpg|png|jpeg|bmp|tiff)$", "i");
\r
- this.regexDomaine = new RegExp("^(?:(?:" + this.protocoles + ")://
|www\\.).*?([^/.]+\\.[^/.]+
)(?:$|/).*$", "i");
\r
+ this.regexDomaine = new RegExp("^(?:(?:" + this.protocoles + ")://
)(.*?
)(?:$|/).*$", "i");
\r
this.regexTestProtocoleExiste = new RegExp("^(?:" + this.protocoles + ")://.*$", "i");
\r
this.regexNomProtocole = new RegExp("^(.*?)://");
\r
};
\r
this.regexTestProtocoleExiste = new RegExp("^(?:" + this.protocoles + ")://.*$", "i");
\r
this.regexNomProtocole = new RegExp("^(.*?)://");
\r
};
\r
@@
-124,7
+124,7
@@
euphorik.Formateur.prototype.traiterWikiSyntaxe = function(m) {
\r
/**
\r
* Renvoie une version courte de l'url.
\r
\r
/**
\r
* Renvoie une version courte de l'url.
\r
- * par exemple : http://en.wikipedia.org/wiki/Yakov_Smirnoff devient wikipedia.org
\r
+ * par exemple : http://en.wikipedia.org/wiki/Yakov_Smirnoff devient
en.
wikipedia.org
\r
*/
\r
euphorik.Formateur.prototype.getShort = function(url) {
\r
var estUneImage = false;
\r
*/
\r
euphorik.Formateur.prototype.getShort = function(url) {
\r
var estUneImage = false;
\r