extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 01:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed add event was opened in to big popup when clicking on calendar background, using not egw.open(...,"add") for it

Browse Source
This commit is contained in:
Ralf Becker 2014-02-05 14:32:15 +00:00
parent ae96c5333c
commit 3778191a20
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calendar/js/app.js
View File

@ -224,7 +224,7 @@ app.classes.calendar = AppJS.extend(
var dataResize = resizeHelper.split("|"); var dataResize = resizeHelper.split("|");
var time = dataResize[1].split(":"); var time = dataResize[1].split(":");
this.dropStart = that.resizeHelper(ui.element[0].getBoundingClientRect().left,ui.element[0].getBoundingClientRect().top) this.dropStart = that.resizeHelper(ui.element[0].getBoundingClientRect().left,ui.element[0].getBoundingClientRect().top);
this.dropDate = dataResize[0]+"T"+time[0]+time[1]; this.dropDate = dataResize[0]+"T"+time[0]+time[1];
//$j(this).resizable("option","containment",".calendar_calDayCol"); //$j(this).resizable("option","containment",".calendar_calDayCol");
}, },
@ -439,17 +439,12 @@ app.classes.calendar = AppJS.extend(
{ {
ownerId = 'r' + ownerId; ownerId = 'r' + ownerId;
} }
var date = timestamp[0]; that.egw.open(null, 'calendar', 'add', {
var hour = timestamp[1]; date: timestamp[0],
var minute = timestamp[2]; hour: timestamp[1],
if (ownerId == 0) minute: timestamp[2],
{ owner: ownerId
that.egw.open_link('calendar.calendar_uiforms.edit&date='+date+'&hour='+hour+'&minute='+minute,'_blank','700x700'); }, '_blank');
}
else
{
that.egw.open_link('calendar.calendar_uiforms.edit&date='+date+'&hour='+hour+'&minute='+minute+'&owner='+ownerId,'_blank','700x700');
}
}); });
}, },