diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/components/layout/document-bar.reel/document-bar.js | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
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 | }, |