aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/zoom-properties.reel/zoom-properties.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-13 14:00:31 -0700
committerPushkar Joshi2012-06-13 14:00:31 -0700
commit596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch)
tree480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/tools-properties/zoom-properties.reel/zoom-properties.js
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/tools-properties/zoom-properties.reel/zoom-properties.js')
-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: {