Merge branch 'refs/heads/FileIO-jose' into FileIO-ananya

Conflicts:
	js/controllers/selection-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

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, {
                                                                 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));
                                                                 
                                                         function parseNinjaUrl (url) {
-                                                                return this.getUrlfromNinjaUrl(url, fileRootUrl, fileUrl);
+                                                                if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) {
+                                                                        return this.getUrlfromNinjaUrl(url, fileRootUrl, fileUrl);
+                                                                } else {
+                                                                        return url;
+                                                                }
                                                         }
                                                         
                                                         ///////////////////////////////////////////////////////////////////////////////////////////