diff options
author | Jose Antonio Marquez Russo | 2012-02-24 15:44:57 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-02-24 15:44:57 -0800 |
commit | 97c0efb645b1e0488112c1b7bfd7fa4864eae3dc (patch) | |
tree | ae6c6587af2ab5ec34f86ac05d342ecf8ebfc0c7 /js/stage/stage.reel | |
parent | c916a2a5fec0c96bd1c6f56af82543da9b69c33c (diff) | |
parent | b056b4bef5982466d80d72e5cbb31e63087990e1 (diff) | |
download | ninja-97c0efb645b1e0488112c1b7bfd7fa4864eae3dc.tar.gz |
Merge pull request #19 from ananyasen/FileIO
FileIO branch pull request
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 8d664f25..9784f14d 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -37,6 +37,10 @@ exports.Stage = Montage.create(Component, { | |||
37 | get: function() { return this.stageDeps.snapManager; } | 37 | get: function() { return this.stageDeps.snapManager; } |
38 | }, | 38 | }, |
39 | 39 | ||
40 | drawUtils: { | ||
41 | get: function() { return this.stageDeps.drawUtils; } | ||
42 | }, | ||
43 | |||
40 | resizeCanvases: { | 44 | resizeCanvases: { |
41 | get: function() { | 45 | get: function() { |
42 | return this._resizeCanvases; | 46 | return this._resizeCanvases; |
@@ -144,12 +148,12 @@ exports.Stage = Montage.create(Component, { | |||
144 | 148 | ||
145 | userContentLeft: { | 149 | userContentLeft: { |
146 | get: function() { return this._userContentLeft; }, | 150 | get: function() { return this._userContentLeft; }, |
147 | set: function(value) { this._userContentLeft = value; } | 151 | set: function(value) { this._userContentLeft = value;} |
148 | }, | 152 | }, |
149 | 153 | ||
150 | userContentTop: { | 154 | userContentTop: { |
151 | get: function() { return this._userContentTop; }, | 155 | get: function() { return this._userContentTop; }, |
152 | set: function(value) { this._userContentTop = value; } | 156 | set: function(value) { this._userContentTop = value;} |
153 | }, | 157 | }, |
154 | 158 | ||
155 | userContentBorder: { | 159 | userContentBorder: { |
@@ -435,12 +439,11 @@ exports.Stage = Montage.create(Component, { | |||
435 | */ | 439 | */ |
436 | handleScroll: { | 440 | handleScroll: { |
437 | value: function() { | 441 | value: function() { |
438 | |||
439 | this._scrollLeft = this._iframeContainer.scrollLeft; | 442 | this._scrollLeft = this._iframeContainer.scrollLeft; |
440 | this._scrollTop = this._iframeContainer.scrollTop; | 443 | this._scrollTop = this._iframeContainer.scrollTop; |
441 | 444 | ||
442 | this._userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder; | 445 | this.userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder; |
443 | this._userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder; | 446 | this.userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder; |
444 | 447 | ||
445 | // Need to clear the snap cache and set up the drag plane | 448 | // Need to clear the snap cache and set up the drag plane |
446 | //snapManager.setupDragPlaneFromPlane( workingPlane ); | 449 | //snapManager.setupDragPlaneFromPlane( workingPlane ); |
@@ -448,7 +451,6 @@ exports.Stage = Montage.create(Component, { | |||
448 | 451 | ||
449 | this.needsDraw = true; | 452 | this.needsDraw = true; |
450 | this.layout.draw(); | 453 | this.layout.draw(); |
451 | |||
452 | //this._toolsList.action("DrawHandles"); | 454 | //this._toolsList.action("DrawHandles"); |
453 | 455 | ||
454 | } | 456 | } |