Commit graph

150 commits

Author SHA1 Message Date
Leo Horie
d993da1cfd Merge branch 'typeof_refactor' of github.com:Naddiseo/mithril.js into Naddiseo-typeof_refactor
Conflicts:
	mithril.js
	tests/mithril-tests.js
2014-09-27 19:38:49 -04:00
Leo Horie
d250908b27 add test for 277 2014-09-25 13:04:05 -04:00
Leo Horie
75787a1483 update change log 2014-09-25 07:25:26 -04:00
Leo Horie
d32dd4adf5 revert workaround for #29 in favor of key-based solution 2014-09-21 21:24:15 -04:00
Leo Horie
eceea4addf document deps 2014-09-20 16:55:57 -04:00
Taylor Hakes
9b1461d31f Fixed formatting, removed semicolons from e2e test file 2014-09-19 08:54:35 -04:00
Leo Horie
153d2384c8 actually fix error from promise branch merge 2014-09-19 00:28:30 -04:00
Leo Horie
a73f9cdd3a mark todo 2014-09-19 00:06:43 -04:00
Leo Horie
ac4863ff7c Merge remote-tracking branch 'origin/next' into es6-promise
Conflicts:
	mithril.js
2014-09-18 22:26:13 -04:00
Richard Eames
c56f75a4c3 Check for arguments object edge case, and remove instanceof 2014-09-18 12:37:22 -06:00
Richard Eames
f3018776b8 Check for weird edge-case & tests 2014-09-18 12:04:02 -06:00
Richard Eames
c3d3fa7315 Check that the 2nd argument to m.route is a string 2014-09-18 10:57:30 -06:00
Richard Eames
e94a0a7c22 Added tests for other kinds of string 2014-09-18 10:56:17 -06:00
zzmp
7af59740f9 add teardown to test(L1457) 2014-09-17 14:23:26 -07:00
zzmp
d14306a9ca fix mock requestAnimationFrame to allow chaining 2014-09-17 14:19:46 -07:00
Leo Horie
5db2dc8434 clean up redundant code 2014-09-16 00:29:01 -04:00
Leo Horie
b3b3853d71 beef up docs 2014-09-16 00:17:22 -04:00
Leo Horie
fe17009bc9 Merge branch 'next' into es6-promise
Conflicts:
	docs/mithril.deferred.md
2014-09-15 21:32:39 -04:00
Leo Horie
5a134ecf5b fix bug when mixing keyed and unkeyed elements 2014-09-15 15:53:52 -04:00
Leo Horie
2537bded27 Merge branch 'next' into es6-promise 2014-09-14 22:31:24 -04:00
Leo Horie
7d718a9e76 Merge pull request #242 from Whoaa512/m.module-return-controller
M.module return controller
2014-09-14 00:59:44 -04:00
Leo Horie
7f38eddbf5 Merge branch 'next' into es6-promise 2014-09-14 00:57:21 -04:00
Leo Horie
71ba9edf4e one more test, just to test out a hunch 2014-09-14 00:56:00 -04:00
C. James Winslow
445087c606 changed the tests to expect that m.module returns the instance of module.controller that was passed to it 2014-09-10 16:20:42 -07:00
Leo Horie
499dfe9d4e Merge branch 'next' into es6-promise 2014-09-03 21:15:20 -04:00
Leo Horie
e94db04de1 Merge branch 'next' of github.com:claydotio/zorium.js into claydotio-next
Conflicts:
	mithril.js
	tests/mithril-tests.js
2014-09-03 21:14:14 -04:00
Leo Horie
36999e6f4d enable es6 promise compatibility 2014-09-03 21:12:12 -04:00
Leo Horie
a87e2a1414 small refactoring 2014-09-01 10:42:15 -04:00
Zolmeister
3dc6f1e16c m: Added splat support for m() constructor 2014-08-31 01:22:05 -07:00
Alec Embke
07ff5c9cf8 merged upstream with jsonp additions 2014-08-25 11:09:55 -07:00
Alec Embke
daf8160bf2 added jsonp transport 2014-08-25 10:36:26 -07:00
Juan Manuel Ventura
fd7b3e0803 check store nullity in m.prop 2014-08-22 01:18:36 +02:00
Leo Horie
dbac7f8468 add comments and tests for 219 2014-08-20 18:53:13 -04:00
Leo Horie
808f926d20 add test for #200 2014-08-16 18:04:45 -04:00
Leo Horie
a42dc113a4 fix child caching from undefined to array 2014-08-16 17:56:24 -04:00
Leo Horie
936e2034a7 fix handling of + in parseQuerystring 2014-08-16 17:06:27 -04:00
Zolmeister
774be35cc2 added optional param to m.redraw() to allow forced update 2014-08-13 13:01:21 -07:00
Zolmeister
d567de08a8 promise props resolve to promises instead of blank prop functions 2014-08-13 01:16:03 -07:00
Zolmeister
6b62681da8 promise prop resolution 2014-08-13 00:50:35 -07:00
Zolmeister
7639444aa1 Merge branch 'next' into promises
Conflicts:
	mithril.js
2014-08-13 00:07:34 -07:00
Leo Horie
4281773df9 redraw strategy 2014-08-11 23:15:53 -04:00
Leo Horie
9387820ee7 add test for #194 2014-08-11 20:59:15 -04:00
Leo Horie
e60a9542b2 fix ie8 empty-text-node-in-input issue 2014-08-11 20:54:35 -04:00
Leo Horie
b86c4cec3f fix m.sync resolution when empty array 2014-08-10 21:37:35 -04:00
Leo Horie
da0383cad3 Merge branch 'master' into next
Conflicts:
	tests/mithril-tests.js
2014-08-02 16:09:45 -04:00
Jim Witschey
3160e696df fixes non-browser-based tests 2014-07-28 14:06:14 -04:00
Jim Witschey
6a1ab4e39f adds saucelabs integration to unit tests 2014-07-25 13:35:29 -04:00
Leo Horie
d3c9a28c25 fix console.log calling for non-firebug environments 2014-07-22 16:25:36 -04:00
Zolmeister
54474f5aef nearly Promises/A+ compliant via Promiz.mithril.js 2014-07-22 01:56:07 -07:00
Leo Horie
7295b6e9e9 refactor redraw 2014-07-21 22:08:37 -04:00