Merge branch 'master' into gh-pages

Conflicts:
	javascripts/app.js
This commit is contained in:
2016-01-31 15:36:33 +08:00
13 changed files with 443 additions and 238 deletions
+8 -3
View File
@@ -2,13 +2,18 @@ define(
[],
function() {
var constants = {
ENTER_KEY :13
ENTER_KEY :13,
UP_ARROW: 38,
DOWN_ARROW: 40,
BACKSPACE: 8,
TAB: 9,
CNTRL: 17,
};
return constants;
});
});