11 files changed, 245 insertions, 251 deletions

diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 49bf42b6..eff9c91a 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -77,7 +77,7 @@ exports.SelectionController = Montage.create(Component, {
 
 
                     this.application.ninja.selectedElements = currentSelectionArray;
-                    NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
+                    NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
 
 
 
@@ -90,7 +90,7 @@ exports.SelectionController = Montage.create(Component, {
         }
     },
 
-    handleSwitchDocument: {
+     handleSwitchDocument: {
         value: function() {
             if(this.application.ninja.documentController.activeDocument.currentView === "design"){
                 this._selectedItems = this.application.ninja.selectedElements.slice(0);
@@ -154,7 +154,7 @@ exports.SelectionController = Montage.create(Component, {
         value: function(event) {
             this.application.ninja.selectedElements = [];
             this._isDocument = true;
-            NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
+            NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
         }
     },
 
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index aa5057a2..2422f5e7 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -19,7 +19,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: false,
             collapsed: false,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/Color/colorpanelbase.reel",
             moduleName: "ColorPanelBase"
         },
@@ -32,7 +31,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: false,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/properties.reel",
             moduleName: "Properties"
         },
@@ -45,7 +43,6 @@ exports.PanelsData = Montage.create(Montage, {
             collapsed: true,
             scrollable: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/Materials/materials-library-panel.reel",
             moduleName: "MaterialsLibraryPanel"
         },
@@ -58,7 +55,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/Components/ComponentsPanelBase.reel",
             moduleName: "ComponentsPanelBase"
         },
@@ -71,7 +67,6 @@ exports.PanelsData = Montage.create(Montage, {
 //            scrollable: true,
 //            collapsed: false,
 //            open: true,
-//            content: null,
 //            modulePath: "js/panels/Project/projectpanelbase.reel",
 //            moduleName: "ProjectPanelBase"
 //        },
@@ -84,7 +79,6 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/CSSPanel/CSSPanelBase.reel",
             moduleName: "CSSPanelBase"
         },
@@ -97,7 +91,6 @@ exports.PanelsData = Montage.create(Montage, {
             collapsed: true,
             scrollable: true,
             open: true,
-            contentComponent: null,
             modulePath: "js/panels/presets/content.reel",
             moduleName: "content"
         }
@@ -118,24 +111,6 @@ exports.PanelsData = Montage.create(Montage, {
             this._panelOrder = val;
         }
     }
-
-
-    panels: {
-        get: function() {
-            var filtered = this._panels.filter(function(item) {
-                return item.open;
-            });
-
-            filtered.sort(function(a,b) {
-               a.name
-            });
-
-            return filtered;
-        },
-        set : function() {
-
-        }
-    }
     */
 
 });
\ No newline at end of file
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 924a013d..9670e0c4 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -437,8 +437,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         } else if (prop.indexOf('url') !== -1) { //From CSS property
                                 //TODO: Add functionality
                                 var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
-                                prop = prop.replace(/[^()\\""\\'']+/g, test);
-                                function test (s) {
+                                prop = prop.replace(/[^()\\""\\'']+/g, cssUrlToNinjaUrl);
+                                function cssUrlToNinjaUrl (s) {
                                         if (s !== 'url') {
                                                 s = docRootUrl + s;
                                         }
@@ -570,8 +570,22 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                 }
                                                                 //
                                                                 fileCouldDirUrl = this._document.styleSheets[i].href.split(this._document.styleSheets[i].href.split('/')[this._document.styleSheets[i].href.split('/').length-1])[0];
-                                                                prefixUrl = 'url('+fileCouldDirUrl; //This should be re-written with better RegEx
-                                                                tag.innerHTML = cssData.content.replace(/url\(/gi, prefixUrl);
+                                                                
+                                                                tag.innerHTML = cssData.content.replace(/url\(()(.+?)\1\)/g, detectUrl);
+                                                                
+                                                                function detectUrl (prop) {
+                                                                        return prop.replace(/[^()\\""\\'']+/g, prefixUrl);;
+                                                                }
+                                                                
+                                                                function prefixUrl (url) {
+                                                                        if (url !== 'url') {
+                                                                                if (!url.match(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi)) {
+                                                                                        url = fileCouldDirUrl+url;
+                                                                                }
+                                                                        }
+                                                                        return url;
+                                                                }
+                                                                
                                                                 //Looping through DOM to insert style tag at location of link element
                                                                 query = this._templateDocument.html.querySelectorAll(['link']);
                                                                 for (var j in query) {
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;
+                                                                }
                                                         }
                                                         
                                                         ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index cdf53ddf..8f6f6d7b 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -166,7 +166,7 @@
             },
 
             "panelContainer": {
-                "module": "js/panels/PanelContainer/PanelContainer.reel",
+                "module": "js/panels/PanelContainer.reel",
                 "name": "PanelContainer",
                 "properties": {
                     "element": {"#": "rightPanelContent"},