Merge branch 'refs/heads/ninja-internal' into WebGLFixes

6 files changed, 325 insertions, 81 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 64ff2c7e..194496a6 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -76,11 +76,14 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         //
     handleWebRequest: {
         value: function (request) {
-                if (this._hackRootFlag && request.url.indexOf('js/document/templates/montage-html') !== -1) {
+                //TODO: Check if frameId is proper
+                if (this._hackRootFlag && request.parentFrameId !== -1) {
                         //TODO: Optimize creating string
-                                        return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
-                                }
+                        //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url);
+                                //return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
+                                return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/montage-html/'))[1]};
                         }
+                }
     },
     ////////////////////////////////////////////////////////////////////
         //
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index c4623d3f..75968d4a 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -76,7 +76,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});
 
 
 
@@ -92,12 +92,14 @@ exports.SelectionController = Montage.create(Component, {
     handleSwitchDocument: {
         value: function() {
             this._selectedItems = this.application.ninja.selectedElements.slice(0);
-            if(this._selectedItems.length === 0 ){
+            if(this._selectedItems.length === 0) {
                 this._isDocument = true;
-            }else{
+            } else {
                 this._isDocument = false;
             }
-            NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} );
+            NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument});
+
+                        this._selectionContainer = this.application.ninja.currentSelectedContainer;
         }
     },
 
@@ -137,7 +139,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/controllers/undo-controller.js b/js/controllers/undo-controller.js
index 926803d3..19cfb6e6 100755
--- a/js/controllers/undo-controller.js
+++ b/js/controllers/undo-controller.js
@@ -71,22 +71,28 @@ exports.UndoController = Montage.create( Component, {
     /**
      * Undo Queue
      */
-    _undoQueue: { value: [] },
+    _undoQueue: { value: []},
 
     undoQueue: {
         get: function() {
             return this._undoQueue;
+        },
+        set: function(value){
+            this._undoQueue = value;
         }
     },
 
     /**
      * Redo Queue
      */
-    _redoQueue: { value: [], enumerable: false },
+    _redoQueue: { value: [], enumerable: false},
 
     redoQueue: {
         get: function() {
             return this._redoQueue;
+        },
+        set: function(value){
+            this._redoQueue = value;
         }
     },
 
@@ -202,5 +208,12 @@ exports.UndoController = Montage.create( Component, {
             this.redoQueue.splice(0, this.redoQueue.length);
             //this.redoQueue = [];
         }
+    },
+
+    clearHistory:{
+        value: function(){
+            this.undoQueue.length = 0;
+            this.redoQueue.length = 0;
+        }
     }
 });
\ No newline at end of file
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 536fca47..1c5cec91 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -59,6 +59,27 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     _gridVerticalSpacing: {value:0},
     //end - drawUtils state
 
+    _undoStack: { value: [] },
+    undoStack: {
+        get: function() {
+            return this._undoStack;
+        },
+        set:function(value){
+            this._undoStack = value;
+        }
+    },
+
+    _redoStack: { value: [], enumerable: false },
+
+    redoStack: {
+        get: function() {
+            return this._redoStack;
+        },
+        set:function(value){
+            this._redoStack = value;
+        }
+    },
+
 
     // GETTERS / SETTERS
 
@@ -387,10 +408,66 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             //
             if(!this.documentRoot.Ninja) this.documentRoot.Ninja = {};
             //Inserting user's document into template
-            this._templateDocument.head.innerHTML = this._userDocument.content.head;
-            this._templateDocument.body.innerHTML = this._userDocument.content.body;
-            //TODO: Use querySelectorAll
-            var scripttags = this._templateDocument.html.getElementsByTagName('script'), webgldata;
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+            
+            //TODO: Clean up and make public method to prepend properties with Ninja URL
+            this._templateDocument.head.innerHTML = (this._userDocument.content.head.replace(/\b(href|src)\s*=\s*"([^"]*)"/g, ninjaUrlRedirect.bind(this))).replace(/url\(([^"]*)(.+?)\1\)/g, ninjaUrlRedirect.bind(this));
+            this._templateDocument.body.innerHTML = (this._userDocument.content.body.replace(/\b(href|src)\s*=\s*"([^"]*)"/g, ninjaUrlRedirect.bind(this))).replace(/url\(([^"]*)(.+?)\1\)/g, ninjaUrlRedirect.bind(this));            
+            //
+            //var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
+            //
+            function ninjaUrlRedirect (prop) {
+                //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
+                                //
+                                prop = prop.replace(/"([^"]*)"/gi, ninjaUrlPrepend.bind(this));
+                        } 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, cssUrlToNinjaUrl);
+                                function cssUrlToNinjaUrl (s) {
+                                        if (s !== 'url') {
+                                                s = docRootUrl + s;
+                                        }
+                                        return s;
+                                }
+                        }
+                    }
+                return prop;
+            }
+            //
+            function ninjaUrlPrepend (url) {
+                var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/'));
+                return '"'+docRootUrl+url.replace(/\"/gi, '')+'"';
+            }
+            
+                ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+