diff options
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-x | js/stage/stage.reel/stage.html | 14 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.js | 15 |
2 files changed, 18 insertions, 11 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..171c4f36 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -264,7 +264,7 @@ exports.Stage = Montage.create(Component, { | |||
264 | this._userContentLeft = 0; | 264 | this._userContentLeft = 0; |
265 | this._userContentTop = 0; | 265 | this._userContentTop = 0; |
266 | 266 | ||
267 | this.application.ninja.currentDocument._window.addEventListener("scroll", this, false); | 267 | //this.application.ninja.currentDocument._window.addEventListener("scroll", this, false); |
268 | } | 268 | } |
269 | 269 | ||
270 | 270 | ||
@@ -543,7 +543,7 @@ exports.Stage = Montage.create(Component, { | |||
543 | var point, element; | 543 | var point, element; |
544 | 544 | ||
545 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); | 545 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); |
546 | element = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); | 546 | element = this.application.ninja.currentDocument.model.views.design.getElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); |
547 | 547 | ||
548 | // workaround Chrome 3d bug | 548 | // workaround Chrome 3d bug |
549 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(element) !== -1) { | 549 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(element) !== -1) { |
@@ -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; |