aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/zoom-properties.reel/zoom-properties.js
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/components/tools-properties/zoom-properties.reel/zoom-properties.js
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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: {