From e876941eaa6cf5adf0e028d0f3f9402284ea5de2 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 2 Apr 2012 10:39:12 -0700
Subject: Setting up document rework

---
 js/document/models/base-model.js | 32 --------------------------------
 js/document/models/html.js       | 25 +++++++++++++++++++++++++
 js/document/models/text.js       | 24 ++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 32 deletions(-)
 delete mode 100755 js/document/models/base-model.js
 create mode 100755 js/document/models/html.js
 create mode 100755 js/document/models/text.js

(limited to 'js/document/models')

diff --git a/js/document/models/base-model.js b/js/document/models/base-model.js
deleted file mode 100755
index be441da2..00000000
--- a/js/document/models/base-model.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/* <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;
-////////////////////////////////////////////////////////////////////////
-//	
-exports.ENTERNAME = Montage.create(Montage, {
-	////////////////////////////////////////////////////////////////////
-	//
-	hasTemplate: {
-		enumerable: false,
-        value: false
-    },
-	////////////////////////////////////////////////////////////////////
-    //
-	deserializedFromTemplate: {
-		enumerable: false,
-		value: function () {
-			//
-		}
-	}
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////
-});
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/models/html.js b/js/document/models/html.js
new file mode 100755
index 00000000..0ac09f3b
--- /dev/null
+++ b/js/document/models/html.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,
+	TextDocumentModel = require("js/document/models/text").TextDocumentModel;
+////////////////////////////////////////////////////////////////////////
+//	
+exports.HtmlDocumentModel = Montage.create(TextDocumentModel, {
+	////////////////////////////////////////////////////////////////////
+	//
+	hasTemplate: {
+		enumerable: false,
+        value: false
+    }
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/models/text.js b/js/document/models/text.js
new file mode 100755
index 00000000..c8fba911
--- /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,
+	Component = require("montage/ui/component").Component;
+////////////////////////////////////////////////////////////////////////
+//	
+exports.TextDocumentModel = Montage.create(Component, {
+	////////////////////////////////////////////////////////////////////
+	//
+	hasTemplate: {
+		enumerable: false,
+        value: false
+    }
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file
-- 
cgit v1.2.3


From bc04ee998de7aaadc457f4e932cc4be8327a2a03 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 4 Apr 2012 11:35:12 -0700
Subject: Backup for merge

---
 js/document/models/base.js | 38 ++++++++++++++++++++++++++++++++++++++
 js/document/models/html.js |  1 -
 js/document/models/text.js |  4 ++--
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100755 js/document/models/base.js

(limited to 'js/document/models')

diff --git a/js/document/models/base.js b/js/document/models/base.js
new file mode 100755
index 00000000..96156e64
--- /dev/null
+++ b/js/document/models/base.js
@@ -0,0 +1,38 @@
+/* <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
+    },
+    ////////////////////////////////////////////////////////////////////
+	//
+	njdata: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+	//
+	views: {
+        value: null
+    }
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 0ac09f3b..5882d389 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -7,7 +7,6 @@ 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,
 	TextDocumentModel = require("js/document/models/text").TextDocumentModel;
 ////////////////////////////////////////////////////////////////////////
 //	
diff --git a/js/document/models/text.js b/js/document/models/text.js
index c8fba911..ebf9993e 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -7,10 +7,10 @@ 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;
+	BaseDocumentModel = require("js/document/models/text").BaseDocumentModel;
 ////////////////////////////////////////////////////////////////////////
 //	
-exports.TextDocumentModel = Montage.create(Component, {
+exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
 	////////////////////////////////////////////////////////////////////
 	//
 	hasTemplate: {
-- 
cgit v1.2.3


From c62273126004f057de40ce91ecda5606643f4c92 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 20 Apr 2012 16:37:47 -0700
Subject: reverting old template to current working status. New template work.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/document/models/base.js | 4 ++++
 js/document/models/html.js | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'js/document/models')

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 96156e64..8925fc40 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -21,6 +21,10 @@ exports.BaseDocumentModel = Montage.create(Montage, {
 	file: {
         value: null
     },
+
+    _name: {
+        value: null
+    },
     ////////////////////////////////////////////////////////////////////
 	//
 	njdata: {
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 5882d389..ff57454b 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -7,10 +7,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage = 			require("montage/core/core").Montage,
-	TextDocumentModel = require("js/document/models/text").TextDocumentModel;
+    BaseDocumentModel = require("js/document/models/base").BaseDocumentModel;
 ////////////////////////////////////////////////////////////////////////
 //	
-exports.HtmlDocumentModel = Montage.create(TextDocumentModel, {
+exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
 	////////////////////////////////////////////////////////////////////
 	//
 	hasTemplate: {
-- 
cgit v1.2.3