Skip to content

Commit

Permalink
Merge pull request #122 from Temasys/development
Browse files Browse the repository at this point in the history
0.6.0 changes
  • Loading branch information
serrynaimo committed Jun 11, 2015
2 parents 35490d2 + 27f886b commit fd84668
Show file tree
Hide file tree
Showing 36 changed files with 81 additions and 26,239 deletions.
15 changes: 1 addition & 14 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,10 @@ module.exports = function(grunt) {
'<%= source %>/*.js',
'<%= template %>/footer.js'
],
'<%= production %>/skyway.debug.js': [
'<%= template %>/header.js',
'<%= source %>/*.js',
'<%= template %>/footer.js'
],
'<%= production %>/skylink.complete.js': [
'node_modules/socket.io-client/socket.io.js',
'node_modules/adapterjs/publish/adapter.screenshare.js',
'<%= production %>/skylink.debug.js'
],
'<%= production %>/skyway.complete.js': [
'node_modules/socket.io-client/socket.io.js',
'node_modules/adapterjs/publish/adapter.screenshare.js',
'<%= production %>/skyway.debug.js'
]
}
},
Expand All @@ -102,10 +92,7 @@ module.exports = function(grunt) {
files: {
'<%= production %>/skylink.min.js': ['<%= production %>/skylink.debug.js'],
'<%= production %>/skylink.complete.min.js':
['<%= production %>/skylink.complete.js'],
'<%= production %>/skyway.min.js': ['<%= production %>/skyway.debug.js'],
'<%= production %>/skyway.complete.min.js':
['<%= production %>/skyway.complete.js']
['<%= production %>/skylink.complete.js']
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Please read how you can find help, contribute and support us advancing SkylinkJS
##### Current versions and stability
Always use the latest versions of the SkylinkJS library as WebRTC is still evolving and we adapt to changes very frequently.

[Latest version: 0.5.13](https://github.com/Temasys/SkylinkJS/releases/tag/0.5.13).
[Latest version: 0.6.0](https://github.com/Temasys/SkylinkJS/releases/tag/0.6.0).

##### Upgrading from 0.5.7 and below:
It's now recommended to use the `init()` callback instead of using `readyStateChange` event state to go completed as this may result in an infinite loop.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "skylinkjs",
"description": "WebRTC real-time video conversation library",
"version": "0.5.13",
"version": "0.6.0",
"homepage": "https://temasys.github.io/",
"author": {
"name": "Temasys Communications Pte. Ltd.",
Expand Down
14 changes: 7 additions & 7 deletions doc/classes/Skylink.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down Expand Up @@ -20590,7 +20590,7 @@ <h3 class="code-item-name"><code>shareScreen</code></h3>



<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.5.11</span></small>
<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.6.0</span></small>

</div>

Expand Down Expand Up @@ -20711,7 +20711,7 @@ <h3 class="code-item-name"><code>stopScreen</code></h3>



<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.5.11</span></small>
<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.6.0</span></small>

</div>

Expand Down Expand Up @@ -24581,7 +24581,7 @@ <h3 class="code-item-name"><code>_mediaScreen</code></h3>



<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.5.11</span></small>
<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.6.0</span></small>

</div>

Expand Down Expand Up @@ -24655,7 +24655,7 @@ <h3 class="code-item-name"><code>_mediaScreenClone</code></h3>



<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.5.11</span></small>
<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.6.0</span></small>

</div>

Expand Down Expand Up @@ -25695,7 +25695,7 @@ <h3 class="code-item-name"><code>_peerRestartPriorities</code></h3>



<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.5.11</span></small>
<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.6.0</span></small>

</div>

Expand Down Expand Up @@ -31445,7 +31445,7 @@ <h3 class="code-item-name"><code>SM_PROTOCOL_VERSION</code></h3>



<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.5.11</span></small>
<small><i class="fa">&nbsp;&nbsp;&nbsp;</i>&nbsp;&nbsp;Available since <span class="badge">0.6.0</span></small>

</div>

Expand Down
14 changes: 7 additions & 7 deletions doc/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"project": {
"name": "skylinkjs",
"description": "SkylinkJS is an open-source client-side library for your web-browser that enables any website to easily leverage the capabilities of WebRTC and its direct data streaming powers between peers for audio/video conferencing or file transfer.",
"version": "0.5.12",
"version": "0.6.0",
"url": "https://temasys.github.io/"
},
"files": {
Expand Down Expand Up @@ -1793,7 +1793,7 @@
"access": "private",
"tagname": "",
"required": 1,
"since": "0.5.11",
"since": "0.6.0",
"class": "Skylink"
},
{
Expand Down Expand Up @@ -5842,7 +5842,7 @@
"type": "String",
"required": 1,
"component": "Socket",
"since": "0.5.11",
"since": "0.6.0",
"class": "Skylink"
},
{
Expand Down Expand Up @@ -7623,7 +7623,7 @@
"access": "private",
"tagname": "",
"component": "Stream",
"since": "0.5.11",
"since": "0.6.0",
"class": "Skylink"
},
{
Expand All @@ -7636,7 +7636,7 @@
"access": "private",
"tagname": "",
"component": "Stream",
"since": "0.5.11",
"since": "0.6.0",
"class": "Skylink"
},
{
Expand Down Expand Up @@ -8800,7 +8800,7 @@
],
"trigger": "mediaAccessSuccess, mediaAccessError, incomingStream",
"component": "Stream",
"since": "0.5.11",
"since": "0.6.0",
"class": "Skylink"
},
{
Expand All @@ -8812,7 +8812,7 @@
"example": [
"\n SkylinkDemo.stopScreen();"
],
"since": "0.5.11",
"since": "0.6.0",
"class": "Skylink"
},
{
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_data-channel.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_data-process.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_data-transfer.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_ice-candidate.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_ice-connection.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
4 changes: 2 additions & 2 deletions doc/files/source_peer-connection.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down Expand Up @@ -144,7 +144,7 @@ <h1 class="file-heading">File: source/peer-connection.js</h1>
* @private
* @required
* @for Skylink
* @since 0.5.11
* @since 0.6.0
*/
Skylink.prototype._peerRestartPriorities = {};

Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_peer-data.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_peer-handshake.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_room-connection.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_room-init.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_skylink-debug.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_skylink-events.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_socket-channel.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
4 changes: 2 additions & 2 deletions doc/files/source_socket-message.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down Expand Up @@ -83,7 +83,7 @@ <h1 class="file-heading">File: source/socket-message.js</h1>
* @required
* @component Socket
* @for Skylink
* @since 0.5.11
* @since 0.6.0
*/
Skylink.prototype.SM_PROTOCOL_VERSION = &#x27;0.1.1&#x27;;

Expand Down
10 changes: 5 additions & 5 deletions doc/files/source_stream-media.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down Expand Up @@ -282,7 +282,7 @@ <h1 class="file-heading">File: source/stream-media.js</h1>
* @private
* @component Stream
* @for Skylink
* @since 0.5.11
* @since 0.6.0
*/
Skylink.prototype._mediaScreen = null;

Expand All @@ -293,7 +293,7 @@ <h1 class="file-heading">File: source/stream-media.js</h1>
* @private
* @component Stream
* @for Skylink
* @since 0.5.11
* @since 0.6.0
*/
Skylink.prototype._mediaScreenClone = null;

Expand Down Expand Up @@ -1538,7 +1538,7 @@ <h1 class="file-heading">File: source/stream-media.js</h1>
* @trigger mediaAccessSuccess, mediaAccessError, incomingStream
* @component Stream
* @for Skylink
* @since 0.5.11
* @since 0.6.0
*/
Skylink.prototype.shareScreen = function (callback) {
var self = this;
Expand Down Expand Up @@ -1619,7 +1619,7 @@ <h1 class="file-heading">File: source/stream-media.js</h1>
* @example
* SkylinkDemo.stopScreen();
* @for Skylink
* @since 0.5.11
* @since 0.6.0
*/
Skylink.prototype.stopScreen = function () {
var endSession = false;
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_stream-sdp.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
2 changes: 1 addition & 1 deletion doc/files/source_template_header.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<span class="icon-bar"></span>
</button>
<a href="" class="navbar-brand">
<img src="../assets/img/logo.svg" />JS<small>Version: 0.5.12</small>
<img src="../assets/img/logo.svg" />JS<small>Version: 0.6.0</small>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down
Loading

0 comments on commit fd84668

Please sign in to comment.