From 57ad48d7d7e8bb2ca5c2bdaf5ebb3c93287969ee Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Wed, 27 Apr 2011 19:03:37 +0200 Subject: [PATCH] closing #1148 by removing the transparent background from the spinner. Does not solve the margin of the spinner on the buttons, but that is low prio for now --- public/javascripts/jquery.blockUI.js | 41 +++++++++++++++------------- public/stylesheets/standard.css | 5 +++- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/public/javascripts/jquery.blockUI.js b/public/javascripts/jquery.blockUI.js index fe1144a0..3c111d52 100644 --- a/public/javascripts/jquery.blockUI.js +++ b/public/javascripts/jquery.blockUI.js @@ -1,10 +1,10 @@ -/*! +/*! * jQuery blockUI plugin - * Version 2.36 (16-NOV-2010) + * Version 2.38 (29-MAR-2011) * @requires jQuery v1.2.3 or later * * Examples at: http://malsup.com/jquery/block/ - * Copyright (c) 2007-2008 M. Alsup + * Copyright (c) 2007-2010 M. Alsup * Dual licensed under the MIT and GPL licenses: * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl.html @@ -42,7 +42,7 @@ $.growlUI = function(title, message, timeout, onClose) { $.blockUI({ message: $m, fadeIn: 700, fadeOut: 1000, centerY: false, timeout: timeout, showOverlay: false, - onUnblock: onClose, + onUnblock: onClose, css: $.blockUI.defaults.growlCSS }); }; @@ -65,7 +65,7 @@ $.fn.unblock = function(opts) { }); }; -$.blockUI.version = 2.35; // 2nd generation blocking at no extra cost! +$.blockUI.version = 2.38; // 2nd generation blocking at no extra cost! // override these in your code to change the default behavior and style $.blockUI.defaults = { @@ -74,9 +74,9 @@ $.blockUI.defaults = { title: null, // title string; only used when theme == true draggable: true, // only used when theme == true (requires jquery-ui.js to be loaded) - + theme: false, // set to true to use with jQuery UI themes - + // styles for the message when blocking; if you wish to disable // these and use an external stylesheet then do this in your code: // $.blockUI.defaults.css = {}; @@ -92,7 +92,7 @@ $.blockUI.defaults = { backgroundColor:'#fff', cursor: 'wait' }, - + // minimal style set used when themes are used themedCSS: { width: '30%', @@ -123,7 +123,7 @@ $.blockUI.defaults = { '-moz-border-radius': '10px', 'border-radius': '10px' }, - + // IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w // (hat tip to Jorge H. N. de Vasconcelos) iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank', @@ -167,7 +167,7 @@ $.blockUI.defaults = { // suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity) applyPlatformOpacityRules: true, - + // callback method invoked when fadeIn has completed and blocking message is visible onBlock: null, @@ -224,11 +224,14 @@ function install(el, opts) { // layer2 is the overlay layer which has opacity and a wait cursor (by default) // layer3 is the message content that is displayed while blocking - var lyr1 = ($.browser.msie || opts.forceIframe) + var lyr1 = ($.browser.msie || opts.forceIframe) ? $('') : $(''); - var lyr2 = $(''); - + + var lyr2 = opts.theme + ? $('') + : $(''); + var lyr3, s; if (opts.theme && full) { s = '