Skip to content
This repository has been archived by the owner on Jul 3, 2019. It is now read-only.

Commit

Permalink
Merge pull request #116 from reTHINK-project/develop
Browse files Browse the repository at this point in the history
Develop to master
  • Loading branch information
luistduarte authored May 23, 2019
2 parents 67f20bf + 12541f8 commit 60727bb
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dist/Connector.hy.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/DeviceManager.hy.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/SimpleChat.hy.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/UserKwhObserver.hy.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions examples/simple-chat/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,11 @@ function prepareChat(chatController, isOwner, toReload = null) {
console.log('[SimpleChatDemo ] OnChange Event:', event);
});

chatController.onTyping(function (event) {
console.log('[SimpleChatDemo ] onTyping Event:', event);
});


chatController.onUserAdded(function (event) {
console.log('[SimpleChatDemo ] onUserAdded Event:', event);
const participantHypertyURL = event.hypertyURL;
Expand Down Expand Up @@ -411,6 +416,8 @@ function prepareChat(chatController, isOwner, toReload = null) {
inviteParticipants(chatController, isOwner);
});

document.addEventListener('keydown', event => { chatController.typing() } )

}

function inviteParticipants(chatController, isOwner) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hyperties",
"version": "0.8.0",
"version": "0.9.0",
"files": [
"dist"
],
Expand Down
4 changes: 3 additions & 1 deletion src/device-manager/HypertyDescriptor.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
export let hypertyDescriptor = {
"name": "DeviceManager",
"configuration": {},
"configuration": {
"domain_registration": false
},
"hypertyType": [
"device"
],
Expand Down
4 changes: 3 additions & 1 deletion src/observer-kwh/HypertyDescriptor.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
export let hypertyDescriptor = {
"name": "UserKwhObserver",
"configuration": {},
"configuration": {
"domain_registration": false
},
"hypertyType": [
"availability_context"
],
Expand Down
1 change: 1 addition & 0 deletions src/simple-chat/HypertyDescriptor.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export let hypertyDescriptor = {
"language": "javascript",
"signature": "",
"configuration": {
"domain_registration": false,
"backup": true,
"heartBeat": 60,
"offline": "hyperty://sharing-cities-dsm/offline-sub-mgr"
Expand Down
1 change: 1 addition & 0 deletions src/simple-chat/SimpleChat.hy.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"language": "javascript",
"signature": "",
"configuration": {
"domain_registration": false,
"backup": true,
"heartBeat": 60,
"offline": "hyperty://sharing-cities-dsm/offline-sub-mgr"
Expand Down

0 comments on commit 60727bb

Please sign in to comment.