diff options
author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /js/document/models/base.js | |
parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/document/models/base.js')
-rwxr-xr-x | js/document/models/base.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/js/document/models/base.js b/js/document/models/base.js index 8ff52132..1daec5c0 100755 --- a/js/document/models/base.js +++ b/js/document/models/base.js | |||
@@ -95,6 +95,19 @@ exports.BaseDocumentModel = Montage.create(Component, { | |||
95 | libs: { | 95 | libs: { |
96 | value: null | 96 | value: null |
97 | }, | 97 | }, |
98 | |||
99 | _mObjects: { | ||
100 | value: [] | ||
101 | }, | ||
102 | |||
103 | mObjects: { | ||
104 | get: function() { | ||
105 | return this._mObjects; | ||
106 | }, | ||
107 | set: function(value) { | ||
108 | this._mObjects = value; | ||
109 | } | ||
110 | }, | ||
98 | //////////////////////////////////////////////////////////////////// | 111 | //////////////////////////////////////////////////////////////////// |
99 | // | 112 | // |
100 | switchViewTo: { | 113 | switchViewTo: { |