diff -r 97b12f5f2c7a -r 9202807b4cec web/static/js/projectscontents.js --- a/web/static/js/projectscontents.js Wed Sep 29 10:10:07 2010 +0200 +++ b/web/static/js/projectscontents.js Tue Oct 12 03:23:33 2010 +0200 @@ -23,45 +23,24 @@ width:1022, bgColor: 'rgb(239, 239, 239)', padding: 5, - titleFromIframe: false + titleFromIframe: false, + beforeHideContent: function(elts, settings, callback){ + try { + var res = $('#ldtInitSwf',$('#nyroModalIframe').contents()); + if(res.length > 0) + { + res.get(0).forceSave(); + } + } + catch(err) + { + // do nothing + } + callback(); + }, + }); - $('.ldt_link_create',base_node).nyroModal({ - type: 'iframe', - forceType: 'iframe', - windowResize: false, - height:680, - width:500, - bgColor: 'rgb(239, 239, 239)', - padding: 5, - titleFromIframe: false, - beforeHideContent: function(elts, settings, callback){ - try { - var res = $('#ldtInitSwf',$('#nyroModalIframe').contents()); - if(res.length > 0) - { - res.get(0).forceSave(); - } - } - catch(err) - { - // do nothing - } - callback(); - }, - endShowContent: function(elts, settings){ - var iframe = $('#nyroModalIframe', elts.content); - iframe.load(function(){ - var swfobject = $(this).contents().find("#ldtInitSwf"); - if (swfobject.length) { - $.nyroModalSettings({ - height: swfobject.height() + 31, - width: swfobject.width() + 21 - }); - } - }); - } - }); $('.ldt_link_embed',base_node).click(function(e) { e.preventDefault(); @@ -130,22 +109,30 @@ if(target.attr('timer')) { clearTimeout(target.attr('timer')); } - - target.attr('timer',setTimeout(function() { - target.next(".searchajaxloader").show(); - target.nextAll(".searchclear").hide(); - var filterVal = "_" + escape(target.realVal()); - url = url.replace('__FILTER__',filterVal); - $(container_selector).load(url, null, function() { - target.next(".searchajaxloader").hide(); - if(target.realVal().length > 0) { - target.nextAll(".searchclear").show(); - } - init_events($(container_selector)); - target.removeAttr('timer'); - }); - }, - 300)); + + target.attr( + 'timer', + setTimeout(function() { + target.next(".searchajaxloader").show(); + target.nextAll(".searchclear").hide(); + var filterVal = "_" + escape(target.realVal()); + url = url.replace('__FILTER__',filterVal); + $.ajax({ + url: url, + cache: false, + success: function(data, status, request) { + $(container_selector).html(data); + target.next(".searchajaxloader").hide(); + if(target.realVal().length > 0) { + target.nextAll(".searchclear").show(); + } + init_events($(container_selector)); + target.removeAttr('timer'); + } + }); + }, + 300) + ); }; @@ -167,7 +154,7 @@ endShowContent: function(elts, settings) { $('#nyroModalIframe', elts.content).load(function() { var form_status = $(this).contents().find("#content_form_status").val(); - if(form_status == 'saved') { + if(form_status == 'saved' || form_status == 'deleted' ) { $.nyroModalRemove(); } }); @@ -183,12 +170,12 @@ padding: 5, titleFromIframe: false, endRemove: function(elts, settings) { - searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url) + searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0); }, endShowContent: function(elts, settings) { $('#nyroModalIframe', elts.content).load(function() { var form_status = $(this).contents().find("#content_form_status").val(); - if(form_status == 'saved') { + if(form_status == 'saved' || form_status == 'deleted') { $.nyroModalRemove(); } }); @@ -199,7 +186,52 @@ } function init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) { - + + $('.ldt_link_create',base_node).nyroModal({ + type: 'iframe', + forceType: 'iframe', + windowResize: false, + height:680, + width:500, + bgColor: 'rgb(239, 239, 239)', + padding: 5, + titleFromIframe: false, + endRemove: function(elts, settings) { + searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0); + }, + beforeHideContent: function(elts, settings, callback){ + try { + var res = $('#ldtInitSwf',$('#nyroModalIframe').contents()); + if(res.length > 0) + { + res.get(0).forceSave(); + } + } + catch(err) + { + // do nothing + } + callback(); + }, + endShowContent: function(elts, settings){ + var iframe = $('#nyroModalIframe', elts.content); + iframe.load(function(){ + var form_status = $(this).contents().find("#project_form_status").val(); + if(form_status == 'saved' || form_status == 'deleted' ) { + $.nyroModalRemove(); + } + var swfobject = $(this).contents().find("#ldtInitSwf"); + if (swfobject.length) { + $.nyroModalSettings({ + height: swfobject.height() + 31, + width: swfobject.width() + 21 + }); + } + }); + } + }); + + $('.publishedproject', base_node).click(function(e) { e.preventDefault(); var target = $(e.target); @@ -234,6 +266,27 @@ }); }); + $('.projecttitlelink').nyroModal({ + type: 'iframe', + forceType: 'iframe', + height:680, + width:500, + bgColor: 'rgb(239, 239, 239)', + padding: 5, + titleFromIframe: false, + endRemove: function(elts, settings) { + searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0); + }, + endShowContent: function(elts, settings) { + $('#nyroModalIframe', elts.content).load(function() { + var form_status = $(this).contents().find("#project_form_status").val(); + if(form_status == 'saved' || form_status == 'deleted') { + $.nyroModalRemove(); + } + }); + } + }); + } function init_events_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {