diff options
author | Bharat Mediratta <bharat@menalto.com> | 2009-06-27 15:55:47 -0700 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2009-06-27 15:55:47 -0700 |
commit | 2fbc03437ac6f861f597778964cf01737968bb94 (patch) | |
tree | 2aed23a35b499bac2814e3aeb6356a93008e2fa6 /modules/digibug/js | |
parent | f98b7dc631afc4da595aa149b21b5d38f41afd22 (diff) |
Digibug simplification cleanup. Upgrade digibug module to version 2.
1) Simplify the admin settings page to what most of our users
want. Eliminate basic_ and default_ ids. We just have company_id
and default_id. Advanced users can use advanced settings for now.
2) Fix security in print_photos (didn't get it right in my last commit)
3) Use the regular thumb and full urls if the images are publicly
available to reduce load on the proxy.
4) Simplify proxy expiration code.
5) Eliminate all specialized styles from the admin theme.
Diffstat (limited to 'modules/digibug/js')
-rw-r--r-- | modules/digibug/js/digibug.js | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js index 837c8f7f..456dfecb 100644 --- a/modules/digibug/js/digibug.js +++ b/modules/digibug/js/digibug.js @@ -1,26 +1,25 @@ $(document).ready(function() { $(".gDigibugPrintButton a").click(function(e) { e.preventDefault(); - queue_print(e); + return popUp(e.currentTarget.href, { width: 800, height: 600 } ); }); $("#gDigibugLink").click(function(e) { e.preventDefault(); - return queue_print(e); + return popUp(e.currentTarget.href, { width: 800, height: 600 } ); }); }); function popUp(url, options) { options = $.extend({ /* default options */ - width: 400, - height: 400, target: 'dbPopWin', scrollbars: 'yes', resizable: 'no', menuBar: 'no', - addressBar: 'yes'}, options); + addressBar: 'yes' + }, options); - /* center the window by default. */ + // center the window by default. if (!options.winY) { options.winY = screen.height / 2 - options.height / 2; }; @@ -32,19 +31,15 @@ function popUp(url, options) { url, options['target'], 'width= ' + options.width + - ',height=' + options.height + - ',top=' + options.winY + - ',left=' + options.winX + - ',scrollbars=' + options.scrollbars + - ',resizable=' + options.resizable + - ',menubar=' + options.menuBar + - ',location=' + options.addressBar - ); + ',height=' + options.height + + ',top=' + options.winY + + ',left=' + options.winX + + ',scrollbars=' + options.scrollbars + + ',resizable=' + options.resizable + + ',menubar=' + options.menuBar + + ',location=' + options.addressBar + ); return false; } - -function queue_print(e) { - return popUp(e.currentTarget.href, { width: 800, height: 600 } ); -}; |