diff options
author | Armen Kesablyan | 2012-06-18 13:22:08 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-18 13:22:08 -0700 |
commit | f5e70ca6204f78c395458d39f14ddaf45308edf7 (patch) | |
tree | 0dc063f18941b421f29d9d65106aed078cdda279 /js/stage/stage.reel | |
parent | 2fcb74d0b204ce2999b70fa9a46fc58a558344d8 (diff) | |
download | ninja-f5e70ca6204f78c395458d39f14ddaf45308edf7.tar.gz |
Binding View - validate over huds
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-x | js/stage/stage.reel/stage.html | 2 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.js | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 397af0b6..215f8f2e 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
@@ -84,7 +84,7 @@ | |||
84 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> | 84 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> |
85 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> | 85 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> |
86 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> | 86 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> |
87 | <section data-montage-id="bindingView" class="bindingView"></section> | 87 | <section data-montage-id="bindingView"></section> |
88 | </section> | 88 | </section> |
89 | 89 | ||
90 | </body> | 90 | </body> |
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 30ee1e40..63339c57 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -21,6 +21,9 @@ exports.Stage = Montage.create(Component, { | |||
21 | _canvasSelectionPrefs: { value: { "thickness" : 1.0, "color" : "#46a1ff" } }, | 21 | _canvasSelectionPrefs: { value: { "thickness" : 1.0, "color" : "#46a1ff" } }, |
22 | _canvasDrawingPrefs: { value: { "thickness" : 1.0, "color" : "#000" } }, | 22 | _canvasDrawingPrefs: { value: { "thickness" : 1.0, "color" : "#000" } }, |
23 | drawingContextPreferences: { get: function() { return this._canvasDrawingPrefs; } }, | 23 | drawingContextPreferences: { get: function() { return this._canvasDrawingPrefs; } }, |
24 | bindingView: { | ||
25 | value: null | ||
26 | }, | ||
24 | 27 | ||
25 | _iframeContainer: { value: null }, | 28 | _iframeContainer: { value: null }, |
26 | 29 | ||
@@ -237,9 +240,8 @@ exports.Stage = Montage.create(Component, { | |||
237 | value: function() { | 240 | value: function() { |
238 | if(this.resizeCanvases) { | 241 | if(this.resizeCanvases) { |
239 | // TODO GET THE SCROLL SIZE FROM THE CSS -- 11 px | 242 | // TODO GET THE SCROLL SIZE FROM THE CSS -- 11 px |
240 | this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.element.offsetWidth - 11 ; | 243 | this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.bindingView.width = this.element.offsetWidth - 11; |
241 | this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.element.offsetHeight - 11;// - 26 - 26; | 244 | this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.bindingView.height = this.element.offsetHeight - 11;// - 26 - 26; |
242 | |||
243 | // Hack for now until a full component | 245 | // Hack for now until a full component |
244 | this.layout.draw(); | 246 | this.layout.draw(); |
245 | if(this.currentDocument && (this.currentDocument.currentView === "design")) { | 247 | if(this.currentDocument && (this.currentDocument.currentView === "design")) { |
@@ -314,8 +316,8 @@ exports.Stage = Montage.create(Component, { | |||
314 | } | 316 | } |
315 | 317 | ||
316 | // Recalculate the canvas sizes because of splitter resizing | 318 | // Recalculate the canvas sizes because of splitter resizing |
317 | this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.element.offsetWidth - 11 ; | 319 | this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.bindingView.width = this.element.offsetWidth - 11 ; |
318 | this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.element.offsetHeight - 11; | 320 | this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.bindingView.height = this.element.offsetHeight - 11; |
319 | 321 | ||
320 | designView.iframe.contentWindow.addEventListener("scroll", this, false); | 322 | designView.iframe.contentWindow.addEventListener("scroll", this, false); |
321 | 323 | ||