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 = (]*_loader\.js[^>]*><\/script>|)[^<]* -DEMO_SED = sed -ne '1h;1!H;$${;g;s/$(DEMO_RE)//g;p;}' +DEMO_FILES = $$(cd ${DEMOS_DIR}; find . -mindepth 1 -maxdepth 1 -type f) +DEMO_SUBDIRS = $$(cd ${DEMOS_DIR}; find . -mindepth 1 -maxdepth 1 -type d) +DEMO_RE = \(]*_loader\.js[^>]*><\/script>\|\)\s* +DEMO_SED = sed -n "1h;1!H;\$${;g;s/${DEMO_RE}//g;p;}" -JS_SED = sed -ne "s/[ \t]*js([\"']\(.*\)[\"']).*/\1/p" -CSS_SED = sed -ne "s/[ \t]*css([\"']\(.*\)[\"']).*/\1/p" +JS_SED = sed -n "s/\s*js([\"']\(.*\)[\"']).*/\1/p" +CSS_SED = sed -n "s/\s*css([\"']\(.*\)[\"']).*/\1/p" concat_js = \ - files=$$($(JS_SED) "$(1)/_loader.js"); \ + files=$$(cat "$(1)/_loader.js" | ${JS_SED}); \ if [ -f "$(1)/intro.js" ]; then \ files="intro.js $$files"; \ fi; \ @@ -33,110 +33,76 @@ concat_js = \ files="$$files outro.js"; \ fi; \ old=$$PWD; \ - if ! [ X = "X$$files" ]; then \ - (cd "$(1)"; cat $$files; cd "$$old") \ - | $(VER_SED) \ - | $(DATE_SED) \ - > "$(2)" ; \ - fi + (cd "$(1)"; cat $$files; cd "$$old") \ + | ${VER_SED} \ + | ${DATE_SED} \ + > "$(2)" concat_css = \ - files=$$($(CSS_SED) "$(1)/_loader.js"); \ - if ! [ X = "X$$files" ]; then \ + files=$$(cat "$(1)/_loader.js" | ${CSS_SED}); \ + if [ "$$files" ]; then \ old=$$PWD; \ (cd "$(1)"; cat $$files; cd "$$old") \ | ${VER_SED} \ | ${DATE_SED} \ > "$(2)"; \ fi - -FC_V_DIR = $(BUILD_DIR)/fullcalendar-$(VER) -FC_DIR = $(FC_V_DIR)/fullcalendar -FCJS = $(FC_DIR)/fullcalendar.js -FCCSS = $(FC_DIR)/fullcalendar.css -FCPCSS = $(FC_DIR)/fullcalendar.print.css -FCMJS = $(FC_DIR)/fullcalendar.min.js -JQ_DIR = $(FC_V_DIR)/jquery -DEMOS_DIR = $(FC_V_DIR)/demos -FC_ZIP = $(FC_V_DIR).zip -DIST = $(DIST_DIR)/$(shell basename $(FC_ZIP)) - -.PHONY: all distribute dist -all: distribute -distribute: core plugins jquery demos others - -.PHONY: clean -clean: Makefile - rm -rf $(FC_ZIP) - rm -rf $(FC_V_DIR) - rm -rf $(DIST_DIR) - -$(FC_V_DIR): Makefile - mkdir -p $@ - -$(FC_DIR): - mkdir -p $@ - -$(DEMOS_DIR): - mkdir -p $@ - -$(JQ_DIR): - mkdir -p $@ - -$(DIST_DIR): - mkdir -p $@ - -$(FCJS): $(FC_DIR) - $(call concat_js,$(SRC_DIR),$@) - -$(FCCSS): $(FC_DIR) - $(call concat_css,$(SRC_DIR),$@) - -$(FCPCSS): $(SRC_DIR)/common/print.css $(FC_DIR) - $(VER_SED) $< | $(DATE_SED) > $@ - -.PHONY: core -core: $(FCJS) $(FCCSS) $(FCPCSS) - -$(FCMJS): $(FCJS) - java -jar $(BUILD_DIR)/compiler.jar --warning_level VERBOSE --jscomp_off checkTypes --externs build/externs.js --js $< > $@ - -.PHONY: plugins -plugins: $(FCMJS) core - for loader in $(SRC_DIR)/*/_loader.js; do \ + +zip: + @rm -rf ${BUILD_DIR}/fullcalendar + @rm -rf ${BUILD_DIR}/fullcalendar-* + @mkdir -p ${BUILD_DIR}/fullcalendar/fullcalendar/ + + @echo "building core..." + @$(call concat_js,${SRC_DIR},"${BUILD_DIR}/fullcalendar/fullcalendar/fullcalendar.js") + @$(call concat_css,${SRC_DIR},"${BUILD_DIR}/fullcalendar/fullcalendar/fullcalendar.css") + + @echo "compressing core js..." + @java -jar ${BUILD_DIR}/compiler.jar --warning_level VERBOSE --jscomp_off checkTypes --externs build/externs.js \ + --js ${BUILD_DIR}/fullcalendar/fullcalendar/fullcalendar.js \ + > ${BUILD_DIR}/fullcalendar/fullcalendar/fullcalendar.min.js; \ + + @echo "building plugins..." + @for loader in ${SRC_DIR}/*/_loader.js; do \ dir=`dirname $$loader`; \ name=`basename $$dir`; \ - $(call concat_js,$$dir,$(FC_DIR)/$$name.js); \ + $(call concat_js,$$dir,"${BUILD_DIR}/fullcalendar/fullcalendar/$$name.js"); \ done - -$(JQ_DIR)/$(JQ): lib/$(JQ) $(JQ_DIR) - cp $< $@ - -$(JQ_DIR)/$(JQUI): lib/$(JQUI) $(JQ_DIR) - cp $< $@ - -.PHONY: jquery -jquery: $(JQ_DIR)/$(JQ) $(JQ_DIR)/$(JQUI) - -.PHONY: demos -demos: $(FC_DIR) $(DEMOS_DIR) - for f in $(DEMO_FILES); do \ - cat $(DEMOS_DIR)/$$f \ - | $(DEMO_SED) \ + + @echo "copying jquery..." + @mkdir -p ${BUILD_DIR}/fullcalendar/jquery + @cp lib/${JQ} ${BUILD_DIR}/fullcalendar/jquery + @cp lib/${JQUI} ${BUILD_DIR}/fullcalendar/jquery + + @echo "building demos..." + @mkdir -p ${BUILD_DIR}/fullcalendar/demos + @for f in ${DEMO_FILES}; do \ + cat ${DEMOS_DIR}/$$f \ + | ${DEMO_SED} \ | sed "s/jquery\.js/${JQ}/" \ | sed "s/jquery-ui\.js/${JQUI}/" \ - > $(DEMOS_DIR)/$$f; \ + > ${BUILD_DIR}/fullcalendar/demos/$$f; \ done - for d in $(DEMO_SUBDIRS); do \ - cp -r $(DEMOS_DIR)/$$d $(DEMOS_DIR)/$$d; \ + @for d in ${DEMO_SUBDIRS}; do \ + cp -r ${DEMOS_DIR}/$$d ${BUILD_DIR}/fullcalendar/demos/$$d; \ done + + @echo "copying other files..." + @cp -r ${OTHER_FILES} ${BUILD_DIR}/fullcalendar + + @echo "zipping..." + @mv ${BUILD_DIR}/fullcalendar ${BUILD_DIR}/fullcalendar-${VER} + @cd ${BUILD_DIR}; for f in fullcalendar-*; do \ + zip -q -r $$f.zip $$f; \ + done + @mv ${BUILD_DIR}/fullcalendar-${VER} ${BUILD_DIR}/fullcalendar + + @mkdir -p ${DIST_DIR} + @mv ${BUILD_DIR}/fullcalendar-${VER}.zip ${DIST_DIR} + @echo "done." -.PHONY: others -others: $(FC_DIR) - cp -r $(OTHER_FILES) $(FC_DIR) - -$(FC_ZIP): $(FC_V_DIR) distribute - zip -q -r $@ $< - -$(DIST): $(FC_ZIP) $(DIST_DIR) - mv $@ $< +clean: + @rm -rf ${BUILD_DIR}/fullcalendar + @rm -rf ${BUILD_DIR}/fullcalendar-* + @rm -rf ${DIST_DIR}/* + diff --git a/README.mkd b/README.mkd index 4cf7ba7..0549822 100644 --- a/README.mkd +++ b/README.mkd @@ -45,21 +45,3 @@ Here is an example of doing it within an element having an `id` of `calendar`: }); To see a full list of all available options, please consult the [FullCalendar documentation »](http://arshaw.com/fullcalendar/docs/) - -I18n ----- -To localize fullCalendar You can use i18n for jquery datepicker. - - $.fullCalendar.applyLocale($.datepicker.regional['ru']); - -Other texts could be modified via method setDefaults: - - $.fullCalendar.setDefaults({ - buttonText: { - month: 'month', - week: 'week', - day: 'day' - } - }); - -See all available locales here: [I18n](https://github.com/sergio-fry/fullcalendar/wiki/I18n) diff --git a/changelog.txt b/changelog.txt index 6ea0aaa..6fbf7ee 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,61 +1,5 @@ -version 1.5.2 (8/21/11) - - correctly process UTC "Z" ISO8601 date strings (issue 750) - -version 1.5.1 (4/9/11) - - more flexible ISO8601 date parsing (issue 814) - - more flexible parsing of UNIX timestamps (issue 826) - - FullCalendar now buildable from source on a Mac (issue 795) - - FullCalendar QA'd in FF4 (issue 883) - - upgraded to jQuery 1.5.2 (which supports IE9) and jQuery UI 1.8.11 - -version 1.5 (3/19/11) - - slicker default styling for buttons - - reworked a lot of the calendar's HTML and accompanying CSS - (solves issues 327 and 395) - - more printer-friendly (fullcalendar-print.css) - - fullcalendar now inherits styles from jquery-ui themes differently. - styles for buttons are distinct from styles for calendar cells. - (solves issue 299) - - can now color events through FullCalendar options and Event-Object properties (issue 117) - THIS IS NOW THE PREFERRED METHOD OF COLORING EVENTS (as opposed to using className and CSS) - - FullCalendar options: - - eventColor (changes both background and border) - - eventBackgroundColor - - eventBorderColor - - eventTextColor - - Event-Object options: - - color (changes both background and border) - - backgroundColor - - borderColor - - textColor - - can now specify an event source as an *object* with a `url` property (json feed) or - an `events` property (function or array) with additional properties that will - be applied to the entire event source: - - color (changes both background and border) - - backgroundColor - - borderColor - - textColor - - className - - editable - - allDayDefault - - ignoreTimezone - - startParam (for a feed) - - endParam (for a feed) - - ANY OF THE JQUERY $.ajax OPTIONS - allows for easily changing from GET to POST and sending additional parameters (issue 386) - allows for easily attaching ajax handlers such as `error` (issue 754) - allows for turning caching on (issue 355) - - Google Calendar feeds are now specified differently: - - specify a simple string of your feed's URL - - specify an *object* with a `url` property of your feed's URL. - you can include any of the new Event-Source options in this object. - - the old `$.fullCalendar.gcalFeed` method still works - - no more IE7 SSL popup (issue 504) - - remove `cacheParam` - use json event source `cache` option instead - - latest jquery/jquery-ui - -version 1.4.11 (2/22/11) +version 1.4.11 (1/22/11) - fixed rerenderEvents bug (issue 790) - fixed bug with faulty dragging of events from all-day slot in agenda views - bundled with jquery 1.5 and jquery-ui 1.8.9 diff --git a/demos/agenda-views.html b/demos/agenda-views.html index ca7f8c0..19be2b7 100644 --- a/demos/agenda-views.html +++ b/demos/agenda-views.html @@ -4,7 +4,6 @@ - - -
+
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