3 files changed, 183 insertions, 18 deletions

diff --git a/js/document/views/base.js b/js/document/views/base.js
index d1c65b5e..db72cc60 100755
--- a/js/document/views/base.js
+++ b/js/document/views/base.js
@@ -39,6 +39,7 @@ exports.BaseDocumentView = Montage.create(Component, {
         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!');
                 }
@@ -52,6 +53,7 @@ exports.BaseDocumentView = Montage.create(Component, {
         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!');
                 }
diff --git a/js/document/views/code.js b/js/document/views/code.js
index cd3e02d4..66d1c702 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -11,15 +11,161 @@ var Montage = 			require("montage/core/core").Montage,
         BaseDocumentView =      require("js/document/views/base").BaseDocumentView;
 ////////////////////////////////////////////////////////////////////////
 //      
-exports.CodeDocumentView = Montage.create(BaseDocumentView, {
+var CodeDocumentView = 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;}
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+
+    /**
+     * Public method
+     */
+    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();
+        }
+    },
+
+    /**
+     * Public method
+     * 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);
+
+            return textArea;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    /**
+     * Public method
+     * 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 2ccb82d1..b3887fdf 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -64,6 +64,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+    propertiesPanel: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
         initialize: {
         value: function (parent) {
                 //Creating iFrame for view
@@ -184,8 +189,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 this._bodyFragment = null;
                 //Calling standard method to finish opening document
                 this.bodyContentLoaded(null);
-
-            // TODO: Clean up this code
+            //TODO: Move this to be set via the controller
             this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
             this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
         }
@@ -243,17 +247,15 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                                         }
                                 }
                         }
-            //Checking and initializing webGL
+                //Checking for script tags then parsing check for montage and webgl
             if (scripttags.length > 0) {
+                //Checking and initializing webGL
                 this.initWebGl(scripttags);
-            } //Else there is not data to parse
-                
-                
+                //Checking and initializing Montage
+                this.initMontage(scripttags);
+            } else {