tinny fixes; a little bit updates and some new stuff.

Husniddin · Aug 19, 2013 · ed178a1 · ed178a1
1 parent d499f77
commit ed178a1
Show file tree

Hide file tree

Showing 42 changed files with 3,654 additions and 2,882 deletions.
diff --git a/DataChannel/DataChannel.js b/DataChannel/DataChannel.js
@@ -93,19 +93,23 @@
             if (self.config) return;
 
             self.config = {
-                onroom: function(room) {
+                ondatachannel: function(room) {
                     if (!dataConnector) {
                         self.room = room;
                         return;
                     }
 
+                    var tempRoom = {
+                        id: room.roomToken,
+                        owner: room.broadcaster
+                    };
+
+                    if (self.ondatachannel) return self.ondatachannel(tempRoom);
+
                     if (self.joinedARoom) return;
                     self.joinedARoom = true;
 
-                    dataConnector.joinRoom({
-                        roomToken: room.roomToken,
-                        joinUser: room.broadcaster
-                    });
+                    self.join(tempRoom);
                 },
                 onopen: function(userid, _channel) {
                     self.onopen(userid, _channel);
@@ -153,7 +157,7 @@
             fileReceiver = new FileReceiver();
             textReceiver = new TextReceiver();
 
-            if (self.room) self.config.onroom(self.room);
+            if (self.room) self.config.ondatachannel(self.room);
         }
 
         this.open = function(_channel) {
@@ -175,6 +179,18 @@
             prepareInit(init);
         };
 
+        // manually join a room
+        this.join = function(room) {
+            if (!room.id || !room.owner) {
+                throw 'Invalid room info passed.';
+            }
+
+            dataConnector.joinRoom({
+                roomToken: room.id,
+                joinUser: room.owner
+            });
+        };
+
         this.send = function(data, _channel) {
             if (!data) throw 'No file, data or text message to share.';
             if (data.size)
@@ -515,7 +531,7 @@
             onmessage: function(response) {
                 if (response.userToken == self.userToken) return;
 
-                if (isGetNewRoom && response.roomToken && response.broadcaster) config.onroom(response);
+                if (isGetNewRoom && response.roomToken && response.broadcaster) config.ondatachannel(response);
 
                 if (response.newParticipant) onNewParticipant(response.newParticipant);
 
@@ -627,7 +643,7 @@
                 packets = 0;
 
             // uuid is used to uniquely identify sending instance
-            var uuid = getRandomString();
+            file.uuid = getRandomString();
 
             var reader = new window.FileReader();
             reader.readAsDataURL(file);
@@ -636,7 +652,7 @@
             function onReadAsDataURL(event, text) {
                 var data = {
                     type: 'file',
-                    uuid: uuid
+                    uuid: file.uuid
                 };
 
                 if (event) {
@@ -649,15 +665,15 @@
                         remaining: packets--,
                         length: numberOfPackets,
                         sent: numberOfPackets - packets
-                    }, uuid);
+                    }, file.uuid);
 
                 if (text.length > packetSize) data.message = text.slice(0, packetSize);
                 else {
                     data.message = text;
                     data.last = true;
                     data.name = file.name;
 
-                    if (config.onFileSent) config.onFileSent(file, uuid);
+                    if (config.onFileSent) config.onFileSent(file, file.uuid);
                 }
 
                 // WebRTC-DataChannels.send(data, privateDataChannel)
@@ -709,7 +725,7 @@
                 // if you don't want to auto-save to disk:
                 // channel.autoSaveToDisk=false;
                 if (root.autoSaveToDisk)
-                    FileSaver.SaveToDisk(virtualURL, data.name);
+                    FileSaver.SaveToDisk(dataURL, data.name);
 
                 // channel.onFileReceived = function(fileName, file) {}
                 // file.blob || file.dataURL || file.url || file.uuid
@@ -885,7 +901,7 @@
                     credential: 'homeo',
                     username: 'homeo'
                 };
-            iceServers.iceServers = [TURN, STUN];
+            iceServers.iceServers = [STUN, TURN];
         }
 
         var optional = {

diff --git a/DataChannel/README.md b/DataChannel/README.md
@@ -89,6 +89,27 @@ channel.onmessage = function(message, userid, latency) { }
 
 =
 
+##### `ondatachannel`
+
+Allows you show list of all available data channels to the user; and let him choose which one to join:
+
+```javascript
+channel.ondatachannel = function(data_channel) {
+    channel.join(data_channel);
+
+    // or
+    channel.join({
+        id:    data_channel.id,
+        owner: data_channel.owner
+    });
+
+    // id:    unique identifier for the session
+    // owner: unique identifier for the session initiator
+};
+```
+
+=
+
 ##### Use custom user-ids
 
 ```javascript
@@ -160,6 +181,17 @@ channel.leave(); // closing entire session
 
 =
 
+##### `uuid` for files
+
+You can get `uuid` for each file (being sent) like this:
+
+```javascript
+channel.send(file);
+var uuid = file.uuid; // "file"-Dot-uuid
+```
+
+=
+
 ##### To Share files
 
 ```javascript

diff --git a/DataChannel/auto-session-establishment.html b/DataChannel/auto-session-establishment.html
@@ -298,8 +298,8 @@ <h2 style="display: block; font-size: 1em; text-align: center;">Share Files</h2>
                     + '<section class="message" contenteditable>' + data + '</section>';
         }
 
-        if (!parent) chatOutput.insertBefore(div, chatOutput.firstChild);
-        else parent.insertBefore(div, parent.firstChild);
+        if (!parent) chatOutput.appendChild(div, chatOutput.firstChild);
+        else fileProgress.appendChild(div, fileProgress.firstChild);
 
         div.tabIndex = 0;
         div.focus();