diff options
author | Ananya Sen | 2012-06-12 12:09:45 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-12 12:09:45 -0700 |
commit | 3389cd085555e188800f337525c0fc8884084c04 (patch) | |
tree | 3899c1c4b8bce4ec3c05fb4b8f6f3824cd82188d /js/document/models | |
parent | 1e7f318e7bbc0c3cd95217fc369ccc30963a5381 (diff) | |
parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
download | ninja-3389cd085555e188800f337525c0fc8884084c04.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/document/models')
-rwxr-xr-x | js/document/models/base.js | 3 | ||||
-rwxr-xr-x | js/document/models/html.js | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/js/document/models/base.js b/js/document/models/base.js index 5fa06259..1307e0c0 100755 --- a/js/document/models/base.js +++ b/js/document/models/base.js | |||
@@ -65,6 +65,9 @@ exports.BaseDocumentModel = Montage.create(Component, { | |||
65 | _selection: { | 65 | _selection: { |
66 | value: [] | 66 | value: [] |
67 | }, | 67 | }, |
68 | domContainer: { | ||
69 | value: null | ||
70 | }, | ||
68 | //////////////////////////////////////////////////////////////////// | 71 | //////////////////////////////////////////////////////////////////// |
69 | // | 72 | // |
70 | selection: { | 73 | selection: { |
diff --git a/js/document/models/html.js b/js/document/models/html.js index 7064c6e3..4a232ee1 100755 --- a/js/document/models/html.js +++ b/js/document/models/html.js | |||
@@ -27,11 +27,6 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, { | |||
27 | this.libs = {montage: false, canvas: false, montageId: null, canvasId: null}; | 27 | this.libs = {montage: false, canvas: false, montageId: null, canvasId: null}; |
28 | } | 28 | } |
29 | }, | 29 | }, |
30 | //////////////////////////////////////////////////////////////////// | ||
31 | // | ||
32 | selectionContainer: { | ||
33 | value: [] | ||
34 | }, | ||
35 | //////////////////////////////////////////////////////////////////// | 30 | //////////////////////////////////////////////////////////////////// |
36 | // | 31 | // |
37 | draw3DGrid: { | 32 | draw3DGrid: { |