holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix javascript error when creating an exception

Browse Source
This commit is contained in:
Ralf Becker 2014-10-30 10:24:27 +00:00
parent 5fc79b8de7
commit 2cb639dd9c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
calendar/js/app.js
View File

@ -85,7 +85,7 @@ app.classes.calendar = AppJS.extend(
this._init_sidebox(sidebox); this._init_sidebox(sidebox);
var content = this.et2.getArrayMgr('content'); var content = this.et2.getArrayMgr('content');
switch (_name) switch (_name)
{ {
case 'calendar.list': case 'calendar.list':
@ -101,7 +101,8 @@ app.classes.calendar = AppJS.extend(
{ {
this.set_enddate_visibility(); this.set_enddate_visibility();
this.check_recur_type(); this.check_recur_type();
this.et2.getWidgetById('recur_exception').set_disabled(typeof content.data['recur_exception'][0] == 'undefined'); this.et2.getWidgetById('recur_exception').set_disabled(!content.data.recur_exception ||
typeof content.data.recur_exception[0] == 'undefined');
} }
else else
{ {
@ -175,15 +176,15 @@ app.classes.calendar = AppJS.extend(
{ {
var iframe = parent.jQuery(parent.document).find('.egw_fw_content_browser_iframe'); var iframe = parent.jQuery(parent.document).find('.egw_fw_content_browser_iframe');
var calTab = iframe.parentsUntil(jQuery('.egw_fw_ui_tab_content'),'.egw_fw_ui_tab_content'); var calTab = iframe.parentsUntil(jQuery('.egw_fw_ui_tab_content'),'.egw_fw_ui_tab_content');
if (!calTab.is(':visible')) if (!calTab.is(':visible'))
{ {
// F.F can not handle to style correctly an iframe which is hidden (display:none), therefore we need to // F.F can not handle to style correctly an iframe which is hidden (display:none), therefore we need to
// bind a handler to refresh the calendar views after it shows up // bind a handler to refresh the calendar views after it shows up
iframe.one('show',function(){egw_refresh('','calendar');}) iframe.one('show',function(){egw_refresh('','calendar');})
} }
else else
{ {
//window.location.reload(); //window.location.reload();
window.egw_refresh('refreshing calendar','calendar'); window.egw_refresh('refreshing calendar','calendar');
} }
@ -451,7 +452,7 @@ app.classes.calendar = AppJS.extend(
{ {
// bind on tooltip close event // bind on tooltip close event
$ttp.on("tooltipclose", function (event, ui){ $ttp.on("tooltipclose", function (event, ui){
// bind hover handler on tooltip helper in order to be able to freeze the tooltip and scrolling // bind hover handler on tooltip helper in order to be able to freeze the tooltip and scrolling
ui.tooltip.hover( ui.tooltip.hover(
function () { function () {
var $ttp_helper = jQuery(this); var $ttp_helper = jQuery(this);