- Timestamp:
- 08/09/12 12:25:44 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js
r6959 r6974 233 233 canDiscardActivityDialog = true; 234 234 /** 235 * zebraDiscardActivityDialog éuma flag indicando que uma janela de confirmação (Zebra_Dialog)236 * já está aberta na tela, uma vez que não épossivel acessar o evento ESC utilizado para fechá-la235 * zebraDiscardActivityDialog é uma flag indicando que uma janela de confirmação (Zebra_Dialog) 236 * já está aberta na tela, uma vez que não é possivel acessar o evento ESC utilizado para fechá-la 237 237 */ 238 238 zebraDiscardActivityDialog = false; … … 310 310 }, 311 311 dragStart: function(event, ui) { 312 313 312 if ($('.qtip.qtip-blue.qtip-active').length) 313 $('.qtip.qtip-blue.qtip-active').qtip('destroy'); 314 314 } 315 315 }); … … 419 419 canDiscardActivityDialog = true; 420 420 /* Remove por filtro */ 421 DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objActivity.id], ['=', ' group', objActivity.group], ['=','user',(objActivity.me.user ? objActivity.me.user.id : objActivity.me.id)]]});421 DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objActivity.id], ['=', 'calendar', objActivity.group], ['=','user',(objActivity.me.user ? objActivity.me.user.id : objActivity.me.id)], ['=', 'type', '2']]}); 422 422 Calendar.rerenderView(true); 423 423 /********************/ … … 578 578 }); 579 579 $('.attachment-list input').remove(); 580 $('.row.fileupload-buttonbar .attachments-list p').remove();580 $('.row.fileupload-buttonbar-activity .attachments-list p').remove(); 581 581 } 582 582 }}); … … 598 598 }); 599 599 var maxSizeFile = 2000000; 600 $('#fileupload ').fileupload({600 $('#fileuploadactivity').fileupload({ 601 601 sequentialUploads: true, 602 602 add: function (e, data) { … … 615 615 attach.error = 'Tamanho de arquivo nao permitido!!' 616 616 617 $(' .attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {617 $('div.new-activity-win .attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', { 618 618 file : attach 619 619 })); 620 620 621 621 if(file.size < maxSizeFile){ 622 $(' .fileinput-button.new').append(data.fileInput[0]).removeClass('new');623 $(' .attachments-list').find('[type=file]').addClass('hidden');622 $('div.new-activity-win .fileinput-button.new').append(data.fileInput[0]).removeClass('new'); 623 $('div.new-activity-win .attachments-list').find('[type=file]').addClass('hidden'); 624 624 625 625 }else 626 $(' .fileinput-button.new').removeClass('new');626 $('div.new-activity-win .fileinput-button.new').removeClass('new'); 627 627 628 628 629 $(' .attachments-list').find('.button.close').button({629 $('div.new-activity-win .attachments-list').find('.button.close').button({ 630 630 icons: { 631 631 primary: "ui-icon-close" … … 641 641 }, 642 642 done: function(e, data){ 643 var currentUpload = $(' .progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide();643 var currentUpload = $('div.new-activity-win .progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide(); 644 644 645 645 if(!!data.result && data.result != "[]"){ 646 646 var newAttach = (attch = jQuery.parseJSON(data.result)) ? attch : jQuery.parseJSON(data.result[0].activeElement.childNodes[0].data); 647 $(' .attachment-list').append('<input tyepe="hidden" name="attachment[]" value="'+newAttach['attachment'][0][0].id+'"/>');647 $('div.new-activity-win .attachment-list').append('<input tyepe="hidden" name="attachment[]" value="'+newAttach['attachment'][0][0].id+'"/>'); 648 648 currentUpload.removeClass('on-complete').parents('p') 649 649 .append('<input type="hidden" name="fileId[]" value="'+newAttach['attachment'][0][0].id+'"/>') … … 656 656 657 657 if(!!window.FormData) 658 $('#fileupload ').bind('fileuploadstart', function () {658 $('#fileuploadactivity').bind('fileuploadstart', function () { 659 659 var widget = $(this), 660 progressElement = $('#fileupload-progress ').fadeIn(),660 progressElement = $('#fileupload-progress-activity').fadeIn(), 661 661 interval = 500, 662 662 total = 0,
Note: See TracChangeset
for help on using the changeset viewer.