Merge branch 'next' of https://github.com/lhorie/mithril.js into reattempt-definition-fix
This commit is contained in:
commit
ad3b66eb54
2 changed files with 7 additions and 3 deletions
|
|
@ -1348,7 +1348,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
m.component = function (component) {
|
m.component = function (component) {
|
||||||
var args = [].slice.call(arguments, 1)
|
var args = new Array(arguments.length - 1)
|
||||||
|
|
||||||
|
for (var i = 1; i < arguments.length; i++) {
|
||||||
|
args[i - 1] = arguments[i]
|
||||||
|
}
|
||||||
|
|
||||||
return parameterize(component, args)
|
return parameterize(component, args)
|
||||||
}
|
}
|
||||||
|
|
@ -1966,7 +1970,7 @@
|
||||||
m.sync = function (args) {
|
m.sync = function (args) {
|
||||||
var deferred = m.deferred()
|
var deferred = m.deferred()
|
||||||
var outstanding = args.length
|
var outstanding = args.length
|
||||||
var results = new Array(outstanding)
|
var results = []
|
||||||
var method = "resolve"
|
var method = "resolve"
|
||||||
|
|
||||||
function synchronizer(pos, resolved) {
|
function synchronizer(pos, resolved) {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "mithril",
|
"name": "mithril",
|
||||||
"description": "Mithril.js beta build - use this to help us test the releases before they are released",
|
"description": "Mithril.js - A Javascript Framework for Building Brilliant Applications",
|
||||||
"version": "0.2.3",
|
"version": "0.2.3",
|
||||||
"homepage": "http://mithril.js.org",
|
"homepage": "http://mithril.js.org",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue