diff options
| author | Ananya Sen | 2012-06-12 12:09:45 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-12 12:09:45 -0700 |
| commit | 3389cd085555e188800f337525c0fc8884084c04 (patch) | |
| tree | 3899c1c4b8bce4ec3c05fb4b8f6f3824cd82188d /js/document/mediators | |
| parent | 1e7f318e7bbc0c3cd95217fc369ccc30963a5381 (diff) | |
| parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
| download | ninja-3389cd085555e188800f337525c0fc8884084c04.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/document/mediators')
| -rwxr-xr-x | js/document/mediators/template.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js index 4c72314a..50fad1c3 100755 --- a/js/document/mediators/template.js +++ b/js/document/mediators/template.js | |||
| @@ -613,8 +613,8 @@ exports.TemplateDocumentMediator = Montage.create(Component, { | |||
| 613 | } else { | 613 | } else { |
| 614 | cleanHTML = template.file.content.document.documentElement.outerHTML.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaRootUrl.bind(this)); | 614 | cleanHTML = template.file.content.document.documentElement.outerHTML.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaRootUrl.bind(this)); |
| 615 | } | 615 | } |
| 616 | //TODO: Remove, this is a temp hack | 616 | //TODO: Remove, this is a temp hack to maintain a doc type on HTML files |
| 617 | cleanHTML = cleanHTML; | 617 | cleanHTML = '<!DOCTYPE html>'+cleanHTML; |
| 618 | // | 618 | // |
| 619 | function parseNinjaRootUrl(url) { | 619 | function parseNinjaRootUrl(url) { |
| 620 | if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) { | 620 | if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) { |