Merge remote-tracking branch 'origin/next' into components

This commit is contained in:
Leo Horie 2015-04-22 20:22:12 -04:00
commit 51d073e414
2 changed files with 3 additions and 3 deletions

View file

@ -700,7 +700,7 @@ var m = (function app(window, undefined) {
var element = arguments[0];
var isInitialized = arguments[1];
var context = arguments[2];
element.href = (m.route.mode !== 'pathname' ? $location.pathname : '') + modes[m.route.mode] + this.attrs.href;
element.href = (m.route.mode !== 'pathname' ? $location.pathname : '') + modes[m.route.mode] + (this.attrs ? this.attrs.href : '');
if (element.addEventListener) {
element.removeEventListener("click", routeUnobtrusive);
element.addEventListener("click", routeUnobtrusive)

4
mithril.min.js vendored

File diff suppressed because one or more lines are too long