diff --git a/Makefile b/Makefile index 563348b..18bf987 100644 --- a/Makefile +++ b/Makefile @@ -8,24 +8,24 @@ OTHER_FILES = \ MIT-LICENSE.txt \ GPL-LICENSE.txt -VER = $(shell cat version.txt) -VER_SED = sed s/@VERSION/"$(VER)"/ -DATE = $(shell git log -1 --pretty=format:%ad) -DATE_SED = sed s/@DATE/"$(DATE)"/ +VER = $$(cat version.txt) +VER_SED = sed s/@VERSION/"${VER}"/ +DATE = $$(git log -1 --pretty=format:%ad) +DATE_SED = sed s/@DATE/"${DATE}"/ -JQ = $(shell sed -ne "s/.*JQUERY[ \t]*=[ \t]*[\"']\(.*\)[\"'].*/\1/p" "$(SRC_DIR)/_loader.js") -JQUI = $(shell sed -ne "s/.*JQUERY_UI[ \t]*=[ \t]*[\"']\(.*\)[\"'].*/\1/p" "$(SRC_DIR)/_loader.js") +JQ = $$(sed -n "s/.*JQUERY\s*=\s*[\"']\(.*\)[\"'].*/\1/p" "${SRC_DIR}/_loader.js") +JQUI = $$(sed -n "s/.*JQUERY_UI\s*=\s*[\"']\(.*\)[\"'].*/\1/p" "${SRC_DIR}/_loader.js") -DEMO_FILES = $(shell cd $(DEMOS_DIR); find . -mindepth 1 -maxdepth 1 -type f) -DEMO_SUBDIRS = $(shell cd $(DEMOS_DIR); find . -mindepth 1 -maxdepth 1 -type d) -DEMO_RE = ( - -
- + diff --git a/tests/triggers.html b/tests/triggers.html index 81558f2..2966052 100644 --- a/tests/triggers.html +++ b/tests/triggers.html @@ -52,7 +52,7 @@ //alert(dayDate); console.log('dayClick - ' + dayDate + ', allDay:' + allDay + ' - ' + view.title); //console.log(ev); - console.log(this); + //console.log(this); }, selectable: true, diff --git a/version.txt b/version.txt index 4cda8f1..079d7f6 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.5.2 +1.4.11