diff --git a/Makefile b/Makefile index 91aa33d4..973ca013 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ VERSION := $(shell date +%y.%m-%d%H%M%S) -PLAYER_JS := $(wildcard ../player/js/*.js) -EXTRAS_JS := $(wildcard ../player/extras/*.js) +PLAYER_JS := $(wildcard player/js/*.js) +EXTRAS_JS := $(wildcard player/extras/*.js) #MINIFY_OPT += --nomunge @@ -12,7 +12,7 @@ JUICER_OPT += --skip-verification MINIFY := juicer merge $(JUICER_OPT) --arguments "$(MINIFY_OPT)" -AUTOLINT := ../node_modules/autolint/bin/autolint +AUTOLINT := ./node_modules/autolint/bin/autolint MSGFMT := /usr/lib/python2.7/Tools/i18n/msgfmt.py diff --git a/autolint.js b/autolint.js index a7506ce5..828a79c0 100644 --- a/autolint.js +++ b/autolint.js @@ -4,7 +4,7 @@ module.exports = { linterOptions: { onevar: false, // Allow multiple "var" statements forin: false, // For-in statements need not filter - predef: [ "module", "sozi" ] + predef: [ "namespace", "sozi" ] }, excludes: [] };