From 51f9b54953ac245c92f8484d7924b3e2e52f1ee5 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 8 Aug 2015 12:18:34 -0400 Subject: [PATCH] restore polymer change --- dashboard-ui/bower_components/paper-behaviors/.bower.json | 4 ++-- dashboard-ui/bower_components/polymer/polymer.html | 3 ++- dashboard-ui/scripts/site.js | 1 - dashboard-ui/vulcanize-out.html | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index 321be71437..26486f6c6d 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -42,7 +42,7 @@ "tag": "v1.0.3", "commit": "90b54de14264c19693601b9fc16af6b68a9d48e4" }, - "_source": "git://github.com/polymerelements/paper-behaviors.git", + "_source": "git://github.com/PolymerElements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-behaviors" + "_originalSource": "PolymerElements/paper-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/polymer.html b/dashboard-ui/bower_components/polymer/polymer.html index dda28a196a..8d0568bea0 100644 --- a/dashboard-ui/bower_components/polymer/polymer.html +++ b/dashboard-ui/bower_components/polymer/polymer.html @@ -637,7 +637,8 @@ prevent = dy > dx; prevent = dx > dy; } if (prevent) { -ev.preventDefault(); +// This prevents horizontal scrolling in safari +//ev.preventDefault(); } else { Gestures.prevent('track'); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index c5c252a2f9..556a29f4c0 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1699,7 +1699,6 @@ var AppInfo = {}; AppInfo.enableMovieTrailersTab = true; } - AppInfo.enableAppLayouts = true; if (isCordova) { AppInfo.enableAppLayouts = true; AppInfo.hasKnownExternalPlayerSupport = true; diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html index ea173a91e7..f9819d9e6d 100644 --- a/dashboard-ui/vulcanize-out.html +++ b/dashboard-ui/vulcanize-out.html @@ -2704,7 +2704,8 @@ prevent = dy > dx; prevent = dx > dy; } if (prevent) { -ev.preventDefault(); +// This prevents horizontal scrolling in safari +//ev.preventDefault(); } else { Gestures.prevent('track'); }