aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/zoom-properties.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-06-19 11:00:49 -0700
committerAnanya Sen2012-06-19 11:00:49 -0700
commitf1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch)
tree31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/components/tools-properties/zoom-properties.reel
parent9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/components/tools-properties/zoom-properties.reel')
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/js/components/tools-properties/zoom-properties.reel/zoom-properties.js b/js/components/tools-properties/zoom-properties.reel/zoom-properties.js
index b8d6eb6b..020e238c 100755
--- a/js/components/tools-properties/zoom-properties.reel/zoom-properties.js
+++ b/js/components/tools-properties/zoom-properties.reel/zoom-properties.js
@@ -10,8 +10,16 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
10 10
11exports.ZoomProperties = Montage.create(ToolProperties, { 11exports.ZoomProperties = Montage.create(ToolProperties, {
12 12
13 zoomIn: { value: null }, 13 zoomIn: {
14 zoomOut: { value: null }, 14 value: null,
15 serializable: true
16 },
17
18 zoomOut: {
19 value: null,
20 serializable: true
21 },
22
15 zoomInCursor:{value:"url('images/cursors/zoom.png'), default"}, 23 zoomInCursor:{value:"url('images/cursors/zoom.png'), default"},
16 zoomOutCursor:{value:"url('images/cursors/zoom_minus.png'), default"}, 24 zoomOutCursor:{value:"url('images/cursors/zoom_minus.png'), default"},
17 _subPrepare: { 25 _subPrepare: {