diff options
| author | Kruti Shah | 2012-06-20 15:12:48 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-20 15:12:48 -0700 |
| commit | 1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch) | |
| tree | 26ff4c6c5a94accfd5801f124244d3eef152a5c7 /node_modules/montage/ui/composer/translate-composer.js | |
| parent | 1ce4bd7033a413c7697888e5712f278219d6d095 (diff) | |
| parent | 782b66c783df4a9c36fa240cc77900e69b9130cf (diff) | |
| download | ninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
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) { |