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 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100755 js/document/models/base.js

(limited to 'js/document/models/base.js')

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
-- 
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 ++++
 1 file changed, 4 insertions(+)

(limited to 'js/document/models/base.js')

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: {
-- 
cgit v1.2.3