diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/ui/controller/array-controller.js | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/controller/array-controller.js')
| -rw-r--r--[-rwxr-xr-x] | node_modules/montage/ui/controller/array-controller.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/node_modules/montage/ui/controller/array-controller.js b/node_modules/montage/ui/controller/array-controller.js index f355efc1..215e7b25 100755..100644 --- a/node_modules/montage/ui/controller/array-controller.js +++ b/node_modules/montage/ui/controller/array-controller.js | |||
| @@ -42,7 +42,6 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController, | |||
| 42 | if (this._content === value) { | 42 | if (this._content === value) { |
| 43 | return; | 43 | return; |
| 44 | } | 44 | } |
| 45 | |||
| 46 | this._content = value; | 45 | this._content = value; |
| 47 | 46 | ||
| 48 | //TODO for right now assume that any content change invalidates the selection completely; we'll need to address this of course | 47 | //TODO for right now assume that any content change invalidates the selection completely; we'll need to address this of course |