aboutsummaryrefslogtreecommitdiff
path: root/js/document/models
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-12 09:47:52 -0700
committerJose Antonio Marquez2012-06-12 09:47:52 -0700
commit5a46f92f3127f7cc7870f125e8da2b44c2891fd0 (patch)
tree5604e15409ade61bf8b68bf0a5a2401edff1a0ee /js/document/models
parent19c77d87df72a85345e527d790878fc65eca189a (diff)
parent6854a72504f57903bd5de003e377f2aefb02d0da (diff)
downloadninja-5a46f92f3127f7cc7870f125e8da2b44c2891fd0.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into TempPromptUI
Diffstat (limited to 'js/document/models')
-rwxr-xr-xjs/document/models/base.js3
-rwxr-xr-xjs/document/models/html.js5
2 files changed, 3 insertions, 5 deletions
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 0fd609c3..8ff52132 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -66,6 +66,9 @@ exports.BaseDocumentModel = Montage.create(Component, {
66 _selection: { 66 _selection: {
67 value: [] 67 value: []
68 }, 68 },
69 domContainer: {
70 value: null
71 },
69 //////////////////////////////////////////////////////////////////// 72 ////////////////////////////////////////////////////////////////////
70 // 73 //
71 selection: { 74 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: {