Merge pull request mathiasbynens#278 from mathiasbynens/gh-pages

merging to master
tr2v · Nov 13, 2015 · ce26d57 · ce26d57
2 parents 4ca9fad + 81a2c5c
commit ce26d57
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/jquery.placeholder.js b/jquery.placeholder.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery Placeholder Plugin v2.2.0
+ * jQuery Placeholder Plugin v2.3.0
  * https://github.com/mathiasbynens/jquery-placeholder
  *
  * Copyright 2011, 2015 Mathias Bynens
@@ -152,9 +152,21 @@
 
         // Clear placeholder values upon page reload
         $(window).bind('beforeunload.placeholder', function() {
-            $('.'+settings.customClass).each(function() {
-                this.value = '';
-            });
+
+            var clearPlaceholders = true;
+
+            try {
+                // Prevent IE javascript:void(0) anchors from causing cleared values
+                if (document.activeElement.toString() === 'javascript:void(0)') {
+                    clearPlaceholders = false;
+                }
+            } catch (exception) { }
+
+            if (clearPlaceholders) {
+                $('.'+settings.customClass).each(function() {
+                    this.value = '';
+                });
+            }
         });
     }
 

diff --git a/jquery.placeholder.min.js b/jquery.placeholder.min.js
diff --git a/jquery.placeholder.min.js.map b/jquery.placeholder.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-placeholder",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "title": "HTML5 Placeholder jQuery Plugin",
   "description": "A jQuery plugin that enables HTML5 placeholder behavior for browsers that aren’t trying hard enough yet",
   "author": {