aboutsummaryrefslogtreecommitdiff
path: root/js/document/models
diff options
context:
space:
mode:
authorJonathan Duran2012-04-24 08:49:52 -0700
committerJonathan Duran2012-04-24 08:49:52 -0700
commit02414d5b25a53f7939d77c83ed550aad41e1f382 (patch)
treed918b1a78a44bddb55676d767069016db9fcda18 /js/document/models
parent47488a6ff1b7fc32e2485b3dd82afe207b936b35 (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-02414d5b25a53f7939d77c83ed550aad41e1f382.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/document/models')
-rwxr-xr-xjs/document/models/base.js42
-rwxr-xr-xjs/document/models/html.js (renamed from js/document/models/base-model.js)16
-rwxr-xr-xjs/document/models/text.js24
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 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7////////////////////////////////////////////////////////////////////////
8//
9var Montage = require("montage/core/core").Montage;
10////////////////////////////////////////////////////////////////////////
11//
12exports.BaseDocumentModel = Montage.create(Montage, {
13 ////////////////////////////////////////////////////////////////////
14 //
15 hasTemplate: {
16 enumerable: false,
17 value: false
18 },
19 ////////////////////////////////////////////////////////////////////
20 //
21 file: {
22 value: null
23 },
24
25 _name: {
26 value: null
27 },
28 ////////////////////////////////////////////////////////////////////
29 //
30 njdata: {
31 value: null
32 },
33 ////////////////////////////////////////////////////////////////////
34 //
35 views: {
36 value: null
37 }
38 ////////////////////////////////////////////////////////////////////
39 ////////////////////////////////////////////////////////////////////
40});
41////////////////////////////////////////////////////////////////////////
42//////////////////////////////////////////////////////////////////////// \ 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
6 6
7//////////////////////////////////////////////////////////////////////// 7////////////////////////////////////////////////////////////////////////
8// 8//
9var Montage = require("montage/core/core").Montage, 9var Montage = require("montage/core/core").Montage,
10 Component = require("montage/ui/component").Component; 10 BaseDocumentModel = require("js/document/models/base").BaseDocumentModel;
11//////////////////////////////////////////////////////////////////////// 11////////////////////////////////////////////////////////////////////////
12// 12//
13exports.ENTERNAME = Montage.create(Montage, { 13exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
14 //////////////////////////////////////////////////////////////////// 14 ////////////////////////////////////////////////////////////////////
15 // 15 //
16 hasTemplate: { 16 hasTemplate: {
17 enumerable: false, 17 enumerable: false,
18 value: false 18 value: false
19 }, 19 }
20 ////////////////////////////////////////////////////////////////////
21 //
22 deserializedFromTemplate: {
23 enumerable: false,
24 value: function () {
25 //
26 }
27 }
28 //////////////////////////////////////////////////////////////////// 20 ////////////////////////////////////////////////////////////////////
29 //////////////////////////////////////////////////////////////////// 21 ////////////////////////////////////////////////////////////////////
30}); 22});
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 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7////////////////////////////////////////////////////////////////////////
8//
9var Montage = require("montage/core/core").Montage,
10 BaseDocumentModel = require("js/document/models/text").BaseDocumentModel;
11////////////////////////////////////////////////////////////////////////
12//
13exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
14 ////////////////////////////////////////////////////////////////////
15 //
16 hasTemplate: {
17 enumerable: false,
18 value: false
19 }
20 ////////////////////////////////////////////////////////////////////
21 ////////////////////////////////////////////////////////////////////
22});
23////////////////////////////////////////////////////////////////////////
24//////////////////////////////////////////////////////////////////////// \ No newline at end of file