diff options
author | Ananya Sen | 2012-02-18 18:49:45 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-18 18:49:45 -0800 |
commit | 8fdce771bfcf662cf1acc16d45e4361ffd06c53e (patch) | |
tree | 4ac283e0e7724e5ede21c1a1e97d121033578c72 /js/stage/stage.reel/stage.js | |
parent | c2a5918480adae0124e1dc2531c019562f1e3e60 (diff) | |
parent | e23708721a71ca4c71365f5f8e8ac7d6113926db (diff) | |
download | ninja-8fdce771bfcf662cf1acc16d45e4361ffd06c53e.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/stage/stage.reel/stage.js')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 11 |
1 files changed, 11 insertions, 0 deletions
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, { | |||
201 | this._drawingCanvas.addEventListener("mousedown", this, false); | 201 | this._drawingCanvas.addEventListener("mousedown", this, false); |
202 | this._drawingCanvas.addEventListener("mouseup", this, false); | 202 | this._drawingCanvas.addEventListener("mouseup", this, false); |
203 | this._drawingCanvas.addEventListener("dblclick", this, false); | 203 | this._drawingCanvas.addEventListener("dblclick", this, false); |
204 | this._drawingCanvas.addEventListener("mousewheel", this, false); | ||
204 | 205 | ||
205 | // Hide the canvas | 206 | // Hide the canvas |
206 | this.hideCanvas(true); | 207 | this.hideCanvas(true); |
@@ -360,6 +361,16 @@ exports.Stage = Montage.create(Component, { | |||
360 | } | 361 | } |
361 | }, | 362 | }, |
362 | 363 | ||
364 | handleMousewheel: { | ||
365 | value: function(event) { | ||
366 | if(event._event.wheelDelta > 0) { | ||
367 | this._iframeContainer.scrollTop -= 20; | ||
368 | } else { | ||
369 | this._iframeContainer.scrollTop += 20; | ||
370 | } | ||
371 | } | ||
372 | }, | ||
373 | |||
363 | /** | 374 | /** |
364 | * Enables the MouseMove on Canvas | 375 | * Enables the MouseMove on Canvas |
365 | */ | 376 | */ |