markus/photofloat
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Sort files before concating them.

Browse Source
This commit is contained in:
Jason A. Donenfeld 2011-05-05 20:18:38 -04:00
parent 0a05eaeb7d
commit 7b968aaf60
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/Makefile
View File

@ -4,8 +4,8 @@ CSS_DIR = css
JS_MIN = $(JS_DIR)/scripts.min.js JS_MIN = $(JS_DIR)/scripts.min.js
CSS_MIN = $(CSS_DIR)/styles.min.css CSS_MIN = $(CSS_DIR)/styles.min.css
JS_MIN_FILES := $(patsubst %.js, %.min.js, $(filter-out %.min.js, $(wildcard $(JS_DIR)/*.js))) JS_MIN_FILES := $(sort $(patsubst %.js, %.min.js, $(filter-out %.min.js, $(wildcard $(JS_DIR)/*.js))))
CSS_MIN_FILES := $(patsubst %.css, %.min.css, $(filter-out %.min.css, $(wildcard $(CSS_DIR)/*.css))) CSS_MIN_FILES := $(sort $(patsubst %.css, %.min.css, $(filter-out %.min.css, $(wildcard $(CSS_DIR)/*.css))))
JS_COMPILER = utils/google-compiler --warning_level QUIET JS_COMPILER = utils/google-compiler --warning_level QUIET
CSS_COMPILER = utils/yuicompressor --type css CSS_COMPILER = utils/yuicompressor --type css

3
web/js/001-debugger.js
View File

@ -0,0 +1,3 @@
$(document).ready(function() {
$("debug").html("Hello!");
});