diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2011-05-05 20:18:38 -0400 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2011-05-05 20:18:38 -0400 |
| commit | 7b968aaf60603201fbfcdad2bb41953394405772 (patch) | |
| tree | f631908163f72e1c0a077ecd54be4fe0b441ac70 | |
| parent | Add debugger stub and upload ignorer. (diff) | |
| download | PhotoFloat-7b968aaf60603201fbfcdad2bb41953394405772.tar.xz PhotoFloat-7b968aaf60603201fbfcdad2bb41953394405772.zip | |
Sort files before concating them.
| -rw-r--r-- | web/Makefile | 4 | ||||
| -rw-r--r-- | web/js/001-debugger.js | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/web/Makefile b/web/Makefile index 5885fa3..1217206 100644 --- a/web/Makefile +++ b/web/Makefile @@ -4,8 +4,8 @@ CSS_DIR = css JS_MIN = $(JS_DIR)/scripts.min.js CSS_MIN = $(CSS_DIR)/styles.min.css -JS_MIN_FILES := $(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))) +JS_MIN_FILES := $(sort $(patsubst %.js, %.min.js, $(filter-out %.min.js, $(wildcard $(JS_DIR)/*.js)))) +CSS_MIN_FILES := $(sort $(patsubst %.css, %.min.css, $(filter-out %.min.css, $(wildcard $(CSS_DIR)/*.css)))) JS_COMPILER = utils/google-compiler --warning_level QUIET CSS_COMPILER = utils/yuicompressor --type css diff --git a/web/js/001-debugger.js b/web/js/001-debugger.js index e69de29..63e56eb 100644 --- a/web/js/001-debugger.js +++ b/web/js/001-debugger.js @@ -0,0 +1,3 @@ +$(document).ready(function() { + $("debug").html("Hello!"); +});
\ No newline at end of file |