diff options
author | Jose Antonio Marquez | 2012-04-24 10:06:45 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-24 10:06:45 -0700 |
commit | 60c4f4e38cd0c516a0840bec416a688d0bad0d49 (patch) | |
tree | 3f383cb4b9e92dcb7f80eed62ff6cbc467062448 /js/document/models | |
parent | ae4cc0daf3ed23ed2191ead1b795a5b0cc54a3a7 (diff) | |
parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
download | ninja-60c4f4e38cd0c516a0840bec416a688d0bad0d49.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/document/models')
-rwxr-xr-x | js/document/models/base.js | 42 | ||||
-rwxr-xr-x | js/document/models/html.js (renamed from js/document/models/base-model.js) | 16 | ||||
-rwxr-xr-x | js/document/models/text.js | 24 |
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> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No 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 | // | ||
9 | var Montage = require("montage/core/core").Montage; | ||
10 | //////////////////////////////////////////////////////////////////////// | ||
11 | // | ||
12 | exports.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 | // |
9 | var Montage = require("montage/core/core").Montage, | 9 | var 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 | // |
13 | exports.ENTERNAME = Montage.create(Montage, { | 13 | exports.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> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No 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 | // | ||
9 | var Montage = require("montage/core/core").Montage, | ||
10 | BaseDocumentModel = require("js/document/models/text").BaseDocumentModel; | ||
11 | //////////////////////////////////////////////////////////////////////// | ||
12 | // | ||
13 | exports.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 | ||