diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/components/layout/document-bar.reel/document-bar.js | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/layout/document-bar.reel/document-bar.js')
-rwxr-xr-x | js/components/layout/document-bar.reel/document-bar.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js index 1cb0bd90..74ba11c2 100755 --- a/js/components/layout/document-bar.reel/document-bar.js +++ b/js/components/layout/document-bar.reel/document-bar.js | |||
@@ -61,7 +61,8 @@ exports.DocumentBar = Montage.create(Component, { | |||
61 | }, | 61 | }, |
62 | 62 | ||
63 | zoomControl: { | 63 | zoomControl: { |
64 | value: null | 64 | value: null, |
65 | serializable: true | ||
65 | }, | 66 | }, |
66 | 67 | ||
67 | _type: { | 68 | _type: { |
@@ -148,8 +149,8 @@ exports.DocumentBar = Montage.create(Component, { | |||
148 | 149 | ||
149 | prepareForDraw: { | 150 | prepareForDraw: { |
150 | value: function() { | 151 | value: function() { |
151 | this.designView.addEventListener("click", this, false); | 152 | // this.designView.addEventListener("click", this, false); |
152 | this.codeView.addEventListener("click", this, false); | 153 | // this.codeView.addEventListener("click", this, false); |
153 | 154 | ||
154 | } | 155 | } |
155 | }, | 156 | }, |