Changeset 7983
- Timestamp:
- 03/08/13 18:05:43 (11 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/assetic.php
r7664 r7983 86 86 $compressor->setCharset("ISO-8859-1"); 87 87 88 if (strpos($javaVersion,"java version") !== false){89 $filterManager->set('yui_js', $compressor); 90 $js->ensureFilter($filterManager->get('yui_js')); 91 } 88 /*if (strpos($javaVersion,"java version") !== false){ 89 $filterManager->set('yui_js', $compressor); 90 $js->ensureFilter($filterManager->get('yui_js')); 91 }*/ 92 92 93 93 $jsCache = new AssetCache($js,new FilesystemCache('/tmp')); -
trunk/prototype/modules/calendar/js/helpers.js
r7980 r7983 182 182 183 183 attendees = {}; 184 184 185 if(!!objEvent.participants) 186 { 187 $.each(objEvent.participants ,function(index, value) { 188 var part = DataLayer.get('participant' , value ); 189 var user = DataLayer.get('user' , part.user ); 190 191 attendees[part.user] = user.name; 192 }); 193 } 194 185 195 if(path == undefined) 186 196 path = ""; … … 248 258 text: false 249 259 }).click(function () { 250 DataLayer.remove('participant', $(this).parents('li').find('[type=checkbox]').val()); 260 var participant = DataLayer.get('participant' , $(this).parents('li').find('[type=checkbox]').val()); 261 DataLayer.remove('participant', participant.id); 251 262 if($(this).parent().find('.button.delegate').hasClass('attendee-permissions-change-button')){ 252 263 removeOthers(); … … 256 267 blkAddAtendee.find('option[value=1]').attr('selected','selected').trigger('change'); 257 268 } 258 259 269 $(this).parents('li').remove(); 260 270 261 271 if(blkAddAtendee.find(".attendee-list li").length == 1) 262 272 blkAddAtendee.find("li.not-attendee").removeClass('hidden'); 273 delete attendees[participant.user]; 263 274 }) 264 275 .addClass('tiny disable ui-button-disabled ui-state-disabled') … … 445 456 } 446 457 ); 447 448 449 458 } 450 459 … … 1019 1028 var attendeeHtml = DataLayer.render( path+'templates/attendee_add.ejs', { 1020 1029 event:objEvent 1021 }); 1030 }); 1022 1031 1023 1032 // load template of attendees 1024 1033 var blkAddAtendee = UI.dialogs.addEvent.find('#calendar_addevent_details6').append(attendeeHtml); 1025 if(objEvent.attendee.length) 1034 if(objEvent.attendee.length) 1026 1035 callbackAttendee(); 1027 1036 /**
Note: See TracChangeset
for help on using the changeset viewer.