aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/stage/stage.reel
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-xjs/stage/stage.reel/stage.html14
-rwxr-xr-xjs/stage/stage.reel/stage.js11
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;