Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

No longer use deprecated methods #213

Merged
merged 1 commit into from
Dec 14, 2016
Merged

No longer use deprecated methods #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion can/tag/tag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ connect.tag = function(tagName, connection){
var addedToPageData = false;
var addToPageData = Observation.ignore(function(set, promise){
if(!addedToPageData) {
var root = tagData.scope.attr("%root") || tagData.scope.attr("@root");
var root = tagData.scope.peek("%root") || tagData.scope.peek("@root");
if( root && root.pageData ) {
if(method === "get"){
set = connection.id(set);
Expand Down
6 changes: 3 additions & 3 deletions data/parse/parse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
var connect = require("can-connect");
var each = require("can-util/js/each/each");
var isArray = require("can-util/js/is-array/is-array");
var string = require("can-util/js/string/string");
var getObject = require("can-util/js/get/get");


module.exports = connect.behavior("data/parse",function(baseConnection){
Expand Down Expand Up @@ -142,7 +142,7 @@ module.exports = connect.behavior("data/parse",function(baseConnection){
} else {
var prop = this.parseListProp || 'data';

responseData.data = string.getObject(prop, responseData);
responseData.data = getObject(responseData, prop);
result = responseData;
if(prop !== "data") {
delete responseData[prop];
Expand Down Expand Up @@ -236,7 +236,7 @@ module.exports = connect.behavior("data/parse",function(baseConnection){
// responses. So if it doesn't return anything, go back to using props.
props = baseConnection.parseInstanceData.apply(this, arguments) || props;
}
return this.parseInstanceProp ? string.getObject(this.parseInstanceProp, props) || props : props;
return this.parseInstanceProp ? getObject(props, this.parseInstanceProp) || props : props;
}
/**
* @property {String} can-connect/data/parse/parse.parseListProp parseListProp
Expand Down