diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/montage/ui/editable-text.js | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/editable-text.js')
-rwxr-xr-x | node_modules/montage/ui/editable-text.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node_modules/montage/ui/editable-text.js b/node_modules/montage/ui/editable-text.js index 28349e6b..09493b43 100755 --- a/node_modules/montage/ui/editable-text.js +++ b/node_modules/montage/ui/editable-text.js | |||
@@ -164,7 +164,8 @@ var EditableText = exports.EditableText = Montage.create(Component, /** @lends m | |||
164 | }, | 164 | }, |
165 | set: function(v) { | 165 | set: function(v) { |
166 | this._updateOnInput = v; | 166 | this._updateOnInput = v; |
167 | } | 167 | }, |
168 | serializable: true | ||
168 | }, | 169 | }, |
169 | 170 | ||
170 | 171 | ||