3 files changed, 28 insertions, 6 deletions
diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css
index 54b9761b..54b9761b 100644..100755
--- a/js/stage/stage.reel/stage.css
+++ b/js/stage/stage.reel/stage.css
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 623c54b8..9ed0f636 100644..100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -11,6 +11,14 @@
    <script type="text/montage-serialization">
        {
+            "stageView" : {
+                "module": "js/stage/stage-view.reel",
+                "name": "StageView",
+                "properties": {
+                    "element": {"#": "stageView"}
+                }
+            },
            "StageDeps1": {
                "module": "js/stage/stage-deps",
                "name": "StageDeps",
@@ -49,12 +57,12 @@
                "properties": {
                    "element":          {"#": "stageAndScenesContainer"},
                    "_iframeContainer":  {"#": "iframeContainer"},
-                    "codeViewContainer":  {"#": "codeViewContainer"},
                    "_layoutCanvas":  {"#": "layoutCanvas"},
                    "_canvas":  {"#": "stageCanvas"},
                    "_drawingCanvas":  {"#": "drawingCanvas"},
                    "stageDeps": {"@": "StageDeps1"},
                    "layout":   {"@": "layout1"},
+                                        "stageView": {"@": "stageView"},
                    "textTool": {"@": "textTool"}
                },
                "bindings": {
@@ -72,9 +80,9 @@
 <body>
    <section id="stageAndScenesContainer" class="stageAndScenesContainer">
+        <section id="stageView"></section>
        <section id="iframeContainer"></section>
        <section id="textToolObject">asdasd asd asd asd asd asd </section>
-        <section id="codeViewContainer"></section>
        <canvas id="layoutCanvas"></canvas>
        <canvas id="stageCanvas"></canvas>
        <canvas id="drawingCanvas"></canvas>
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 6d9a7355..852f480d 100644..100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -117,9 +117,6 @@ exports.Stage = Montage.create(Component, {
    _userContentLeft:       { value: 0 },
    _userContentTop:        { value: 0 },
    _userContentBorder:     { value: 0 },
-    savedLeftScroll:        { value: null },
-    savedTopScroll:         { value: null },
    documentRoot: {
        get: function () { return this._documentRoot; },
@@ -248,6 +245,8 @@ exports.Stage = Montage.create(Component, {
            this._scrollLeft = this._iframeContainer.scrollLeft;
            this._scrollTop = this._iframeContainer.scrollTop;
+            this.application.ninja.currentDocument.savedLeftScroll = this._iframeContainer.scrollLeft;
+            this.application.ninja.currentDocument.savedTopScroll = this._iframeContainer.scrollTop;
            this.userContentBorder = parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border"));
@@ -883,5 +882,20 @@ exports.Stage = Montage.create(Component, {
            this.stageDeps.snapManager.updateWorkingPlaneFromView();
        }
-    }
+    },
+    saveScroll:{
+       value: function(){
+           this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft;
+           this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop;
+       }
+   },
+   restoreScroll:{
+       value: function(){
+           this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;
+           this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;
+           this._iframeContainer.scrollTop = this.application.ninja.documentController.activeDocument.savedTopScroll;
+           this._scrollTop = this.application.ninja.documentController.activeDocument.savedTopScroll;
+       }
+   }
 });
 \ No newline at end of file