Oops, accidentally got tired.

This commit is contained in:
Zixaphir 2013-08-11 23:44:05 -07:00
parent 256e20aea5
commit a8ee9b3992
3 changed files with 27 additions and 25 deletions

View File

@ -4412,12 +4412,12 @@
links = [];
if (Linkify.regString.test(node.data)) {
Linkify.regString.lastIndex = 0;
Linkify.gatherLinks(snapshot, this, node, i);
Linkify.gatherLinks(snapshot, this, node, links, i);
}
_ref = links.reverse();
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
range = _ref[_i];
Linkify.makeLink(range, post);
this.nodes.links.push(Linkify.makeLink(range, this));
}
}
if (!(Conf['Embedding'] || Conf['Link Title'])) {
@ -4436,7 +4436,7 @@
}
}
},
gatherLinks: function(snapshot, post, node, i) {
gatherLinks: function(snapshot, post, node, links, i) {
var data, index, len, len2, link, match, range;
data = node.data;
@ -4455,10 +4455,10 @@
}
Linkify.regString.lastIndex = 0;
if (match) {
links.push(Linkify.seek(snapshot, post, node, match, i));
links.push(Linkify.seek(snapshot, post, node, links, match, i));
}
},
seek: function(snapshot, post, node, match, i) {
seek: function(snapshot, post, node, links, match, i) {
var data, index, link, next, range, result;
link = match[0];
@ -4471,7 +4471,8 @@
index = result.index;
range.setEnd(node, index);
Linkify.regString.lastIndex = index;
Linkify.gatherLinks(snapshot, post, node, i);
Linkify.gatherLinks(snapshot, post, node, links, i);
return range;
}
}
if (range.collapsed) {
@ -4479,7 +4480,7 @@
}
return range;
},
makeLink: function(range, post) {
makeLink: function(range) {
var a, link;
link = range.toString();
@ -4492,7 +4493,7 @@
});
$.add(a, range.extractContents());
range.insertNode(a);
post.nodes.links.push(a);
return a;
},
services: function(link) {
var href, key, match, type, _ref;

View File

@ -4417,12 +4417,12 @@
links = [];
if (Linkify.regString.test(node.data)) {
Linkify.regString.lastIndex = 0;
Linkify.gatherLinks(snapshot, this, node, i);
Linkify.gatherLinks(snapshot, this, node, links, i);
}
_ref = links.reverse();
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
range = _ref[_i];
Linkify.makeLink(range, post);
this.nodes.links.push(Linkify.makeLink(range, this));
}
}
if (!(Conf['Embedding'] || Conf['Link Title'])) {
@ -4441,7 +4441,7 @@
}
}
},
gatherLinks: function(snapshot, post, node, i) {
gatherLinks: function(snapshot, post, node, links, i) {
var data, index, len, len2, link, match, range;
data = node.data;
@ -4460,10 +4460,10 @@
}
Linkify.regString.lastIndex = 0;
if (match) {
links.push(Linkify.seek(snapshot, post, node, match, i));
links.push(Linkify.seek(snapshot, post, node, links, match, i));
}
},
seek: function(snapshot, post, node, match, i) {
seek: function(snapshot, post, node, links, match, i) {
var data, index, link, next, range, result;
link = match[0];
@ -4476,7 +4476,8 @@
index = result.index;
range.setEnd(node, index);
Linkify.regString.lastIndex = index;
Linkify.gatherLinks(snapshot, post, node, i);
Linkify.gatherLinks(snapshot, post, node, links, i);
return range;
}
}
if (range.collapsed) {
@ -4484,7 +4485,7 @@
}
return range;
},
makeLink: function(range, post) {
makeLink: function(range) {
var a, link;
link = range.toString();
@ -4497,7 +4498,7 @@
});
$.add(a, range.extractContents());
range.insertNode(a);
post.nodes.links.push(a);
return a;
},
services: function(link) {
var href, key, match, type, _ref;

View File

@ -52,10 +52,10 @@ Linkify =
if Linkify.regString.test node.data
Linkify.regString.lastIndex = 0
Linkify.gatherLinks snapshot, @, node, i
Linkify.gatherLinks snapshot, @, node, links, i
for range in links.reverse()
Linkify.makeLink range, post
@nodes.links.push Linkify.makeLink range, @
return unless Conf['Embedding'] or Conf['Link Title']
@ -68,7 +68,7 @@ Linkify =
return
gatherLinks: (snapshot, post, node, i) ->
gatherLinks: (snapshot, post, node, links, i) ->
{data} = node
len = data.length
@ -87,11 +87,11 @@ Linkify =
Linkify.regString.lastIndex = 0
if match
links.push Linkify.seek snapshot, post, node, match, i
links.push Linkify.seek snapshot, post, node, links, match, i
return
seek: (snapshot, post, node, match, i) ->
seek: (snapshot, post, node, links, match, i) ->
link = match[0]
range = document.createRange()
range.setStart node, match.index
@ -103,14 +103,15 @@ Linkify =
{index} = result
range.setEnd node, index
Linkify.regString.lastIndex = index
Linkify.gatherLinks snapshot, post, node, i
Linkify.gatherLinks snapshot, post, node, links, i
return range
if range.collapsed
range.setEndAfter node
range
makeLink: (range, post) ->
makeLink: (range) ->
link = range.toString()
link =
if link.contains ':'
@ -129,8 +130,7 @@ Linkify =
href: link
$.add a, range.extractContents()
range.insertNode a
post.nodes.links.push a
return
a
services: (link) ->
href = link.href