Skip to content

Commit

Permalink
allow loading from http and https
Browse files Browse the repository at this point in the history
  • Loading branch information
jtangelder committed May 7, 2014
1 parent 78233af commit 0f8d5f0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tests/manual/events.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Hammer.js</title>
<link href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/css/bootstrap-combined.min.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/css/bootstrap-combined.min.css" rel="stylesheet">
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<style>
Expand Down Expand Up @@ -128,7 +128,7 @@ <h4>EventData</h4>

<li><strong>velocityX</strong> <span id="log-prop-velocityX"></span></li>
<li><strong>velocityY</strong> <span id="log-prop-velocityY"></span></li>

<li><strong>interimAngle</strong> <span id="log-prop-interimAngle"></span></li>
<li><strong>interimDirection</strong> <span id="log-prop-interimDirection"></span></li>

Expand All @@ -147,7 +147,7 @@ <h4>EventData</h4>
-->

<!-- jQuery is just for the demo! Hammer.js works without jQuery :-) -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>

<script src="../../hammer.js"></script>
<script src="../../plugins/hammer.fakemultitouch.js"></script>
Expand All @@ -156,7 +156,7 @@ <h4>EventData</h4>

<script>


Hammer.plugins.showTouches();
Hammer.plugins.fakeMultitouch();

Expand Down

0 comments on commit 0f8d5f0

Please sign in to comment.