Merge pull request #565 from annando/twitter-exception

[friendica-addons.git] / dav / common / wdcal.js

diff --git a/dav/common/wdcal.js b/dav/common/wdcal.js
index 4c14a007184718f9bdf630f62400273c781ad86d..adcaf15f51bcc8504e4b230c8ab158b4c94a6da3 100644 (file)
--- a/dav/common/wdcal.js
+++ b/dav/common/wdcal.js
@@ -42,25 +42,29 @@ function wdcal_edit_recur_recalc() {
 
        var start = $("#cal_start_date").datepicker("getDate");
        $(".rec_month_name").text($.datepicker._defaults.monthNames[start.getMonth()]);
-       $("#rec_yearly_day option[value=bymonthday], #rec_monthly_day option[value=bymonthday]").text($("#rec_yearly_day option[value=bymonthday]").data("orig").replace("#num#", start.getDate()));
+       $("#rec_yearly_day option[value=bymonthday]").text($("#rec_yearly_day option[value=bymonthday]").data("orig").replace("#num#", start.getDate()));
+       $("#rec_monthly_day option[value=bymonthday]").text($("#rec_monthly_day option[value=bymonthday]").data("orig").replace("#num#", start.getDate()));
        var month = new Date(start.getFullYear(), start.getMonth() + 1, 0);
        var monthlast = month.getDate() - start.getDate() + 1;
-       $("#rec_yearly_day option[value=bymonthday_neg], #rec_monthly_day option[value=bymonthday_neg]").text($("#rec_yearly_day option[value=bymonthday_neg]").data("orig").replace("#num#", monthlast));
+       $("#rec_yearly_day option[value=bymonthday_neg]").text($("#rec_yearly_day option[value=bymonthday_neg]").data("orig").replace("#num#", monthlast));
+       $("#rec_monthly_day option[value=bymonthday_neg]").text($("#rec_monthly_day option[value=bymonthday_neg]").data("orig").replace("#num#", monthlast));
        var wk = Math.ceil(start.getDate() / 7);
        var wkname = $.datepicker._defaults.dayNames[start.getDay()];
-       $("#rec_yearly_day option[value=byday], #rec_monthly_day option[value=byday]").text(
-               $("#rec_yearly_day option[value=byday]").data("orig").replace("#num#", wk).replace("#wkday#", wkname)
-       );
+       $("#rec_yearly_day option[value=byday]").text($("#rec_yearly_day option[value=byday]").data("orig").replace("#num#", wk).replace("#wkday#", wkname));
+       $("#rec_monthly_day option[value=byday]").text($("#rec_monthly_day option[value=byday]").data("orig").replace("#num#", wk).replace("#wkday#", wkname));
        var wk_inv = Math.ceil(monthlast / 7);
-       $("#rec_yearly_day option[value=byday_neg], #rec_monthly_day option[value=byday_neg]").text(
-               $("#rec_yearly_day option[value=byday_neg]").data("orig").replace("#num#", wk_inv).replace("#wkday#", wkname)
-       );
+       $("#rec_yearly_day option[value=byday_neg]").text($("#rec_yearly_day option[value=byday_neg]").data("orig").replace("#num#", wk_inv).replace("#wkday#", wkname));
+       $("#rec_monthly_day option[value=byday_neg]").text($("#rec_monthly_day option[value=byday_neg]").data("orig").replace("#num#", wk_inv).replace("#wkday#", wkname));
 }
 
 function wdcal_edit_init(dateFormat, base_path) {
        "use strict";
 
        $("#cal_color").colorPicker();
+       $("#color_override").on("click", function() {
+               if ($("#color_override").prop("checked")) $("#cal_color_holder").show();
+               else $("#cal_color_holder").hide();
+       });
 
        $("#cal_start_time").timePicker({ step: 15 }).on("change", wdcal_edit_checktime_startChanged);
        $("#cal_end_time").timePicker().on("change", wdcal_edit_checktime_endChanged);
@@ -116,6 +120,13 @@ function wdcal_edit_init(dateFormat, base_path) {
                $(this).data("orig", $(this).text());
        });
 
+       $("#new_alarm_adder a").click(function(ev) {
+               $("#new_alarm").val("1");
+               $("#noti_new_row").show();
+               $("#new_alarm_adder").hide();
+               ev.preventDefault();
+       });
+
        wdcal_edit_recur_recalc();
 
        $(document).on("click", ".exception_remover", function(ev) {
@@ -190,4 +201,21 @@ function wdcal_edit_init(dateFormat, base_path) {
                        })
                });
        });
-}
\ No newline at end of file
+}
+
+
+function wdcal_edit_calendars_start(dateFormat, base_path) {
+       "use strict";
+
+       $(".cal_color").colorPicker();
+
+       $(".delete_cal").click(function(ev) {
+               if (!confirm("Do you really want to delete this calendar? All events will be moved to another private calendar.")) ev.preventDefault();
+       });
+
+       $(".calendar_add_caller").click(function(ev) {
+               $(".cal_add_row").show();
+               $(this).parents("div").hide();
+               ev.preventDefault();
+       });
+}