fix merge conflict after 0.8.1 release

README.md

@@ -183,6 +183,7 @@ $.modal.defaults = {
  closeClass: '', // Add additional class(es) to the close <a> tag.
  showClose: true, // Shows a (X) icon/link in the top-right corner
  modalClass: "modal", // CSS class added to the element being displayed in the modal.
+ blockerClass: "modal", // CSS class added to the overlay (blocker).
  spinnerHtml: null, // HTML appended to the default spinner during AJAX requests.
  showSpinner: true, // Enable/disable the default spinner during AJAX requests.
  fadeDuration: null, // Number of milliseconds the fade transition takes (null means no transition)

jquery.modal.js

@@ -112,7 +112,7 @@
  block: function() {
  this.$elm.trigger($.modal.BEFORE_BLOCK, [this._ctx()]);
  this.$body.css('overflow','hidden');
- this.$blocker = $('<div class="jquery-modal blocker current"></div>').appendTo(this.$body);
+ this.$blocker = $('<div class="' + this.options.blockerClass + ' blocker current"></div>').appendTo(this.$body);
  selectCurrent();
  if(this.options.doFade) {
  this.$blocker.css('opacity',0).animate({opacity: 1}, this.options.fadeDuration);
@@ -204,6 +204,7 @@
  closeText: 'Close',
  closeClass: '',
  modalClass: "modal",
+ blockerClass: "jquery-modal",
  spinnerHtml: null,
  showSpinner: true,
  showClose: true,