Skip to content

Commit 5a89a25

Browse files
authored
Merge pull request #254 from leapmotion/upgrade-ws-7.4.6
[UPGRADE] Upgrade ws 7.4.6, bump version to 1.1.1
2 parents d916eb4 + 16b8468 commit 5a89a25

22 files changed

+13984
-6284
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = function(grunt){
44
\n * LeapJS v<%= pkg.version %> \
55
\n * http://github.com/leapmotion/leapjs/ \
66
\n * \
7-
\n * Copyright 2020 Ultraleap, Inc. and other contributors \
7+
\n * Copyright 2021 Ultraleap, Inc. and other contributors \
88
\n * Released under the Apache-2.0 license \
99
\n * http://github.com/leapmotion/leapjs/blob/master/LICENSE \
1010
\n */";

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,3 @@ open-in-browsers: build
3939
open -a /Applications/Firefox.app test/helpers/browser.html
4040
open -a /Applications/Safari.app test/helpers/browser.html
4141
open -a /Applications/Google\ Chrome.app test/helpers/browser.html
42-
43-
serve:
44-
./node_modules/.bin/http-server .

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "leapjs",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"homepage": "https://github.com/leapmotion/leapjs",
55
"description": "JavaScript client for the Leap Motion Controller",
6-
"main": "leap-1.1.0.js",
6+
"main": "leap-1.1.1.js",
77
"keywords": [
88
"leap",
99
"leapmotion",

examples/css-visualizer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<head>
33
<title>DOM Visualizer - Leap</title>
4-
<script src="../leap-1.1.0.js"></script>
4+
<script src="../leap-1.1.1.js"></script>
55
<script>
66
function moveFinger(Finger, posX, posY, posZ) {
77
Finger.style.webkitTransform = "translate3d("+posX+"px, "+posY+"px, "+posZ+"px)";

examples/dialog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
</style>
1313
-->
14-
<script src="../leap-1.1.0.js"></script>
14+
<script src="../leap-1.1.1.js"></script>
1515
<script>
1616

1717
var controller = (new Leap.Controller);

examples/dumper.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<head>
33
<title>Dumper - Leap</title>
4-
<script src="../leap-1.1.0.js"></script>
4+
<script src="../leap-1.1.1.js"></script>
55
<script>
66
console.log("LeapJS v" + Leap.version.full);
77
var state = 'play';

examples/iframe.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<head>
33
<title>iFrame - Leap</title>
4-
<script src="../leap-1.1.0.js"></script>
4+
<script src="../leap-1.1.1.js"></script>
55
</head>
66
<body>
77
<!-- Demonstrates https://github.com/leapmotion/leapjs/issues/176 -->

examples/loop.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
44
<title>Loop - Leap</title>
55

6-
<script src="../leap-1.1.0.js"></script>
6+
<script src="../leap-1.1.1.js"></script>
77

88
<script>
99

examples/math.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
44
<title>Math - Leap</title>
55

6-
<script src="../leap-1.1.0.js"></script>
6+
<script src="../leap-1.1.1.js"></script>
77

88
<script>
99

examples/optimizeHMD.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<head>
33
<title>HMD Optimization - Leap</title>
4-
<script src="../leap-1.1.0.js"></script>
4+
<script src="../leap-1.1.1.js"></script>
55
<script>
66
var controller = new Leap.Controller({optimizeHMD: true}).connect();
77
</script>

0 commit comments

Comments
 (0)