Skip to content

Commit

Permalink
Merge pull request #254 from leapmotion/upgrade-ws-7.4.6
Browse files Browse the repository at this point in the history
[UPGRADE] Upgrade ws 7.4.6, bump version to 1.1.1
  • Loading branch information
zalo authored Jun 7, 2021
2 parents d916eb4 + 16b8468 commit 5a89a25
Show file tree
Hide file tree
Showing 22 changed files with 13,984 additions and 6,284 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = function(grunt){
\n * LeapJS v<%= pkg.version %> \
\n * http://github.com/leapmotion/leapjs/ \
\n * \
\n * Copyright 2020 Ultraleap, Inc. and other contributors \
\n * Copyright 2021 Ultraleap, Inc. and other contributors \
\n * Released under the Apache-2.0 license \
\n * http://github.com/leapmotion/leapjs/blob/master/LICENSE \
\n */";
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,3 @@ open-in-browsers: build
open -a /Applications/Firefox.app test/helpers/browser.html
open -a /Applications/Safari.app test/helpers/browser.html
open -a /Applications/Google\ Chrome.app test/helpers/browser.html

serve:
./node_modules/.bin/http-server .
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "leapjs",
"version": "1.1.0",
"version": "1.1.1",
"homepage": "https://github.com/leapmotion/leapjs",
"description": "JavaScript client for the Leap Motion Controller",
"main": "leap-1.1.0.js",
"main": "leap-1.1.1.js",
"keywords": [
"leap",
"leapmotion",
Expand Down
2 changes: 1 addition & 1 deletion examples/css-visualizer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<title>DOM Visualizer - Leap</title>
<script src="../leap-1.1.0.js"></script>
<script src="../leap-1.1.1.js"></script>
<script>
function moveFinger(Finger, posX, posY, posZ) {
Finger.style.webkitTransform = "translate3d("+posX+"px, "+posY+"px, "+posZ+"px)";
Expand Down
2 changes: 1 addition & 1 deletion examples/dialog.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
</style>
-->
<script src="../leap-1.1.0.js"></script>
<script src="../leap-1.1.1.js"></script>
<script>

var controller = (new Leap.Controller);
Expand Down
2 changes: 1 addition & 1 deletion examples/dumper.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<title>Dumper - Leap</title>
<script src="../leap-1.1.0.js"></script>
<script src="../leap-1.1.1.js"></script>
<script>
console.log("LeapJS v" + Leap.version.full);
var state = 'play';
Expand Down
2 changes: 1 addition & 1 deletion examples/iframe.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<title>iFrame - Leap</title>
<script src="../leap-1.1.0.js"></script>
<script src="../leap-1.1.1.js"></script>
</head>
<body>
<!-- Demonstrates https://github.com/leapmotion/leapjs/issues/176 -->
Expand Down
2 changes: 1 addition & 1 deletion examples/loop.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Loop - Leap</title>

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

<script>

Expand Down
2 changes: 1 addition & 1 deletion examples/math.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Math - Leap</title>

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

<script>

Expand Down
2 changes: 1 addition & 1 deletion examples/optimizeHMD.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<title>HMD Optimization - Leap</title>
<script src="../leap-1.1.0.js"></script>
<script src="../leap-1.1.1.js"></script>
<script>
var controller = new Leap.Controller({optimizeHMD: true}).connect();
</script>
Expand Down
2 changes: 1 addition & 1 deletion examples/plugins.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<title>Plugins - Leap</title>
<script src="../leap-1.1.0.js"></script>
<script src="../leap-1.1.1.js"></script>
<script>
Leap.Controller.plugin('test', function(){

Expand Down
2 changes: 1 addition & 1 deletion examples/roll-pitch-yaw.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<title>Dumper - Leap</title>
<script src="../leap-1.1.0.js"></script>
<script src="../leap-1.1.1.js"></script>
<script>
var paused = false;
window.onkeypress = function(e) {
Expand Down
2 changes: 1 addition & 1 deletion examples/threejs-bones-arrows.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<title>Bone Hands - Leap</title>
<script src="../leap-1.1.0.js"></script>
<script src="../leap-1.1.1.js"></script>
<script src="lib/leap-plugins-0.1.6.js"></script>
<script src="lib/three.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/threejs-bones.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<title>Bone Hands - Leap</title>
<script src="../leap-1.1.0.js"></script>
<script src="../leap-1.1.1.js"></script>
<script src="lib/leap-plugins-0.1.6.js"></script>
<script src="lib/three.js"></script>

Expand Down
9 changes: 0 additions & 9 deletions leap-1.1.0.min.js

This file was deleted.

Loading

0 comments on commit 5a89a25

Please sign in to comment.