Merge branch 'master' into pentool

3 files changed, 70 insertions, 12 deletions

diff --git a/js/document/models/base.js b/js/document/models/base.js
new file mode 100755
index 00000000..8925fc40
--- /dev/null
+++ b/js/document/models/base.js
@@ -0,0 +1,42 @@
+/* <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;
+////////////////////////////////////////////////////////////////////////
+//      
+exports.BaseDocumentModel = Montage.create(Montage, {
+        ////////////////////////////////////////////////////////////////////
+        //
+        hasTemplate: {
+                enumerable: false,
+        value: false
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        file: {
+        value: null
+    },
+
+    _name: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        njdata: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        views: {
+        value: null
+    }
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/models/base-model.js b/js/document/models/html.js
index be441da2..ff57454b 100755
--- a/js/document/models/base-model.js
+++ b/js/document/models/html.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,
-        Component = require("montage/ui/component").Component;
+var Montage =                   require("montage/core/core").Montage,
+    BaseDocumentModel = require("js/document/models/base").BaseDocumentModel;
 ////////////////////////////////////////////////////////////////////////
 //      
-exports.ENTERNAME = Montage.create(Montage, {
+exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
                 enumerable: false,
         value: false
-    },
-        ////////////////////////////////////////////////////////////////////
-    //
-        deserializedFromTemplate: {
-                enumerable: false,
-                value: function () {
-                        //
-                }
-        }
+    }
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
 });
diff --git a/js/document/models/text.js b/js/document/models/text.js
new file mode 100755
index 00000000..ebf9993e
--- /dev/null
+++ b/js/document/models/text.js
@@ -0,0 +1,24 @@
+/* <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,
+        BaseDocumentModel = require("js/document/models/text").BaseDocumentModel;
+////////////////////////////////////////////////////////////////////////
+//      
+exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
+        ////////////////////////////////////////////////////////////////////
+        //
+        hasTemplate: {
+                enumerable: false,
+        value: false
+    }
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file