Skip to content

Commit

Permalink
Merge pull request #114 from canjs/can-observation-warning
Browse files Browse the repository at this point in the history
Use can-observation-recorder instead of can-observation
  • Loading branch information
chasenlehara authored Jun 1, 2018
2 parents 4501af8 + 2df6050 commit da4be3c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
},
"dependencies": {
"can-assign": "^1.0.0",
"can-observation": "^4.0.0",
"can-observation-recorder": "^1.0.0",
"can-zone-storage": "^1.0.0",
"feathers-authentication-popups": "^0.1.2",
"feathers-errors": "^2.7.0",
Expand Down
4 changes: 2 additions & 2 deletions session/session.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var decode = require('jwt-decode');
var payloadIsValid = require('../utils/utils').payloadIsValid;
var hasValidToken = require('../utils/utils').hasValidToken;
var convertLocalAuthData = require('../utils/utils').convertLocalAuthData;
var Observation = require('can-observation');
var ObservationRecorder = require('can-observation-recorder');
var zoneStorage = require('./storage');

module.exports = connect.behavior('data/feathers-session', function (base) {
Expand All @@ -27,7 +27,7 @@ module.exports = connect.behavior('data/feathers-session', function (base) {

Object.defineProperty(Session, 'current', {
get: function () {
Observation.add(Session, 'current');
ObservationRecorder.add(Session, 'current');
if (zoneStorage.getItem('can-connect-feathers-session') === undefined) {

// set session to `undefined` when we start authentication:
Expand Down

0 comments on commit da4be3c

Please sign in to comment.