Merge branch 'master' into pentool

3 files changed, 611 insertions, 10 deletions

diff --git a/js/document/views/base.js b/js/document/views/base.js
index 50c0a78d..d13dce1a 100755
--- a/js/document/views/base.js
+++ b/js/document/views/base.js
@@ -7,15 +7,59 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage =   require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component;
+        Component = require("montage/ui/component").Component,
+        UrlParser = require("js/document/helpers/url-parser").UrlParser;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.BaseDocumentView = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
-                enumerable: false,
         value: false
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        urlParser: {
+        value: UrlParser
+    },
+        ////////////////////////////////////////////////////////////////////
+        //
+        _iframe: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+        //TODO: This should be renamed to better illustrate it's a container (iframe for design, div for code view)
+        iframe: {
+                get: function() {return this._iframe;},
+        set: function(value) {this._iframe= value;}
+    },
+        ////////////////////////////////////////////////////////////////////
+        //
+        show: {
+        value: function (callback) {
+                if (this.iframe) {
+                        this.iframe.style.display = 'block';
+                this.iframe.style.opacity = 1;
+                } else {
+                        console.log('Error: View has no iframe to show!');
+                }
+                //
+                if (callback) callback();
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        hide: {
+        value: function (callback) {
+                if (this.iframe) {
+                        this.iframe.style.display = 'none';
+                this.iframe.style.opacity = 0;
+                } else {
+                        console.log('Error: View has no iframe to hide!');
+                }
+                //
+                if (callback) callback();
+        }
     }
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
diff --git a/js/document/views/code.js b/js/document/views/code.js
index cd3e02d4..0a0ff5c1 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -10,16 +10,150 @@ var Montage = 			require("montage/core/core").Montage,
         Component =             require("montage/ui/component").Component,
         BaseDocumentView =      require("js/document/views/base").BaseDocumentView;
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.CodeDocumentView = Montage.create(BaseDocumentView, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
-                enumerable: false,
         value: false
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _editor: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    editor: {
+        get: function() {return this._editor;},
+        set: function(value) {this._editor = value;}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _textArea: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    textArea: {
+        get: function() {return this._textArea;},
+        set: function(value) {this._textArea = value;}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _textViewContainer: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    textViewContainer: {
+        get: function() {return this._textViewContainer;},
+        set: function(value) {this._textViewContainer = value;}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    initialize:{
+        value: function(parentContainer){
+            //create contianer
+            this.textViewContainer = document.createElement("div");
+            //this.textViewContainer.id = "codemirror_" + uuid;
+            this.textViewContainer.style.display = "block";
+            parentContainer.appendChild(this.textViewContainer);
+            //create text area
+            this.textArea = this.createTextAreaElement();
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //Creates a textarea element which will contain the content of the opened text document
+    createTextAreaElement: {
+        value: function() {
+            var textArea = document.createElement("textarea");
+            //textArea.id = "code";
+            //textArea.name = "code";
+            this.textViewContainer.appendChild(textArea);
+            //Returns textarea element
+            return textArea;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //Creates a new instance of a code editor
+    initializeTextView: {
+        value: function(file, textDocument) {
+                //
+            var type;
+            //
+            if(this.activeDocument) {
+                //need to hide only if another document was open before
+                //this.application.ninja.documentController._hideCurrentDocument();
+                                //this.hideOtherDocuments(doc.uuid);
+            }
+            //
+            switch(file.extension) {
+                case  "css" :
+                    type = "css";
+                    break;
+                case "js" :
+                    type = "javascript";
+                    break;
+                case "html" :
+                    type = "htmlmixed";
+                    break;
+                case "json" :
+                    type = "javascript";
+                    break;
+                case "php" :
+                    type = "php";
+                    break;
+                case "pl" :
+                    type = "perl";
+                    break;
+                case "py" :
+                    type = "python";
+                    break;
+                case "rb" :
+                    type = "ruby";
+                    break;
+                case "xml" :
+                    type = "xml";
+                    break;
+            }
+            //
+            this.textViewContainer.style.display="block";
+            //
+            this.editor = this.application.ninja.codeEditorController.createEditor(this, type, file.extension, textDocument);
+            this.editor.hline = this.editor.setLineClass(0, "activeline");
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    show: {
+        value: function (callback) {
+                //
+            this.textViewContainer.style.display = "block";
+            //
+            if (callback) callback();
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    hide: {
+        value: function (callback) {
+                //
+            this.textViewContainer.style.display = "none";
+            //
+            if (callback) callback();
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    applyTheme:{
+        value:function(themeClass){
+            //Todo: change for bucket structure of documents
+            this.textViewContainer.className = "codeViewContainer "+themeClass;
+        }
     }
-        ////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 84871257..c7313708 100755
--- a/js/document/views/design.js
+++ b/js/document/views/