diff options
author | Valerio Virgillito | 2012-03-06 17:08:28 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-03-06 17:08:28 -0800 |
commit | cef07085443b7c31e878daaad083b7408c57e104 (patch) | |
tree | 77c30a958c0283a6aa208b93640c6008eeb943e2 /js/mediators/io-mediator.js | |
parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
parent | fca92904597895675ddd216399cd235f3c5a7cfa (diff) | |
download | ninja-cef07085443b7c31e878daaad083b7408c57e104.tar.gz |
Merge pull request #99 from joseeight/FileIO-Build-Candidate
File IO Updates
Diffstat (limited to 'js/mediators/io-mediator.js')
-rw-r--r-- | js/mediators/io-mediator.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index 097f5975..f44c182c 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js | |||
@@ -335,7 +335,11 @@ exports.IoMediator = Montage.create(Component, { | |||
335 | cleanedCss = dirtyCss.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaUrl.bind(this)); | 335 | cleanedCss = dirtyCss.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaUrl.bind(this)); |
336 | 336 | ||
337 | function parseNinjaUrl (url) { | 337 | function parseNinjaUrl (url) { |
338 | return this.getUrlfromNinjaUrl(url, fileRootUrl, fileUrl); | 338 | if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) { |
339 | return this.getUrlfromNinjaUrl(url, fileRootUrl, fileUrl); | ||
340 | } else { | ||
341 | return url; | ||
342 | } | ||
339 | } | 343 | } |
340 | 344 | ||
341 | /////////////////////////////////////////////////////////////////////////////////////////// | 345 | /////////////////////////////////////////////////////////////////////////////////////////// |