aboutsummaryrefslogtreecommitdiff
path: root/js/document/mediators
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/mediators
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/mediators')
-rwxr-xr-xjs/document/mediators/io.js (renamed from js/document/mediators/base-mediator.js)14
-rwxr-xr-xjs/document/mediators/template.js24
2 files changed, 27 insertions, 11 deletions
diff --git a/js/document/mediators/base-mediator.js b/js/document/mediators/io.js
index be441da2..972a25e2 100755
--- a/js/document/mediators/base-mediator.js
+++ b/js/document/mediators/io.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 Component = require("montage/ui/component").Component;
11//////////////////////////////////////////////////////////////////////// 11////////////////////////////////////////////////////////////////////////
12// 12//
13exports.ENTERNAME = Montage.create(Montage, { 13exports.IoDocumentMediator = 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/mediators/template.js b/js/document/mediators/template.js
new file mode 100755
index 00000000..c5b45ba1
--- /dev/null
+++ b/js/document/mediators/template.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 Component = require("montage/ui/component").Component;
11////////////////////////////////////////////////////////////////////////
12//
13exports.TemplateDocumentMediator = Montage.create(Component, {
14 ////////////////////////////////////////////////////////////////////
15 //
16 hasTemplate: {
17 enumerable: false,
18 value: false
19 }
20 ////////////////////////////////////////////////////////////////////
21 ////////////////////////////////////////////////////////////////////
22});
23////////////////////////////////////////////////////////////////////////
24//////////////////////////////////////////////////////////////////////// \ No newline at end of file