Skip to content

Commit 6d0b1c3

Browse files
committed
[37225613] Disable swipe for firefox to work around flash bug
1 parent cefda1d commit 6d0b1c3

File tree

6 files changed

+16
-22
lines changed

6 files changed

+16
-22
lines changed

app/scripts/vendor/swipe.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ window.Swipe = function(element, options) {
1212
if (!element) return null;
1313

1414
var _this = this;
15+
var chromeish = navigator.userAgent.toLowerCase().indexOf('chrom') > -1;
16+
var firefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
1517

1618
// retreive options
1719
this.options = options || {};
@@ -20,8 +22,9 @@ window.Swipe = function(element, options) {
2022
this.callback = this.options.callback || function() {};
2123
this.delay = this.options.auto || 0;
2224

23-
// test for 3d (but force 3d for chrome as there's a bug in the 3d detection)
24-
this.has3d = navigator.userAgent.toLowerCase().indexOf('chrome') > -1 || Modernizr.csstransforms3d;
25+
// test for 3d (but force 3d for chrome as there's a bug in the 3d detection.
26+
// Also disable firefox as there is a flash vimeo bug).
27+
this.has3d = !firefox && (chromeish || Modernizr.csstransforms3d);
2528

2629
// reference dom elements
2730
this.container = element;

dist/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ <h3><a href="http://www.healthinsite.gov.au/topics/Treatments_for_Alzheimer_s_Di
123123
</div>
124124

125125
<script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-5004ac3e48e805cd"></script>
126-
<script src="scripts/890d5e44.amd-app.js"></script>
126+
<script src="scripts/9398cb17.amd-app.js"></script>
127127

128128
</body>
129129
</html>

dist/manifest.appcache

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CACHE MANIFEST
22

3-
# Time: Thu Oct 11 2012 12:19:31 GMT+1100 (EST)
3+
# Time: Thu Oct 11 2012 12:44:53 GMT+1100 (EST)
44
# This manifest was created by confess.js, http://github.com/jamesgpearce/confess
55
#
66
# Retrieved URL: http://localhost:3501/
@@ -24,8 +24,7 @@ CACHE:
2424
/img/loading.gif
2525
/img/mail-icon.png
2626
data/audio-pic1.jpg
27-
http://apis.google.com/js/plusone.js
28-
http://connect.facebook.net/en_US/all.js
27+
http://api.soundcloud.com/resolve?url=http://soundcloud.com/the-global-mail/extra-extra-stop-the-presses&format=json&consumer_key=htuiRd1JP11Ww0X72T1C3g&callback=jQuery182030752021982334554_1349919892301&_=1349919892345
2928
http://ct5.addthis.com/static/r07/core041.js
3029
http://ct5.addthis.com/static/r07/widget095.css
3130
http://fonts.googleapis.com/css?family=Open+Sans:400,600
@@ -48,27 +47,16 @@ http://localhost:3501/img/pause.png
4847
http://localhost:3501/img/play-hover.png
4948
http://localhost:3501/img/quote.png
5049
http://localhost:3501/img/vid.png
51-
http://platform.twitter.com/widgets.js
5250
http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-5004ac3e48e805cd
53-
http://static.ak.fbcdn.net/rsrc.php/v2/yA/x/IE9JII6Z1Ys.png
54-
http://static.ak.fbcdn.net/rsrc.php/v2/yD/x/Cou7n-nqK52.gif
55-
http://static.ak.fbcdn.net/rsrc.php/v2/yH/x/eIpbnVKI9lR.png
56-
http://static.ak.fbcdn.net/rsrc.php/v2/yJ/x/jKEcVPZFk-2.gif
57-
http://static.ak.fbcdn.net/rsrc.php/v2/yL/x/i_oIVTKMYsL.png
58-
http://static.ak.fbcdn.net/rsrc.php/v2/yP/x/bSOHtKbCGYI.png
59-
http://static.ak.fbcdn.net/rsrc.php/v2/yR/x/8YeTNIlTZjm.png
60-
http://static.ak.fbcdn.net/rsrc.php/v2/yc/x/3rhSv5V8j3o.gif
61-
http://static.ak.fbcdn.net/rsrc.php/v2/yl/x/FGFbc80dUKj.png
6251
http://use.typekit.net/c/e2ca56/ff-meta-serif-web-pro:n5:n7:i7,open-sans:n7:i4:n3:n4:n6.VbN:F:2,VbQ:F:2,VbR:F:2,Vv8:F:2,VvD:F:2,VvF:F:2,VvH:F:2,VvJ:F:2/d?3bb2a6e53c9684ffdc9a98f01d5b2a62412f52920b8b49ef73ebac739adfb6cb990d8510a28914424014872909a76163fc46a590ae81a28b7e75433dc4a4ffc410e3bf2f3766eb35b3e7a935db3be67d8cff5924b3c378b20e369ebc5b2b5edd0a1f1a0a5e7261e3df1ea807b17347ea34f95839e91aacd919061719bdb8f4c3759c497f74e26f552a8e6eb533815ff6b18d96fa3682f7d1761da7104d7c7c7b3d5ed2a8e3186554599bd560b1cc18306d72549fdc44a13158301724e5c9cc9348ffeaa041f8d74d608056b4f14205b6b113a6e8d7df9200134baa3337ea6f87530a32277c5740c957d894235c4e8a9f3c00e7be1e280db23d3711356f1c1e414de4cf655c23781612229c
6352
http://use.typekit.net/pyz3jsr.js
6453
http://w1.sndcdn.com/VScEzkMDoecm_m.png
6554
http://w1.sndcdn.com/y3DctOJOzJQV_m.png
6655
http://www.google-analytics.com/ga.js
67-
https://apis.google.com/_/apps-static/_/js/gapi/plusone/rt=j/ver=7WBtKlIVB1A.en_GB./sv=1/am=!8JP2wekq86iInuKCmg/d=1/rs=AItRSTMpA0-ns1-Vd45i7KlYpX68XXIfTQ/cb=gapi.loaded_0
6856
img/intro_1.jpg
6957
img/intro_2.jpg
7058
img/intro_3.jpg
71-
scripts/890d5e44.amd-app.js
59+
scripts/9398cb17.amd-app.js
7260
styles/3c8b0de5.app.css
7361
styles/57a545dc.normalize.css
7462

dist/scripts/890d5e44.amd-app.js dist/scripts/9398cb17.amd-app.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/scripts/vendor/2cb83a9a.swipe.js dist/scripts/vendor/aff1fc27.swipe.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ window.Swipe = function(element, options) {
1212
if (!element) return null;
1313

1414
var _this = this;
15+
var chromeish = navigator.userAgent.toLowerCase().indexOf('chrom') > -1;
16+
var firefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
1517

1618
// retreive options
1719
this.options = options || {};
@@ -20,8 +22,9 @@ window.Swipe = function(element, options) {
2022
this.callback = this.options.callback || function() {};
2123
this.delay = this.options.auto || 0;
2224

23-
// test for 3d (but force 3d for chrome as there's a bug in the 3d detection)
24-
this.has3d = navigator.userAgent.toLowerCase().indexOf('chrome') > -1 || Modernizr.csstransforms3d;
25+
// test for 3d (but force 3d for chrome as there's a bug in the 3d detection.
26+
// Also disable firefox as there is a flash vimeo bug).
27+
this.has3d = !firefox && (chromeish || Modernizr.csstransforms3d);
2528

2629
// reference dom elements
2730
this.container = element;

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "B.J. Rossiter <[email protected]>",
3-
"version": "0.1.8-30",
3+
"version": "0.1.8-31",
44
"scripts": {
55
"start": "node bin/server.js"
66
},

0 commit comments

Comments
 (0)