diff options
author | Valerio Virgillito | 2012-06-08 16:59:59 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-08 16:59:59 -0700 |
commit | 806974142d44afdd23534bf2d18eff0a8e701e0c (patch) | |
tree | 811acab38c063ca4fb594bcab0a6dc5e143f29a2 /js/document | |
parent | d14249dd2d76e9eb8d14733c10393d36bd2ea8ee (diff) | |
download | ninja-806974142d44afdd23534bf2d18eff0a8e701e0c.tar.gz |
rewrite: currentSelectedContainer -> domContainer
Fixed the currentSelectedContainer by removing bindings and using property change on the current document
added the red outline back.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/document-html.js | 6 | ||||
-rwxr-xr-x | js/document/models/base.js | 3 | ||||
-rwxr-xr-x | js/document/models/html.js | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index 04565753..15f88d09 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -107,6 +107,12 @@ exports.HtmlDocument = Montage.create(Component, { | |||
107 | }, | 107 | }, |
108 | handleViewReady: { | 108 | handleViewReady: { |
109 | value: function() { | 109 | value: function() { |
110 | // TODO: Find a better way to initialize this property | ||
111 | // Assign the domContainer to be the document root on open | ||
112 | if(typeof this.model.domContainer !== "undefined") { | ||
113 | this.model.domContainer = this.model.documentRoot; | ||
114 | } | ||
115 | |||
110 | //Making callback after view is loaded | 116 | //Making callback after view is loaded |
111 | this.loaded.callback.call(this.loaded.context, this); | 117 | this.loaded.callback.call(this.loaded.context, this); |
112 | } | 118 | } |
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: { |