diff options
| -rw-r--r-- | modules/digibug/helpers/digibug_menu.php | 6 | ||||
| -rw-r--r-- | modules/digibug/js/digibug.js | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php index 4b8db5a2..f1d4fc1d 100644 --- a/modules/digibug/helpers/digibug_menu.php +++ b/modules/digibug/helpers/digibug_menu.php @@ -32,8 +32,7 @@ class digibug_menu { Menu::factory("link") ->id("digibug") ->label(t("Print with Digibug")) - ->url("javascript:digibug_popup('" . - url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')") + ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf")) ->css_id("gDigibugLink")); } @@ -43,8 +42,7 @@ class digibug_menu { Menu::factory("link") ->id("digibug") ->label(t("Print with Digibug")) - ->url("javascript:digibug_popup('" . - url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')") + ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf")) ->css_id("gDigibugLink")); } } diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js index 78ca8cf3..30bff47d 100644 --- a/modules/digibug/js/digibug.js +++ b/modules/digibug/js/digibug.js @@ -1,3 +1,15 @@ +$(document).ready(function() { + $(".gDigibugPrintButton a").click(function(e) { + e.preventDefault(); + return digibug_popup(e.currentTarget.href, { width: 800, height: 600 } ); + }); + + $("#gDigibugLink").click(function(e) { + e.preventDefault(); + return digibug_popup(e.currentTarget.href, { width: 800, height: 600 } ); + }); +}); + function digibug_popup(url, options) { options = $.extend({ /* default options */ |