vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next' of https://github.com/venning/mithril.js into venning-next

Browse source 
Conflicts:
	mithril.js
This commit is contained in:
Leo Horie 2015-07-23 21:52:05 -04:00
commit 3a367eb279
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mithril.js
View file

@ -724,8 +724,8 @@ var m = (function app(window, undefined) {
}; };
if (component.controller) controller.prototype = component.controller.prototype; if (component.controller) controller.prototype = component.controller.prototype;
var view = function(ctrl) { var view = function(ctrl) {
for (var i = 1; i < arguments.length; i++) args.push(arguments[i]); var currentArgs = arguments.length > 1 ? args.concat([].slice.call(arguments, 1)) : args;
return component.view.apply(component, [ctrl].concat(args)); return component.view.apply(component, currentArgs ? [ctrl].concat(currentArgs) : [ctrl]);
}; };
view.$original = component.view; view.$original = component.view;
var output = {controller: controller, view: view}; var output = {controller: controller, view: view};