Merge pull request #138 from joseeight/FileIO-Montage-Components

I/O Fixes

1 files changed, 53 insertions, 5 deletions

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 18a517a5..1efbb8bb 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -348,7 +348,7 @@ exports.IoMediator = Montage.create(Component, {
                         }
                 }
                 //Checking for webGL elements in document
-                if (template.webgl && template.webgl.length  > 0) {
+                if (template.webgl && template.webgl.length  > 1) {//TODO: Should be length 0, hack for a temp fix
                         var rdgeDirName, rdgeVersion;
                         //Copy webGL library if needed
                         for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
@@ -532,8 +532,6 @@ function loadWebGL (e) {\n\
     getUrlfromNinjaUrl: {
         enumerable: false,
         value: function (url, fileRootUrl, fileUrl) {
-                //console.log("Params: ", url, fileRootUrl, fileUrl);
-                //console.log("Getting: " + url);
                 //
                 if (url.indexOf(fileRootUrl) !== -1) {
                         url = url.replace(new RegExp(fileRootUrl.replace(/\//gi, '\\\/'), 'gi'), '');
@@ -561,13 +559,63 @@ function loadWebGL (e) {\n\
                         //
                                 url = (path+newURL).replace(/\/\//gi, '/');
                         }
-                //console.log("Returning: " + url);
-                //console.log("-----");
                 //
                 return url;
         }
     },
     ////////////////////////////////////////////////////////////////////
+    //
+    getDocRootUrl: {
+        value: function () {
+                return this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    getNinjaPropUrlRedirect: {
+        enumerable: false,
+        value: function (prop/* , root */) {
+                //Checking for property value to not contain a full direct URL
+            if (!prop.match(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi)) {
+                        //Checking for attributes and type of source
+                if (prop.indexOf('href') !== -1 || prop.indexOf('src') !== -1) {
+                        //From HTML attribute
+                        //if (root) {
+                                //prop = (root+prop).replace(/"([^"]*)"/gi, this.getNinjaUrlPrepend.bind(this));
+                        //} else {
+                                prop = prop.replace(/"([^"]*)"/gi, this.getNinjaUrlPrepend.bind(this));
+                        //}
+                    } else if (prop.indexOf('url') !== -1) {
+                        //From CSS property
+                        //if (root) {
+                                //prop = (root+prop).replace(/[^()\\""\\'']+/g, cssUrlToNinjaUrl.bind(this));
+                        //} else {
+                                prop = prop.replace(/[^()\\""\\'']+/g, cssUrlToNinjaUrl.bind(this));
+                        //}
+                        function cssUrlToNinjaUrl (s) {
+                                if (s !== 'url') {
+                                        s = this.getDocRootUrl() + s;
+                                }
+                                return s;
+                        }
+                    }
+                }
+            return prop;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    getNinjaUrlPrepend: {
+        enumerable: false,
+        value: function (url) {
+                if (url.indexOf('data:') !== -1) {
+                return url;
+            } else {
+                return '"'+this.getDocRootUrl()+url.replace(/\"/gi, '')+'"';
+            }
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
     //Method to return a string from CSS rules (to be saved to a file)
     getCssFromRules: {
         enumerable: false,