diff options
| author | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-07 11:18:11 -0700 |
| commit | e377a8dc0b0e34905782ed867acb5fe725ae0131 (patch) | |
| tree | 6931311aabd7a4e366df195a168d437f1d0d8465 /js/stage | |
| parent | 8be6e94b57f4bd6e28754a6113b4d6a401365e13 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-e377a8dc0b0e34905782ed867acb5fe725ae0131.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/stage')
| -rwxr-xr-x | js/stage/stage.reel/stage.html | 14 | ||||
| -rwxr-xr-x | js/stage/stage.reel/stage.js | 11 |
2 files changed, 16 insertions, 9 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 12a331c3..30c3d231 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
| @@ -79,13 +79,13 @@ | |||
| 79 | </head> | 79 | </head> |
| 80 | <body> | 80 | <body> |
| 81 | 81 | ||
| 82 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> | 82 | <section data-montage-id="stageAndScenesContainer" class="stageAndScenesContainer"> |
| 83 | <section id="stageView"></section> | 83 | <section data-montage-id="stageView"></section> |
| 84 | <section id="iframeContainer"></section> | 84 | <section data-montage-id="iframeContainer" id="iframeContainer"></section> |
| 85 | <section id="textToolObject"></section> | 85 | <section data-montage-id="textToolObject"></section> |
| 86 | <canvas id="layoutCanvas"></canvas> | 86 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> |
| 87 | <canvas id="stageCanvas"></canvas> | 87 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> |
| 88 | <canvas id="drawingCanvas"></canvas> | 88 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> |
| 89 | </section> | 89 | </section> |
| 90 | 90 | ||
| 91 | </body> | 91 | </body> |
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 515165bf..b181dc70 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
| @@ -855,6 +855,12 @@ exports.Stage = Montage.create(Component, { | |||
| 855 | } | 855 | } |
| 856 | }, | 856 | }, |
| 857 | 857 | ||
| 858 | setStageAsViewport: { | ||
| 859 | value: function() { | ||
| 860 | this.stageDeps.viewUtils.setViewportObj(this.application.ninja.currentDocument.documentRoot); | ||
| 861 | } | ||
| 862 | }, | ||
| 863 | |||
| 858 | setZoom: { | 864 | setZoom: { |
| 859 | value: function(value) { | 865 | value: function(value) { |
| 860 | if(!this._firstDraw) | 866 | if(!this._firstDraw) |
| @@ -958,8 +964,9 @@ exports.Stage = Montage.create(Component, { | |||
| 958 | this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft; | 964 | this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft; |
| 959 | this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop; | 965 | this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop; |
| 960 | } | 966 | } |
| 961 | }, | 967 | }, |
| 962 | restoreScroll:{ | 968 | |
| 969 | restoreScroll:{ | ||
| 963 | value: function(){ | 970 | value: function(){ |
| 964 | this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; | 971 | this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; |
| 965 | this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; | 972 | this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; |