diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/controllers/selection-controller.js | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/controllers/selection-controller.js')
| -rwxr-xr-x | js/controllers/selection-controller.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index d0e239b6..ad3e2464 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
| @@ -261,11 +261,11 @@ exports.SelectionController = Montage.create(Component, { | |||
| 261 | } | 261 | } |
| 262 | }, | 262 | }, |
| 263 | 263 | ||
| 264 | isObjectSelected: { | 264 | isObjectSelected: { |
| 265 | value: function( elt ) { | 265 | value: function( elt ) { |
| 266 | return this.findSelectedElement(elt) > -1; | 266 | return this.findSelectedElement(elt) > -1; |
| 267 | } | 267 | } |
| 268 | }, | 268 | }, |
| 269 | 269 | ||
| 270 | findSelectedElement: { | 270 | findSelectedElement: { |
| 271 | value: function(item) { | 271 | value: function(item) { |