Monotone-Parent: 9af7f3b786a8f22f5ddae91d7aba838abbd724d5

Monotone-Revision: 6303f532fa4bb3c36fe2f298f62f659c4fc71b18

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-18T19:23:09
This commit is contained in:
Wolfgang Sourdeau 2012-04-18 19:23:09 +00:00
parent 1b99e86910
commit bd982aa4c3
3 changed files with 20 additions and 6 deletions

View file

@ -1,5 +1,10 @@
2012-04-18 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/generic.js (clickEventWrapper): new
function that returns a wrapper function for click callbacks which
invokes "preventDefault" on the "event" parameter before it is
passed to the real callback.
* UI/Scheduler/UIxCalMainActions.m
(-reloadWebCalendarsAndRedirectAction): removed obsolete method.

View file

@ -2473,14 +2473,14 @@ function initCalendarSelector() {
var items = list.childNodesWithTag("li");
for (var i = 0; i < items.length; i++) {
var input = items[i].childNodesWithTag("input")[0];
$(input).observe("click", updateCalendarStatus);
$(input).observe("click", clickEventWrapper(updateCalendarStatus));
}
var links = $("calendarSelectorButtons").childNodesWithTag("a");
$(links[0]).observe("click", onCalendarNew);
$(links[1]).observe("click", onCalendarWebAdd);
$(links[2]).observe("click", onCalendarAdd);
$(links[3]).observe("click", onCalendarRemove);
$(links[0]).observe("click", clickEventWrapper(onCalendarNew));
$(links[1]).observe("click", clickEventWrapper(onCalendarWebAdd));
$(links[2]).observe("click", clickEventWrapper(onCalendarAdd));
$(links[3]).observe("click", clickEventWrapper(onCalendarRemove));
}
function onCalendarSelectionChange(event) {
@ -2699,7 +2699,7 @@ function appendCalendar(folderName, folderPath) {
li.getElementsByTagName("input")[0].checked = true;
// Register event on checkbox
$(checkBox).on("click", updateCalendarStatus);
$(checkBox).on("click", clickEventWrapper(updateCalendarStatus));
var url = URLForFolderID(folderPath) + "/canAccessContent";
triggerAjaxRequest(url, calendarEntryCallback, folderPath);

View file

@ -47,6 +47,15 @@ var removeFolderRequestCount = 0;
// Email validation regexp
var emailRE = /^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i;
function clickEventWrapper(functionRef) {
function button_clickEventWrapper(event) {
preventDefault(event);
return functionRef(event);
}
return button_clickEventWrapper;
}
function createElement(tagName, id, classes,
attributes, htmlAttributes,