diff options
author | Eric Guzman | 2012-04-23 22:39:22 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-23 22:39:22 -0700 |
commit | 1538514aad2d249a11152789cd06f5e00386d7d7 (patch) | |
tree | c61fcc980d29d762a1ff2a3c5717b62991ed0a43 /js/document/views | |
parent | 64b9c65ddee456a717bae0872a54e0593f1cd482 (diff) | |
parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
download | ninja-1538514aad2d249a11152789cd06f5e00386d7d7.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/document/views')
-rwxr-xr-x | js/document/views/base.js (renamed from js/document/views/base-view.js) | 14 | ||||
-rwxr-xr-x | js/document/views/code.js | 25 | ||||
-rwxr-xr-x | js/document/views/design.js | 25 |
3 files changed, 53 insertions, 11 deletions
diff --git a/js/document/views/base-view.js b/js/document/views/base.js index be441da2..50c0a78d 100755 --- a/js/document/views/base-view.js +++ b/js/document/views/base.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 | Component = require("montage/ui/component").Component; |
11 | //////////////////////////////////////////////////////////////////////// | 11 | //////////////////////////////////////////////////////////////////////// |
12 | // | 12 | // |
13 | exports.ENTERNAME = Montage.create(Montage, { | 13 | exports.BaseDocumentView = Montage.create(Component, { |
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/views/code.js b/js/document/views/code.js new file mode 100755 index 00000000..cd3e02d4 --- /dev/null +++ b/js/document/views/code.js | |||
@@ -0,0 +1,25 @@ | |||
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 | Component = require("montage/ui/component").Component, | ||
11 | BaseDocumentView = require("js/document/views/base").BaseDocumentView; | ||
12 | //////////////////////////////////////////////////////////////////////// | ||
13 | // | ||
14 | exports.CodeDocumentView = Montage.create(BaseDocumentView, { | ||
15 | //////////////////////////////////////////////////////////////////// | ||
16 | // | ||
17 | hasTemplate: { | ||
18 | enumerable: false, | ||
19 | value: false | ||
20 | } | ||
21 | //////////////////////////////////////////////////////////////////// | ||
22 | //////////////////////////////////////////////////////////////////// | ||
23 | }); | ||
24 | //////////////////////////////////////////////////////////////////////// | ||
25 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file | ||
diff --git a/js/document/views/design.js b/js/document/views/design.js new file mode 100755 index 00000000..84871257 --- /dev/null +++ b/js/document/views/design.js | |||
@@ -0,0 +1,25 @@ | |||
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 | Component = require("montage/ui/component").Component, | ||
11 | CodeDocumentView = require("js/document/views/code").CodeDocumentView; | ||
12 | //////////////////////////////////////////////////////////////////////// | ||
13 | // | ||
14 | exports.DesignDocumentView = Montage.create(CodeDocumentView, { | ||
15 | //////////////////////////////////////////////////////////////////// | ||
16 | // | ||
17 | hasTemplate: { | ||
18 | enumerable: false, | ||
19 | value: false | ||
20 | } | ||
21 | //////////////////////////////////////////////////////////////////// | ||
22 | //////////////////////////////////////////////////////////////////// | ||
23 | }); | ||
24 | //////////////////////////////////////////////////////////////////////// | ||
25 | //////////////////////////////////////////////////////////////////////// \ No newline at end of file | ||