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

Gruntfile.js

@@ -1,7 +1,8 @@
 /* eslint-env node */
 module.exports = function (grunt) { // eslint-disable-line
-	var version = "0.2.1"
 
+	var pkg = grunt.file.readJSON("package.json")
+	var currentYear = grunt.template.today("yyyy")
 	var inputFolder = "./docs"
 	var tempFolder = "./temp"
 	var archiveFolder = "./archive"
@@ -72,7 +73,7 @@ module.exports = function (grunt) { // eslint-disable-line
 	makeTasks("guide", guide)
 	makeTasks("api", api)
 
-	var currentVersionArchiveFolder = archiveFolder + "/v" + version
+	var currentVersionArchiveFolder = archiveFolder + "/v" + pkg.version
 
 	grunt.initConfig({
 		// Keep this in sync with the .eslintignore
@@ -107,10 +108,10 @@ module.exports = function (grunt) { // eslint-disable-line
 			options: {
 				banner: [
 					"/*",
-					"Mithril v" + version,
+					pkg.name + " v" + pkg.version,
-					"http://github.com/lhorie/mithril.js",
+					pkg.homepage,
-					"(c) Leo Horie",
+					"(c) 2014-" + currentYear + " " + pkg.author.name,
-					"License: MIT",
+					"License: " + pkg.license,
 					"*/"
 				].join("\n"),
 				sourceMap: true
@@ -135,7 +136,7 @@ module.exports = function (grunt) { // eslint-disable-line
 				force: true,
 				patterns: [
 					{match: /\.md/g, replacement: ".html"},
-					{match: /\$version/g, replacement: version}
+					{match: /\$version/g, replacement: pkg.version}
 				]
 			},
 
@@ -232,7 +233,7 @@ module.exports = function (grunt) { // eslint-disable-line
 				expand: true,
 				cwd: currentVersionArchiveFolder,
 				src: "./**",
-				dest: outputFolder + "/archive/v" + version
+				dest: outputFolder + "/archive/v" + pkg.version
 			}
 		},
 

mithril.js

@@ -1,7 +1,7 @@
 void (function (global, factory) { // eslint-disable-line
 	"use strict"
 	/* eslint-disable no-undef */
-	var m = factory(window)
+	var m = factory(typeof window !== "undefined" ? window : {})
 	if (typeof module === "object" && module != null && module.exports) {
 		module.exports = m
 	} else if (typeof define === "function" && define.amd) {

package.json

@@ -1,11 +1,19 @@
 {
-  "name": "mithril",
+  "name": "Mithril",
   "description": "Mithril.js beta build - use this to help us test the releases before they are released",
   "version": "0.2.1",
+  "homepage": "http://mithril.js.org",
+  "license": "MIT",
+  "author": {
+    "name": "Leo Horie"
+  },
   "repository": {
     "type": "git",
     "url": "git@github.com:lhorie/mithril.js.git"
   },
+  "bugs": {
+    "url" : "http://github.com/lhorie/mithril.js/issues"
+  },
   "scripts": {
     "test": "grunt test"
   },
@@ -33,7 +41,6 @@
     "sinon": "^1.17.2",
     "sinon-chai": "^2.8.0"
   },
-  "license": "MIT",
   "files": [
     "mithril.min.js",
     "mithril.min.js.map",