Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

docs

  • Loading branch information...
commit 684af970f4c5193b3ed5493c9d819c5b2ae84cae 2 parents 19b129c + 3a30b3a
@justinbmeyer justinbmeyer authored
View
5 can.md
@@ -4,11 +4,6 @@
## CanJS API Documentation
-### What is this site?
-
-DoneJS is the next generation of JavaScriptMVC. Here you will find everything you need to know
-to start using DoneJS, including a complete API reference and example code for CanJS.
-
### What is CanJS?
CanJS makes building rich web applications easy. It provides a lightweight inheritance system,
View
1  construct/construct.md
@@ -1,6 +1,7 @@
@class can.Construct
@parent canjs
+
can.Construct provides easy prototypal inheritance for JavaScript by creating constructor
functions that can be used with the __new__ keyword. It is based off John Resig's
[http://ejohn.org/blog/simple-javascript-inheritance/|Simple JavaScript Inheritance] library.
View
4 route/route.js
@@ -56,7 +56,7 @@ steal('can/observe', 'can/util/string/deparam', function() {
can.route = function( url, defaults ) {
defaults = defaults || {}
- // Extract the variable names and replace with `RegExp` that will match
+ // Extract the variable names and replace with `RegExp` that will match
// an atual URL with values.
var names = [],
test = url.replace(matcher, function( whole, name ) {
@@ -64,7 +64,7 @@ steal('can/observe', 'can/util/string/deparam', function() {
// a name without a default value HAS to have a value
// a name that has a default value can be empty
// The `\\` is for string-escaping giving single `\` for `RegExp` escaping.
- return "([^\\/\\&]"+(defaults[name] ? "*" : "+")+")"
+ return "([^\\/\\&]"+(defaults[name] ? "*" : "+")+")"
});
// Add route in a form that can be easily figured out.
View
1  route/route.md
@@ -3,6 +3,7 @@
@plugin can/route
@parent canjs
+
`can.route(route, defults)` helps manage browser history (and
client state) by
synchronizing the window.location.hash with
View
2  route/route_test.js
@@ -344,7 +344,6 @@ test("empty default is matched even if last", function(){
});
});
-
test("order matched", function(){
can.route.routes = {};
can.route(":foo");
@@ -387,4 +386,3 @@ test("param order matching", function(){
equals(res,"/task2")
})
-
View
9 util/array/makeArray.js
@@ -0,0 +1,9 @@
+steal('./each.js',function(){
+ can.makeArray = function(arr){
+ var ret = []
+ can.each(arr, function(a, i){
+ ret[i] = a
+ })
+ return ret;
+ };
+})
View
4 view/ejs/ejs.md
@@ -1,5 +1,9 @@
@class can.EJS
+<<<<<<< HEAD
@parent canjs
+=======
+@parent can
+>>>>>>> 947f427b460c0db8b82d7e7ac43b7420508fd257
EJS provides __live__ ERB style client-side templates. Use EJS
with [can.view] and for live templating use EJS with [can.Observe].
View
0  view/ejs/temp.js
No changes.
View
2  view/helpers/helpers.js
@@ -1,4 +1,4 @@
-steal('jquery/view/ejs').then(function($){
+steal('can/view/ejs').then(function($){
/**
* @add jQuery.EJS.Helpers.prototype
View
2  view/view.js
@@ -442,7 +442,7 @@ steal("can/util")
var type = can.view.types["." + options.type],
id = can.view.toId(options.rootSrc);
- options.text = "steal('" + (type.plugin || "jquery/view/" + options.type) + "').then(function($){" + "can.view.preload('" + id + "'," + options.text + ");\n})";
+ options.text = "steal('" + (type.plugin || "can/view/" + options.type) + "').then(function($){" + "can.view.preload('" + id + "'," + options.text + ");\n})";
success();
})
}
Please sign in to comment.
Something went wrong with that request. Please try again.