Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V3 rollback and use new roslib #1

Closed
wants to merge 2 commits into from
Closed

V3 rollback and use new roslib #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05c13d1
Revert to v3.0.2
mvollrath Jan 31, 2019
00142bc
Use new roslib
mvollrath Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
bower_components/

node_modules
8 changes: 3 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
[![Published on webcomponents.org](https://img.shields.io/badge/webcomponents.org-published-blue.svg)](https://www.webcomponents.org/element/jstnhuang/ros-websocket)

A Polymer element that wraps roslibjs.
- Version 3 is a hybrid element that supports Polymer 1 and Polymer 2.
- Version 4 is built for Polymer 3.
Version 3 is a hybrid element that supports Polymer 1 and Polymer 2.

- [Documentation](https://www.webcomponents.org/element/jstnhuang/ros-websocket/elements/ros-websocket)
- [Demo](https://www.webcomponents.org/element/jstnhuang/ros-websocket/demo/demo/index.html).
Note that the demo should be run locally.
Note that the demo requires a secure websocket server, since it is served over HTTPS.

## Installation
- Polymer 1 and 2: `bower install --save jstnhuang/ros-websocket`
- Polymer 3: `npm install @justinhuang/ros-websocket`
`bower install --save jstnhuang/ros-websocket`
236 changes: 0 additions & 236 deletions analysis.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"dependencies": {
"polymer": "Polymer/polymer#1.9 - 2",
"roslib": "RobotWebTools/roslibjs#^0.18.0"
"roslib": "RobotWebTools/roslibjs#^1.0.0"
},
"devDependencies": {
"iron-component-page": "PolymerElements/iron-component-page#^2.0.0",
Expand Down
74 changes: 27 additions & 47 deletions demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,58 +5,38 @@
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<title>ros-websocket Demo</title>

<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>

<script type="module">
import '@polymer/iron-demo-helpers/demo-pages-shared-styles';
import '@polymer/iron-demo-helpers/demo-snippet';
</script>

<script type="module" src="../ros-websocket.js"></script>
<link rel="import" href="../ros-websocket.html">

<custom-style>
<style is="custom-style" include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 900px;
}
</style>
</custom-style>
</head>
<body unresolved>
<div class="vertical-section-container centered">
<h3>Basic ros-websocket demo</h3>
<p>
An example of <code>&lt;ros-websocket&gt;</code>.<br />
Open the JavaScript console to see if a connection has been established to the websocket.
</p>
<demo-snippet>
<template>
<ros-websocket></ros-websocket>

<input type="text" id="urlInput" value="ws://localhost:9090"></input>
<input id="connectButton" type="button" value="Connect"></input>
<script>
var websocket = document.querySelector('ros-websocket');
websocket.addEventListener('connection', function() {
console.log('Connected to the websocket server.');
});
websocket.addEventListener('error', function(error) {
console.error('Error connecting to the websocket server:', error);
});
websocket.addEventListener('close', function() {
console.log('Connection to websocket server closed.');
});

document.querySelector('#connectButton').addEventListener('click', function() {
websocket.url = document.querySelector('#urlInput').value;
websocket.connect();
});
<body>
<p>An example of <code>&lt;ros-websocket&gt;</code></p>
<p>Open the JavaScript console to see if a connection has been established to the websocket.

</script>
</template>
</demo-snippet>
<div>
<input type="text" id="urlInput" value="ws://localhost:9090"></input>
<input id="connectButton" type="button" value="Connect"></input>
</div>
</script>
<ros-websocket></ros-websocket>

<script>
var seedElement = document.querySelector('ros-websocket');
seedElement.addEventListener('connection', function() {
console.log('Connected to the websocket server.');
});
seedElement.addEventListener('error', function(error) {
console.log('Error connecting to the websocket server:', error);
});
seedElement.addEventListener('close', function() {
console.log('Connection to websocket server closed.');
});

document.querySelector('#connectButton').addEventListener('click', function() {
seedElement.url = document.querySelector('#urlInput').value;
seedElement.connect();
});
</script>

</body>
</html>
1 change: 1 addition & 0 deletions eventemitter2-import.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<script src="../eventemitter2/lib/eventemitter2.js"></script>
30 changes: 19 additions & 11 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="/node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
<script type="module" src="/node_modules/@polymer/iron-component-page/iron-component-page.js"></script>
</head>
<body>
<iron-component-page></iron-component-page>
</body>
</html>
<html>
<head>

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<script src="../webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="../iron-component-page/iron-component-page.html">

</head>
<body unresolved>
<!-- Note: if the main element for this repository doesn't
match the folder name, add a src="&lt;main-component&gt;.html" attribute,
where &lt;main-component&gt;.html" is a file that imports all of the
components you want documented. -->
<iron-component-page></iron-component-page>

</body>
</html>
Loading