Merge pull request #55 from mencio/nested-selection

Re-adding stage mouse wheel scrolling

2 files changed, 12 insertions, 1 deletions

diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 9ed0f636..812e3d55 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -82,7 +82,7 @@
     <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="textToolObject"></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 59eb9317..37b1df35 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -201,6 +201,7 @@ exports.Stage = Montage.create(Component, {
             this._drawingCanvas.addEventListener("mousedown", this, false);
             this._drawingCanvas.addEventListener("mouseup", this, false);
             this._drawingCanvas.addEventListener("dblclick", this, false);
+            this._drawingCanvas.addEventListener("mousewheel", this, false);
 
             // Hide the canvas
             this.hideCanvas(true);
@@ -360,6 +361,16 @@ exports.Stage = Montage.create(Component, {
         }
     },
 
+    handleMousewheel: {
+        value: function(event) {
+            if(event._event.wheelDelta > 0) {
+                this._iframeContainer.scrollTop -= 20;
+            } else {
+                this._iframeContainer.scrollTop += 20;
+            }
+        }
+    },
+
     /**
      * Enables the MouseMove on Canvas
      */