extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix permanent reload in idots template, when switching to a listview-favorite

Browse Source
This commit is contained in:
Ralf Becker 2014-01-30 18:24:24 +00:00
parent 6f8287a0ed
commit 968d5d6760
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
calendar/js/app.js
View File

@ -142,7 +142,7 @@ app.classes.calendar = AppJS.extend(
drag_n_drop: function() drag_n_drop: function()
{ {
var that = this; var that = this;
//Draggable //Draggable
jQuery("div[id^='drag_']").draggable( jQuery("div[id^='drag_']").draggable(
{ {
@ -195,8 +195,8 @@ app.classes.calendar = AppJS.extend(
} }
}).resizable({ }).resizable({
distance: 10, distance: 10,
/** /**
* Triggered when the resizable is created. * Triggered when the resizable is created.
* *
@ -223,7 +223,7 @@ app.classes.calendar = AppJS.extend(
var resizeHelper = event.target.getAttribute('data-resize'); var resizeHelper = event.target.getAttribute('data-resize');
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");
@ -281,7 +281,7 @@ app.classes.calendar = AppJS.extend(
{ {
/** /**
* Make all draggable calEvents acceptable * Make all draggable calEvents acceptable
* *
*/ */
accept:function() accept:function()
{ {
@ -453,7 +453,7 @@ app.classes.calendar = AppJS.extend(
}); });
}, },
/** /**
* Function to help calendar resizable event, to fetch the right droppable cell * Function to help calendar resizable event, to fetch the right droppable cell
* *
@ -477,7 +477,7 @@ app.classes.calendar = AppJS.extend(
} }
return false; return false;
}, },
/** /**
* Convert AM/PM dateTime format to 24h * Convert AM/PM dateTime format to 24h
* *
@ -512,7 +512,7 @@ app.classes.calendar = AppJS.extend(
} }
return date; return date;
}, },
/** /**
* DropEvent * DropEvent
* *
@ -563,7 +563,7 @@ app.classes.calendar = AppJS.extend(
); );
} }
}, },
/** /**
* open the freetime search popup * open the freetime search popup
* *
@ -1085,7 +1085,7 @@ app.classes.calendar = AppJS.extend(
if (typeof state.state != 'undefined' && state.state.view == 'undefined' || state.state.view == 'listview') if (typeof state.state != 'undefined' && state.state.view == 'undefined' || state.state.view == 'listview')
{ {
// check if we already use et2 / are in listview // check if we already use et2 / are in listview
if (this.et2) if (this.et2 || etemplate2 && etemplate2.getByApplication('calendar'))
{ {
// current calendar-code can set regular calendar states only via a server-request :( // current calendar-code can set regular calendar states only via a server-request :(
// --> check if we only need to set something which can be handeled by nm internally // --> check if we only need to set something which can be handeled by nm internally