aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-05 22:24:20 -0800
committerJose Antonio Marquez2012-03-05 22:24:20 -0800
commit478c50ee0ce0291c13c4f1e469a234b64946413e (patch)
tree49aea6fbd5ab1a85cbc1522d5aed50c4742e703a
parent869f5f1ca66b976ba07049b1180882cb8ccb9630 (diff)
parenta68fe3f0180f5ab3304ff201be8da40c4432bd40 (diff)
downloadninja-478c50ee0ce0291c13c4f1e469a234b64946413e.tar.gz
Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate
-rw-r--r--js/mediators/io-mediator.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index d6b4bd37..07a139c0 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -441,7 +441,7 @@ function parseNinjaUrl (url) {
441 webgltag.innerHTML = json; 441 webgltag.innerHTML = json;
442 } 442 }
443 var cleanHTML = template.document.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)); 443 var cleanHTML = template.document.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));
444 console.log(this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), ''))); 444 //console.log(this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')));
445 function parseNinjaRootUrl (url) { 445 function parseNinjaRootUrl (url) {
446 if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) { 446 if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) {
447 return this.getUrlfromNinjaUrl(url, rootUrl, rootUrl.replace(new RegExp((this.application.ninja.coreIoApi.rootUrl).replace(/\//gi, '\\\/'), 'gi'), '')+'file.ext');//Wrong parameters 447 return this.getUrlfromNinjaUrl(url, rootUrl, rootUrl.replace(new RegExp((this.application.ninja.coreIoApi.rootUrl).replace(/\//gi, '\\\/'), 'gi'), '')+'file.ext');//Wrong parameters
@@ -451,7 +451,7 @@ function parseNinjaUrl (url) {
451 } 451 }
452 //console.log(rootUrl, this.application.ninja.coreIoApi.rootUrl, this.application.ninja.documentController.documentHackReference.root, this.application.ninja.coreIoApi.cloudData.root); 452 //console.log(rootUrl, this.application.ninja.coreIoApi.rootUrl, this.application.ninja.documentController.documentHackReference.root, this.application.ninja.coreIoApi.cloudData.root);
453 //console.log(this.getPrettyHtml(template.document.content.document.documentElement.outerHTML)); 453 //console.log(this.getPrettyHtml(template.document.content.document.documentElement.outerHTML));
454 return; 454 //return;
455 // 455 //
456 return this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')); 456 return this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), ''));
457 } 457 }