Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements

Conflicts:
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

3 files changed, 53 insertions, 11 deletions

diff --git a/js/document/views/base-view.js b/js/document/views/base.js
index be441da2..50c0a78d 100755
--- a/js/document/views/base-view.js
+++ b/js/document/views/base.js
@@ -6,25 +6,17 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage = require("montage/core/core").Montage,
+var Montage =   require("montage/core/core").Montage,
         Component = require("montage/ui/component").Component;
 ////////////////////////////////////////////////////////////////////////
 //      
-exports.ENTERNAME = Montage.create(Montage, {
+exports.BaseDocumentView = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
                 enumerable: false,
         value: false
-    },
-        ////////////////////////////////////////////////////////////////////
-    //
-        deserializedFromTemplate: {
-                enumerable: false,
-                value: function () {
-                        //
-                }
-        }
+    }
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
 });
diff --git a/js/document/views/code.js b/js/document/views/code.js
new file mode 100755
index 00000000..cd3e02d4
--- /dev/null
+++ b/js/document/views/code.js
@@ -0,0 +1,25 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+////////////////////////////////////////////////////////////////////////
+//
+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
+    }
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/views/design.js b/js/document/views/design.js
new file mode 100755
index 00000000..84871257
--- /dev/null
+++ b/js/document/views/design.js
@@ -0,0 +1,25 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+////////////////////////////////////////////////////////////////////////
+//
+var Montage =                   require("montage/core/core").Montage,
+        Component =             require("montage/ui/component").Component,
+        CodeDocumentView =      require("js/document/views/code").CodeDocumentView;
+////////////////////////////////////////////////////////////////////////
+//      
+exports.DesignDocumentView = Montage.create(CodeDocumentView, {
+        ////////////////////////////////////////////////////////////////////
+        //
+        hasTemplate: {
+                enumerable: false,
+        value: false
+    }
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file