diff options
| author | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
| commit | 4eff115126ab946c5852d787fd596e07b156c9a5 (patch) | |
| tree | f7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /node_modules/montage/ui/composer/translate-composer.js | |
| parent | 7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff) | |
| parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
| download | ninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'node_modules/montage/ui/composer/translate-composer.js')
| -rw-r--r-- | node_modules/montage/ui/composer/translate-composer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/composer/translate-composer.js b/node_modules/montage/ui/composer/translate-composer.js index 78459b9d..f82ca393 100644 --- a/node_modules/montage/ui/composer/translate-composer.js +++ b/node_modules/montage/ui/composer/translate-composer.js | |||
| @@ -622,7 +622,7 @@ var TranslateComposer = exports.TranslateComposer = Montage.create(Composer,/** | |||
| 622 | captureTouchend: { | 622 | captureTouchend: { |
| 623 | value: function(event) { | 623 | value: function(event) { |
| 624 | var i = 0, len = event.changedTouches.length; | 624 | var i = 0, len = event.changedTouches.length; |
| 625 | while (i < len && !this.eventManager.isPointerClaimedByComponent(event.changedTouches[i].identifier, this)) { | 625 | while (i < len && event.changedTouches[i].identifier !== this._observedPointer) { |
| 626 | i++; | 626 | i++; |
| 627 | } | 627 | } |
| 628 | if (i < len) { | 628 | if (i < len) { |