aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/document-bar.reel/document-bar.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/layout/document-bar.reel/document-bar.js
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/layout/document-bar.reel/document-bar.js')
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js7
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 },