Merge pull request #213 from canjs/212-dep-fixes

No longer use deprecated methods
canjs · Dec 14, 2016 · 6ebbf41 · 6ebbf41
2 parents 63f0d02 + cb92622
commit 6ebbf41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/can/tag/tag.js b/can/tag/tag.js
@@ -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);

diff --git a/data/parse/parse.js b/data/parse/parse.js
@@ -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){
@@ -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];
@@ -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