Safari bug fix - Update to self.lastFocus where safari wasn't support…

…ing document.activeElement

README.md

@@ -2,7 +2,7 @@
 
 ***
 
-- Version 0.4.1
+- Version 0.4.2
 - Requires jQuery 1.11.2 or higher (v2 not tested, v3 works but not extensively stress tested).
 - Built by [Humaan](http://www.humaan.com)
 

dist/css/modaal.css

@@ -1,5 +1,5 @@
 /*!
- Modaal - accessible modals - v0.4.1
+ Modaal - accessible modals - v0.4.2
  by Humaan, for all humans.
  http://humaan.com
  */

dist/css/modaal.scss

@@ -1,5 +1,5 @@
 /*!
- Modaal - accessible modals - v0.4.1
+ Modaal - accessible modals - v0.4.2
  by Humaan, for all humans.
  http://humaan.com
  */

dist/js/modaal.js

@@ -1,5 +1,5 @@
 /*!
- Modaal - accessible modals - v0.4.1
+ Modaal - accessible modals - v0.4.2
  by Humaan, for all humans.
  http://humaan.com
  */
@@ -111,7 +111,7 @@
  };
 
  self.lastFocus = null;
-
+ 
  // if is_locked
  if ( self.options.is_locked || self.options.type == 'confirm' || self.options.hide_close ) {
  self.scope.close_btn = '';
@@ -153,7 +153,7 @@
  var source;
 
  // Save last active state before modal
- self.lastFocus = document.activeElement;
+ self.lastFocus = self.$elem;
 
  if ( self.options.should_open === false || ( typeof self.options.should_open === 'function' && self.options.should_open() === false ) ) {
  return;
@@ -670,9 +670,6 @@
  } else {
  // This is only a single gallery item so let's grab the necessary values
 
- // Setup selected image
- console.log(self.scope);
-
  var this_img_src = self.$elem.attr('data-modaal-content-source') ? self.$elem.attr('data-modaal-content-source') : 'trigger requires data-modaal-content-source attribute';
  var this_img_alt_txt = '';
  var this_img_alt = '';

index.html

@@ -94,7 +94,7 @@ <h1><svg class="modaal-logo" viewBox="0 0 108.256 32.294">
  <p>An accessible dialog window plugin for all humans.</p>
  <a href="https://github.com/humaan/Modaal" target="_blank" class="btn btn-download">Download from Github</a>
  <a href="#inline-content" class="btn modaal main-example" data-modaal-type="inline">View Example</a>
- <div class="version" aria-label="Version 0.4.1">v0.4.1</div>
+ <div class="version" aria-label="Version 0.4.2">v0.4.2</div>
  <a href="http://www.humaan.com" target="_blank" class="humaan-project">A Humaan project</a>
 
  <div class="share">

package.json

@@ -1,7 +1,7 @@
 {
  "name": "modaal",
  "description": "An accessible dialog window library for all humans.",
- "version": "0.4.1",
+ "version": "0.4.2",
  "repository": "https://github.com/humaan/Modaal",
  "license": "MIT",
  "main": "dist/js/modaal.js",

source/css/modaal.css

@@ -1,5 +1,5 @@
 /*!
- Modaal - accessible modals - v0.4.1
+ Modaal - accessible modals - v0.4.2
  by Humaan, for all humans.
  http://humaan.com
  */

source/css/modaal.scss

@@ -1,5 +1,5 @@
 /*!
- Modaal - accessible modals - v0.4.1
+ Modaal - accessible modals - v0.4.2
  by Humaan, for all humans.
  http://humaan.com
  */

source/js/modaal.js

@@ -1,5 +1,5 @@
 /*!
- Modaal - accessible modals - v0.4.1
+ Modaal - accessible modals - v0.4.2
  by Humaan, for all humans.
  http://humaan.com
  */
@@ -111,7 +111,7 @@
  };
 
  self.lastFocus = null;
-
+ 
  // if is_locked
  if ( self.options.is_locked || self.options.type == 'confirm' || self.options.hide_close ) {
  self.scope.close_btn = '';
@@ -153,7 +153,7 @@
  var source;
 
  // Save last active state before modal
- self.lastFocus = document.activeElement;
+ self.lastFocus = self.$elem;
 
  if ( self.options.should_open === false || ( typeof self.options.should_open === 'function' && self.options.should_open() === false ) ) {
  return;
@@ -670,9 +670,6 @@
  } else {
  // This is only a single gallery item so let's grab the necessary values
 
- // Setup selected image
- console.log(self.scope);
-
  var this_img_src = self.$elem.attr('data-modaal-content-source') ? self.$elem.attr('data-modaal-content-source') : 'trigger requires data-modaal-content-source attribute';
  var this_img_alt_txt = '';
  var this_img_alt = '';