aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/composer/translate-composer.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:16:30 -0700
committerArmen Kesablyan2012-06-20 15:16:30 -0700
commit65b989c7759af923fb9456d34bff89f91831ea1e (patch)
treee408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui/composer/translate-composer.js
parent38f571d1fdf02d36c3816637af7b2ca2493809da (diff)
parentfc818d31de267d2b77fda3b3029ad38d48698be8 (diff)
downloadninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/composer/translate-composer.js')
-rw-r--r--node_modules/montage/ui/composer/translate-composer.js2
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) {