2.5.4 Release

LPology · Apr 17, 2016 · 2ebe071 · 2ebe071
1 parent a8ee23e
commit 2ebe071
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,9 @@
 Change Log 
 ============================
+### Version 2.5.4 ###
+SimpleAjaxUploader.js:
+* Added check for parent node inside of `ss.isVisible()` - <a href="https://github.com/LPology/Simple-Ajax-Uploader/issues/160">#160</a>
+
 ### Version 2.5.3 ###
 SimpleAjaxUploader.js:
 * Fixed issue with `dragleave` firing when hovering a child element - <a href="https://github.com/LPology/Simple-Ajax-Uploader/pull/156">#156</a> - (Special thanks to <a href="https://github.com/JulesDoe">JulesDoe</a> for this)

diff --git a/SimpleAjaxUploader.js b/SimpleAjaxUploader.js
@@ -1,6 +1,6 @@
 /**
  * Simple Ajax Uploader
- * Version 2.5.3
+ * Version 2.5.4
  * https://github.com/LPology/Simple-Ajax-Uploader
  *
  * Copyright 2012-2016 LPology, LLC
@@ -391,9 +391,10 @@ ss.isVisible = function( elem ) {
         return true;
     }
 
-    if ( elem.offsetWidth > 0 ||
+    if ( elem && elem.parentNode &&
+        ( elem.offsetWidth > 0 ||
          elem.offsetHeight > 0 ||
-         ss.getStyle( elem, 'display' ).toLowerCase() != 'none' )
+         ss.getStyle( elem, 'display' ).toLowerCase() != 'none' ) )
     {
         return ss.isVisible( elem.parentNode );
     }

diff --git a/SimpleAjaxUploader.min.js b/SimpleAjaxUploader.min.js
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "simple-ajax-uploader",
   "description": "A Javascript plugin for cross-browser Ajax file uploading. Supports drag and drop, CORS, and multiple file uploading with progress bars. Works in IE7-9, mobile, and all modern browsers.",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "main": "SimpleAjaxUploader.js",
   "keywords": [
     "ajax",

diff --git a/extras/Uploader.php b/extras/Uploader.php
@@ -2,7 +2,7 @@
 
 /**
 * Simple Ajax Uploader
-* Version 2.5.3
+* Version 2.5.4
 * https://github.com/LPology/Simple-Ajax-Uploader
 *
 * Copyright 2012-2016 LPology, LLC

diff --git a/extras/cors.php b/extras/cors.php
@@ -2,7 +2,7 @@
 
 /**
 * Simple Ajax Uploader
-* Version 2.5.3
+* Version 2.5.4
 * https://github.com/LPology/Simple-Ajax-Uploader
 *
 * Copyright 2012-2016 LPology, LLC

diff --git a/extras/sessionProgress.php b/extras/sessionProgress.php
@@ -2,7 +2,7 @@
 
 /**
 * Simple Ajax Uploader
-* Version 2.5.3
+* Version 2.5.4
 * https://github.com/LPology/Simple-Ajax-Uploader
 *
 * Copyright 2012-2016 LPology, LLC

diff --git a/extras/uploadProgress.php b/extras/uploadProgress.php
@@ -2,7 +2,7 @@
 
 /**
 * Simple Ajax Uploader
-* Version 2.5.3
+* Version 2.5.4
 * https://github.com/LPology/Simple-Ajax-Uploader
 *
 * Copyright 2012-2016 LPology, LLC

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "simple-ajax-uploader",
   "description": "A Javascript plugin for cross-browser Ajax file uploading. Supports drag and drop, CORS, and multiple file uploading with progress bars. Works in IE7-9, mobile, and all modern browsers.",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "main": "SimpleAjaxUploader.js",
   "keywords": [
     "ajax",