Merge pull request #82 from opentok/3.2.2

3.2.2

docs/ot.md

@@ -73,7 +73,7 @@ You can only create one publisher object. Calling `OT.initPublisher()` more than
 
   * **publishVideo** (Boolean) — Whether to publish video.
 
-  * **resolution** (String) - The desired resolution of the video. The format of the string is "widthxheight", where the width and height are represented in pixels. Valid values are "1280x720", "640x480", and "320x240". The published video will only use the desired resolution if the client configuration supports it. Some devices and clients do not support each of these resolution settings.
+  * **resolution** (String) - The desired resolution of the video. The format of the string is "widthxheight", where the width and height are represented in pixels. Valid values are "1280x720", "640x480", and "352x288". The published video will only use the desired resolution if the client configuration supports it. Some devices and clients do not support each of these resolution settings.
 
   * **videoSource** (Boolean) — If this property is set to false, the video subsystem will not be initialized for the publisher, and setting the publishVideo property will have no effect. If your application does not require the use of video, it is recommended to set this property rather than use the publishVideo property, which only temporarily disables the video track.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-opentok",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "Add live video streaming to your Cordova Application",
   "cordova": {
     "id": "cordova-plugin-opentok",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-plugin-opentok"
-    version="3.2.1">
+    version="3.2.2">
 
     <name>OpenTokCordovaPlugin</name>
     <description>Add live video streaming to your Cordova Application</description>

src/android/OpenTokAndroidPlugin.java

@@ -947,7 +947,7 @@ protected Map<String, String> getParams()
                     JSONObject payload = new JSONObject();
                     try {
                         payload.put("platform", "Android");
-                        payload.put("cp_version", "3.2.1");
+                        payload.put("cp_version", "3.2.2");
                     } catch (JSONException e) {
                         Log.i(TAG, "Error creating payload json object");
                     }

src/ios/OpenTokPlugin.m

@@ -54,7 +54,7 @@ -(void)logOT{
 
     NSMutableDictionary *payload = [[NSMutableDictionary alloc]init];
     [payload setObject:@"iOS" forKey:@"platform"];
-    [payload setObject:@"3.2.1" forKey:@"cp_version"];
+    [payload setObject:@"3.2.2" forKey:@"cp_version"];
     NSMutableDictionary *logData = [[NSMutableDictionary alloc]init];
     [logData setObject:@"cp_initialize" forKey:@"action"];
     [logData setObject:apiKey forKey:@"partner_id"];

src/js/OTSession.coffee

@@ -244,16 +244,15 @@ class TBSession
       return
   signalReceived: (event) =>
     streamEvent = new TBEvent("signal")
-    streamEvent.type = event.type
     streamEvent.data = event.data
     streamEvent.from = @connections[event.connectionId]
     @dispatchEvent(streamEvent)
 
     streamEvent = new TBEvent("signal:#{event.type}")
-    streamEvent.type = event.type
     streamEvent.data = event.data
     streamEvent.from = @connections[event.connectionId]
     @dispatchEvent(streamEvent)
+    return @
   archiveStarted: (event) ->
     streamEvent = new TBEvent("archiveStarted")
     streamEvent.id = event.id

www/opentok.js

@@ -858,15 +858,14 @@ TBSession = (function() {
   TBSession.prototype.signalReceived = function(event) {
     var streamEvent;
     streamEvent = new TBEvent("signal");
-    streamEvent.type = event.type;
     streamEvent.data = event.data;
     streamEvent.from = this.connections[event.connectionId];
     this.dispatchEvent(streamEvent);
     streamEvent = new TBEvent("signal:" + event.type);
-    streamEvent.type = event.type;
     streamEvent.data = event.data;
     streamEvent.from = this.connections[event.connectionId];
-    return this.dispatchEvent(streamEvent);
+    this.dispatchEvent(streamEvent);
+    return this;
   };
 
   TBSession.prototype.archiveStarted = function(event) {