restore polymer change

This commit is contained in:
Luke Pulverenti 2015-08-08 12:18:34 -04:00
parent 891f7bd872
commit 51f9b54953
4 changed files with 6 additions and 5 deletions

View File

@ -42,7 +42,7 @@
"tag": "v1.0.3", "tag": "v1.0.3",
"commit": "90b54de14264c19693601b9fc16af6b68a9d48e4" "commit": "90b54de14264c19693601b9fc16af6b68a9d48e4"
}, },
"_source": "git://github.com/polymerelements/paper-behaviors.git", "_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-behaviors" "_originalSource": "PolymerElements/paper-behaviors"
} }

View File

@ -637,7 +637,8 @@ prevent = dy > dx;
prevent = dx > dy; prevent = dx > dy;
} }
if (prevent) { if (prevent) {
ev.preventDefault(); // This prevents horizontal scrolling in safari
//ev.preventDefault();
} else { } else {
Gestures.prevent('track'); Gestures.prevent('track');
} }

View File

@ -1699,7 +1699,6 @@ var AppInfo = {};
AppInfo.enableMovieTrailersTab = true; AppInfo.enableMovieTrailersTab = true;
} }
AppInfo.enableAppLayouts = true;
if (isCordova) { if (isCordova) {
AppInfo.enableAppLayouts = true; AppInfo.enableAppLayouts = true;
AppInfo.hasKnownExternalPlayerSupport = true; AppInfo.hasKnownExternalPlayerSupport = true;

View File

@ -2704,7 +2704,8 @@ prevent = dy > dx;
prevent = dx > dy; prevent = dx > dy;
} }
if (prevent) { if (prevent) {
ev.preventDefault(); // This prevents horizontal scrolling in safari
//ev.preventDefault();
} else { } else {
Gestures.prevent('track'); Gestures.prevent('track');
} }