Permalink
Browse files

update canjs to jquery 1.8

  • Loading branch information...
1 parent b4f0067 commit cded63e8ccbaf8336c1348b0462a56e85862634d @amcdnl amcdnl committed Aug 23, 2012
Showing with 9,242 additions and 13 deletions.
  1. +4 −2 model/model.js
  2. +4 −4 model/model_test.js
  3. +2 −2 model/store/store.js
  4. +1 −1 test/mvc_test.js
  5. +1 −1 util/docco/makestandalone.js
  6. +9,227 −0 util/jquery/jquery.1.8.0.js
  7. +1 −1 util/make.js
  8. +1 −1 util/mvc.js
  9. +1 −1 view/view.js
View
@@ -85,8 +85,9 @@ steal('can/util','can/observe', function( can ) {
jqXHR.abort();
}
}
-
- return deferred.then(success,error);
+
+ deferred.then(success,error);
+ return deferred;
},
// This object describes how to make an ajax request for each ajax method.
@@ -596,6 +597,7 @@ steal('can/util','can/observe', function( can ) {
}
}
}
+ return arguments[0];
},
/**
* `can.Model.models(data, xhr)` is used to
View
@@ -610,11 +610,11 @@ test("store ajax binding", function(){
});
stop();
can.when( Guy.findOne({id: 1}),
- Guy.findAll()).then(function(guyRes, guysRes){
+ Guy.findAll()).then(function(guyRes, guysRes2){
- equals(guyRes[0].id,1, "got a guy id 1 back");
- equals(guysRes[0][0].id, 1, "got guys w/ id 1 back")
- ok(guyRes[0] === guysRes[0][0], "guys are the same");
+ equals(guyRes.id,1, "got a guy id 1 back");
+ equals(guysRes2[0].id, 1, "got guys w/ id 1 back")
+ ok(guyRes === guysRes2[0], "guys are the same");
// check the store is empty
setTimeout(function(){
start();
View
@@ -283,7 +283,7 @@ can.Construct('jQuery.Model.Store',
} else {
//console.log("Store - already loaded exact match",params, ready);
list = set.list;
- if(set.def.isResolved()){
+ if(set.def.state() === "resolved"){
setTimeout(cb, 1);
} else {
set.def.done(cb);
@@ -314,7 +314,7 @@ can.Construct('jQuery.Model.Store',
// we need to load this ...
- } else if( parentLoadedSet.def.isResolved() ){
+ } else if( parentLoadedSet.def.state() === "resolved" ){
// add right away
//console.log("Store - already loaded parent set",params);
var items = self.findAllCached(params);
View
@@ -1,4 +1,4 @@
-steal('can/util','funcunit/qunit','can/util/fixture',function(can){
+steal('can/util', 'can/construct', function(can, Construct) {
module("mvc");
@@ -2,7 +2,7 @@ load("steal/rhino/rhino.js");
steal('steal/build/pluginify', 'steal/clean', function() {
var libs = {
- "jquery" : "jquery.1.7.1.js",
+ "jquery" : "jquery.1.8.0.js",
"mootools" : "mootools-core-1.4.3.js",
"zepto" : "zepto.0.8.js",
"dojo" : "dojo.js",
Oops, something went wrong.

0 comments on commit cded63e

Please sign in to comment.