Skip to content

Commit

Permalink
2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Curtis Cummings committed May 22, 2014
1 parent 80a019c commit 9010d16
Show file tree
Hide file tree
Showing 246 changed files with 1,427 additions and 812 deletions.
4 changes: 2 additions & 2 deletions amd-dev/can.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
12 changes: 10 additions & 2 deletions amd-dev/can/component.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down Expand Up @@ -116,6 +116,14 @@ define(["can/util/library", "can/view/callbacks", "can/control", "can/observe",
var name = can.camelize(node.nodeName.toLowerCase()),
value = node.value;

//!steal-remove-start
// user tried to pass something like id="{foo}", so give them a good warning
if(ignoreAttributesRegExp.test(name) && value[0] === "{" && value[value.length-1] === "}") {
can.dev.warn("can/component: looks like you're trying to pass "+name+" as an attribute into a component, "+
"but it is not a supported attribute");
}
//!steal-remove-end

// Ignore attributes already present in the ScopeMappings.
if (component.constructor.attributeScopeMappings[name] || ignoreAttributesRegExp.test(name) || viewCallbacks.attr(node.nodeName)) {
return;
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/compute.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/construct.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/construct/proxy.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/construct/super.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
7 changes: 4 additions & 3 deletions amd-dev/can/control.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down Expand Up @@ -325,7 +325,8 @@ define(["can/util/library", "can/construct"], function (can) {
"keypress", "mousedown", "mousemove", "mouseout", "mouseover",
"mouseup", "reset", "resize", "scroll", "select", "submit", "focusin",
"focusout", "mouseenter", "mouseleave",
"touchstart", "touchmove", "touchcancel", "touchend", "touchleave"
"touchstart", "touchmove", "touchcancel", "touchend", "touchleave",
"inserted","removed"
], function (v) {
processors[v] = basicProcessor;
});
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/control/plugin.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/control/route.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
24 changes: 20 additions & 4 deletions amd-dev/can/event.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down Expand Up @@ -296,7 +296,15 @@ define(["can/util/can"], function (can) {
*
* This syntax can be used for objects that don't include the `can.event` mixin.
*/
on: can.addEvent,
on: function() {
if (arguments.length === 0 && can.Control && this instanceof can.Control) {
return can.Control.prototype.on.call(this);
}
else {
return can.addEvent.apply(this, arguments);
}
},

/**
* @function can.event.off
* @parent can.event.static
Expand All @@ -310,7 +318,15 @@ define(["can/util/can"], function (can) {
*
* This syntax can be used for objects that don't include the `can.event` mixin.
*/
off: can.removeEvent,
off: function() {
if (arguments.length === 0 && can.Control && this instanceof can.Control) {
return can.Control.prototype.off.call(this);
}
else {
return can.removeEvent.apply(this, arguments);
}
},

/**
* @function can.event.bind
* @parent can.event.static
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/list.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/list/promise.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/attributes.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/backup.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/bubble.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/define.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/delegate.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/lazy.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/lazy/bubble.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/lazy/nested_reference.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/list.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/setter.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/sort.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/map/validations.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/model.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/model/queue.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
4 changes: 2 additions & 2 deletions amd-dev/can/observe.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down
14 changes: 7 additions & 7 deletions amd-dev/can/route.js
View file
@@ -1,8 +1,8 @@
/*!
* CanJS - 2.1.0
* CanJS - 2.1.1
* http://canjs.us/
* Copyright (c) 2014 Bitovi
* Mon, 05 May 2014 22:15:43 GMT
* Thu, 22 May 2014 03:37:55 GMT
* Licensed MIT
* Includes: CanJS default build
* Download from: http://canjs.us/
Expand Down Expand Up @@ -357,14 +357,14 @@ define(["can/util/library", "can/map", "can/list", "can/util/string/deparam"], f
data: new can.Map({}),
map: function(data){
var appState;
// appState is an instance of can.Map
if(data instanceof can.Map){
appState = data;
}
// appState is a can.Map constructor function
else if(data.prototype instanceof can.Map){
if(data.prototype instanceof can.Map){
appState = new data();
}
// appState is an instance of can.Map
else {
appState = data;
}
can.route.data = appState;
},
/**
Expand Down

0 comments on commit 9010d16

Please sign in to comment.