Skip to content

Commit 9e3424f

Browse files
davidwdandavidwdan
committed
fixed issue where *.onchallange event was not being emitted
1 parent 3fd1f69 commit 9e3424f

File tree

5 files changed

+23
-19
lines changed

5 files changed

+23
-19
lines changed

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-wamp",
3-
"version": "0.2.0",
3+
"version": "0.2.1",
44
"main": "./release/angular-wamp.js",
55
"authors": [
66
"David Dan <[email protected]>"

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-wamp",
33
"description": "Angular library for Autobahn.js (WAMP v2)",
4-
"version": "0.2.0",
4+
"version": "0.2.1",
55
"author": "David Dan <[email protected]>",
66
"homepage": "https://github.com/voryx/angular-wamp",
77
"repository": {

‎release/angular-wamp.js

+10-8
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
181181
var connection;
182182
var sessionDeferred = $q.defer();
183183
var sessionPromise = sessionDeferred.promise;
184-
var defaultOptions = {onchallenge: digestWrapper(onchallenge), use_deferred: $q.defer, prefix: '$wamp'};
185-
186-
options = angular.extend(defaultOptions, options);
184+
var prefix = options.prefix || "$wamp";
187185

188186
/**
189187
* @param session
@@ -198,7 +196,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
198196

199197
var onChallengeDeferred = $q.defer();
200198

201-
$rootScope.$broadcast(options.prefix + ".onchallenge", {
199+
$rootScope.$broadcast(prefix + ".onchallenge", {
202200
promise: onChallengeDeferred,
203201
session: session,
204202
method: method,
@@ -208,6 +206,10 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
208206
return onChallengeDeferred.promise;
209207
};
210208

209+
var defaultOptions = {onchallenge: digestWrapper(onchallenge), use_deferred: $q.defer};
210+
211+
options = angular.extend(defaultOptions, options);
212+
211213
/**
212214
* Interceptors stored in reverse order. Inner interceptors before outer interceptors.
213215
*/
@@ -241,7 +243,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
241243
connection = new autobahn.Connection(options);
242244
connection.onopen = digestWrapper(function (session, details) {
243245
$log.debug("Congrats! You're connected to the WAMP server!");
244-
$rootScope.$broadcast(options.prefix + ".open", {session: session, details: details});
246+
$rootScope.$broadcast(prefix + ".open", {session: session, details: details});
245247
sessionDeferred.resolve();
246248
});
247249

@@ -257,7 +259,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
257259
}
258260
}
259261

260-
$rootScope.$broadcast(options.prefix + ".close", {reason: reason, details: details});
262+
$rootScope.$broadcast(prefix + ".close", {reason: reason, details: details});
261263
});
262264

263265
/**
@@ -297,7 +299,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
297299
onOpen();
298300
}
299301

300-
unregister = $rootScope.$on(options.prefix + ".open", onOpen);
302+
unregister = $rootScope.$on(prefix + ".open", onOpen);
301303

302304
subscription.promise = deferred.promise;
303305
subscription.unsubscribe = function () {
@@ -335,7 +337,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
335337
* @returns {{error: *, type: *, args: *}}
336338
*/
337339
var error = function (error) {
338-
$log.error(options.prefix + " error", {type: type, arguments: args, error: error});
340+
$log.error(prefix + " error", {type: type, arguments: args, error: error});
339341
return $q.reject({error: error, type: type, args: args});
340342
};
341343

‎release/angular-wamp.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/angular-wamp.js

+10-8
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
181181
var connection;
182182
var sessionDeferred = $q.defer();
183183
var sessionPromise = sessionDeferred.promise;
184-
var defaultOptions = {onchallenge: digestWrapper(onchallenge), use_deferred: $q.defer, prefix: '$wamp'};
185-
186-
options = angular.extend(defaultOptions, options);
184+
var prefix = options.prefix || "$wamp";
187185

188186
/**
189187
* @param session
@@ -198,7 +196,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
198196

199197
var onChallengeDeferred = $q.defer();
200198

201-
$rootScope.$broadcast(options.prefix + ".onchallenge", {
199+
$rootScope.$broadcast(prefix + ".onchallenge", {
202200
promise: onChallengeDeferred,
203201
session: session,
204202
method: method,
@@ -208,6 +206,10 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
208206
return onChallengeDeferred.promise;
209207
};
210208

209+
var defaultOptions = {onchallenge: digestWrapper(onchallenge), use_deferred: $q.defer};
210+
211+
options = angular.extend(defaultOptions, options);
212+
211213
/**
212214
* Interceptors stored in reverse order. Inner interceptors before outer interceptors.
213215
*/
@@ -241,7 +243,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
241243
connection = new autobahn.Connection(options);
242244
connection.onopen = digestWrapper(function (session, details) {
243245
$log.debug("Congrats! You're connected to the WAMP server!");
244-
$rootScope.$broadcast(options.prefix + ".open", {session: session, details: details});
246+
$rootScope.$broadcast(prefix + ".open", {session: session, details: details});
245247
sessionDeferred.resolve();
246248
});
247249

@@ -257,7 +259,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
257259
}
258260
}
259261

260-
$rootScope.$broadcast(options.prefix + ".close", {reason: reason, details: details});
262+
$rootScope.$broadcast(prefix + ".close", {reason: reason, details: details});
261263
});
262264

263265
/**
@@ -297,7 +299,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
297299
onOpen();
298300
}
299301

300-
unregister = $rootScope.$on(options.prefix + ".open", onOpen);
302+
unregister = $rootScope.$on(prefix + ".open", onOpen);
301303

302304
subscription.promise = deferred.promise;
303305
subscription.unsubscribe = function () {
@@ -335,7 +337,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
335337
* @returns {{error: *, type: *, args: *}}
336338
*/
337339
var error = function (error) {
338-
$log.error(options.prefix + " error", {type: type, arguments: args, error: error});
340+
$log.error(prefix + " error", {type: type, arguments: args, error: error});
339341
return $q.reject({error: error, type: type, args: args});
340342
};
341343

0 commit comments

Comments
 (0)