Browse Source

update colorbox; prevent snapping on modal open

tags/0.6.0
pairofdimes 15 years ago
parent
commit
20a070ab6c
  1. 4
      interfaces/Plush/templates/static/javascripts/config.js
  2. 6
      interfaces/Plush/templates/static/javascripts/lib.js
  3. 8
      interfaces/Plush/templates/static/javascripts/plush.js

4
interfaces/Plush/templates/static/javascripts/config.js

@ -158,7 +158,7 @@ jQuery(document).ready(function($){
$('#config_content .EntryFieldSet .preview_feed').click(function(event){ $('#config_content .EntryFieldSet .preview_feed').click(function(event){
$.fn.colorbox({ $.fn.colorbox({
href:'test_rss_feed?'+$(event.target).parents('form:first').serialize(), href:'test_rss_feed?'+$(event.target).parents('form:first').serialize(),
width:"80%", height:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7 innerWidth:"80%", innerHeight:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7
}); });
return false; return false;
}); });
@ -177,7 +177,7 @@ jQuery(document).ready(function($){
if(confirm($(event.target).attr('rel'))) { if(confirm($(event.target).attr('rel'))) {
$.fn.colorbox({ $.fn.colorbox({
href:'download_rss_feed?'+$(event.target).parents('form:first').serialize(), href:'download_rss_feed?'+$(event.target).parents('form:first').serialize(),
width:"80%", height:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7 innerWidth:"80%", innerHeight:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7
}); });
} }
return false; return false;

6
interfaces/Plush/templates/static/javascripts/lib.js

File diff suppressed because one or more lines are too long

8
interfaces/Plush/templates/static/javascripts/plush.js

@ -105,11 +105,11 @@ jQuery(function($){
}); });
// modals // modals
$("#add_nzb").colorbox({ inline:true, href:"#add_nzb_modal", title:$("#add_nzb").text(), width:"350px", height:"375px", initialWidth:"350px", initialHeight:"375px", speed:0, opacity:0.7, $("#add_nzb").colorbox({ inline:true, href:"#add_nzb_modal", title:$("#add_nzb").text(), innerWidth:"350px", innerHeight:"375px", initialWidth:"350px", initialHeight:"375px", speed:0, opacity:0.7,
onComplete:function(){ $('#colorbox').addClass('upper'); }, onComplete:function(){ $('#colorbox').addClass('upper'); },
onClosed:function(){ $('#colorbox').removeClass('upper'); }, onClosed:function(){ $('#colorbox').removeClass('upper'); },
}); });
$("#plush_options").colorbox({ inline:true, href:"#plush_options_modal", title:$("#plush_options").text(), width:"275px", height:"275px", initialWidth:"275px", initialHeight:"275px", speed:0, opacity:0.7, $("#plush_options").colorbox({ inline:true, href:"#plush_options_modal", title:$("#plush_options").text(), innerWidth:"275px", innerHeight:"275px", initialWidth:"275px", initialHeight:"275px", speed:0, opacity:0.7,
onComplete:function(){ $('#colorbox').addClass('upper'); }, onComplete:function(){ $('#colorbox').addClass('upper'); },
onClosed:function(){ $('#colorbox').removeClass('upper'); }, onClosed:function(){ $('#colorbox').removeClass('upper'); },
}); });
@ -809,11 +809,11 @@ jQuery(function($){
$('#historyTable').livequery(function() { $('#historyTable').livequery(function() {
// modal for viewing script logs // modal for viewing script logs
$('#historyTable .modal').colorbox({ width:"80%", height:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7 }); $('#historyTable .modal').colorbox({ innerWidth:"80%", innerHeight:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7 });
$("#historyTable .modal-detail").colorbox({ inline:true, $("#historyTable .modal-detail").colorbox({ inline:true,
href: function(){return "#details-"+$(this).parent().parent().attr('id');}, href: function(){return "#details-"+$(this).parent().parent().attr('id');},
title:function(){return $(this).text();}, title:function(){return $(this).text();},
width:"80%", height:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7 }); innerWidth:"80%", innerHeight:"80%", initialWidth:"80%", initialHeight:"80%", speed:0, opacity:0.7 });
// Build pagination only when needed // Build pagination only when needed
if ($.plush.histPerPage=="1") // disabled history if ($.plush.histPerPage=="1") // disabled history

Loading…
Cancel
Save