jquery-placeholder-rails 2.0.7 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c98350a2a4e127c82b99e0d38136b3e0c9872f6
-  data.tar.gz: 6cadd17d9843f8c27c7620b18c923fe7108438f7
+  metadata.gz: fc43a228cf81ad7714e7667e39ce9a15f316ca9d
+  data.tar.gz: d47edb1dcaf700f96ff4c2ca32f16c12533ef4bd
 SHA512:
-  metadata.gz: 33520bc41e3437a303349dbf994fc8e0c887e8e2d3617dec66e515c3dfe6b2e58ca8f6a1cfac4ab9c27edfb82eabeeb7bcbf3249144b7a45baf515546be4c0e3
-  data.tar.gz: e3e7423e70d1c422c01c3195553cd9dcb7d0488c1ec5c13fe99f79ec3b0e9788c2dd67703ab3d4ac6eac93cd1ea61ca8103f2493ee691c86b50fc12d223bdb52
+  metadata.gz: 795770998c968efe8f0512e6bd74069089827154f22ee9d03c97d7a35a1117c4e76cafcd2fd6a4cd2dcd8b1c8525be58bc17cbb225dc69e5a7fc1c7bef98ff0f
+  data.tar.gz: d05069709af725aa85e0a39aed3c11bf1e778f7caf336632108db604ff985d80570a50e020043d239121c08d311657ab46145b288250a33770d1befc36588670

data/lib/jquery-placeholder-rails/version.rb

@@ -1,7 +1,7 @@
 module JQuery
   module Placeholder
     module Rails
-      VERSION = '2.0.7'
+      VERSION = '2.1.2'
     end
   end
 end

data/vendor/assets/javascripts/jquery-placeholder/jquery.placeholder.js

@@ -1,16 +1,28 @@
-/*! http://mths.be/placeholder v2.0.7 by @mathias */
-;(function(window, document, $) {
+/*! http://mths.be/placeholder v2.1.2 by @mathias */
+(function(factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD
+        define(['jquery'], factory);
+    } else if (typeof module === 'object' && module.exports) {
+        factory(require('jquery'));
+    } else {
+        // Browser globals
+        factory(jQuery);
+    }
+}(function($) {
 
-    var isInputSupported = 'placeholder' in document.createElement('input'),
-        isTextareaSupported = 'placeholder' in document.createElement('textarea'),
-        prototype = $.fn,
-        valHooks = $.valHooks,
-        hooks,
-        placeholder;
+    // Opera Mini v7 doesn't support placeholder although its DOM seems to indicate so
+    var isOperaMini = Object.prototype.toString.call(window.operamini) == '[object OperaMini]';
+    var isInputSupported = 'placeholder' in document.createElement('input') && !isOperaMini;
+    var isTextareaSupported = 'placeholder' in document.createElement('textarea') && !isOperaMini;
+    var valHooks = $.valHooks;
+    var propHooks = $.propHooks;
+    var hooks;
+    var placeholder;
 
     if (isInputSupported && isTextareaSupported) {
 
-        placeholder = prototype.placeholder = function() {
+        placeholder = $.fn.placeholder = function() {
             return this;
         };
 
@@ -18,11 +30,17 @@
 
     } else {
 
-        placeholder = prototype.placeholder = function() {
+        var settings = {};
+
+        placeholder = $.fn.placeholder = function(options) {
+
+            var defaults = {customClass: 'placeholder'};
+            settings = $.extend({}, defaults, options);
+
             var $this = this;
             $this
                 .filter((isInputSupported ? 'textarea' : ':input') + '[placeholder]')
-                .not('.placeholder')
+                .not('.'+settings.customClass)
                 .bind({
                     'focus.placeholder': clearPlaceholder,
                     'blur.placeholder': setPlaceholder
@@ -38,21 +56,33 @@
         hooks = {
             'get': function(element) {
                 var $element = $(element);
-                return $element.data('placeholder-enabled') && $element.hasClass('placeholder') ? '' : element.value;
+
+                var $passwordInput = $element.data('placeholder-password');
+                if ($passwordInput) {
+                    return $passwordInput[0].value;
+                }
+
+                return $element.data('placeholder-enabled') && $element.hasClass(settings.customClass) ? '' : element.value;
             },
             'set': function(element, value) {
                 var $element = $(element);
+
+                var $passwordInput = $element.data('placeholder-password');
+                if ($passwordInput) {
+                    return $passwordInput[0].value = value;
+                }
+
                 if (!$element.data('placeholder-enabled')) {
                     return element.value = value;
                 }
-                if (value == '') {
+                if (value === '') {
                     element.value = value;
                     // Issue #56: Setting the placeholder causes problems if the element continues to have focus.
-                    if (element != document.activeElement) {
+                    if (element != safeActiveElement()) {
                         // We can't use `triggerHandler` here because of dummy text/password inputs :(
                         setPlaceholder.call(element);
                     }
-                } else if ($element.hasClass('placeholder')) {
+                } else if ($element.hasClass(settings.customClass)) {
                     clearPlaceholder.call(element, true, value) || (element.value = value);
                 } else {
                     element.value = value;
@@ -62,14 +92,20 @@
             }
         };
 
-        isInputSupported || (valHooks.input = hooks);
-        isTextareaSupported || (valHooks.textarea = hooks);
+        if (!isInputSupported) {
+            valHooks.input = hooks;
+            propHooks.value = hooks;
+        }
+        if (!isTextareaSupported) {
+            valHooks.textarea = hooks;
+            propHooks.value = hooks;
+        }
 
         $(function() {
             // Look for forms
             $(document).delegate('form', 'submit.placeholder', function() {
                 // Clear the placeholder values so they don't get submitted
-                var $inputs = $('.placeholder', this).each(clearPlaceholder);
+                var $inputs = $('.'+settings.customClass, this).each(clearPlaceholder);
                 setTimeout(function() {
                     $inputs.each(setPlaceholder);
                 }, 10);
@@ -78,7 +114,7 @@
 
         // Clear placeholder values upon page reload
         $(window).bind('beforeunload.placeholder', function() {
-            $('.placeholder').each(function() {
+            $('.'+settings.customClass).each(function() {
                 this.value = '';
             });
         });
@@ -87,8 +123,8 @@
 
     function args(elem) {
         // Return an object of element attributes
-        var newAttrs = {},
-            rinlinejQuery = /^jQuery\d+$/;
+        var newAttrs = {};
+        var rinlinejQuery = /^jQuery\d+$/;
         $.each(elem.attributes, function(i, attr) {
             if (attr.specified && !rinlinejQuery.test(attr.name)) {
                 newAttrs[attr.name] = attr.value;
@@ -98,11 +134,11 @@
     }
 
     function clearPlaceholder(event, value) {
-        var input = this,
-            $input = $(input);
-        if (input.value == $input.attr('placeholder') && $input.hasClass('placeholder')) {
+        var input = this;
+        var $input = $(input);
+        if (input.value == $input.attr('placeholder') && $input.hasClass(settings.customClass)) {
             if ($input.data('placeholder-password')) {
-                $input = $input.hide().next().show().attr('id', $input.removeAttr('id').data('placeholder-id'));
+                $input = $input.hide().nextAll('input[type="password"]:first').show().attr('id', $input.removeAttr('id').data('placeholder-id'));
                 // If `clearPlaceholder` was called from `$.valHooks.input.set`
                 if (event === true) {
                     return $input[0].value = value;
@@ -110,30 +146,29 @@
                 $input.focus();
             } else {
                 input.value = '';
-                $input.removeClass('placeholder');
-                input == document.activeElement && input.select();
+                $input.removeClass(settings.customClass);
+                input == safeActiveElement() && input.select();
             }
         }
     }
 
     function setPlaceholder() {
-        var $replacement,
-            input = this,
-            $input = $(input),
-            $origInput = $input,
-            id = this.id;
-        if (input.value == '') {
-            if (input.type == 'password') {
+        var $replacement;
+        var input = this;
+        var $input = $(input);
+        var id = this.id;
+        if (input.value === '') {
+            if (input.type === 'password') {
                 if (!$input.data('placeholder-textinput')) {
                     try {
-                        $replacement = $input.clone().attr({ 'type': 'text' });
+                        $replacement = $input.clone().prop({ 'type': 'text' });
                     } catch(e) {
                         $replacement = $('<input>').attr($.extend(args(this), { 'type': 'text' }));
                     }
                     $replacement
                         .removeAttr('name')
                         .data({
-                            'placeholder-password': true,
+                            'placeholder-password': $input,
                             'placeholder-id': id
                         })
                         .bind('focus.placeholder', clearPlaceholder);
@@ -144,14 +179,22 @@
                         })
                         .before($replacement);
                 }
-                $input = $input.removeAttr('id').hide().prev().attr('id', id).show();
+                $input = $input.removeAttr('id').hide().prevAll('input[type="text"]:first').attr('id', id).show();
                 // Note: `$input[0] != input` now!
             }
-            $input.addClass('placeholder');
+            $input.addClass(settings.customClass);
             $input[0].value = $input.attr('placeholder');
         } else {
-            $input.removeClass('placeholder');
+            $input.removeClass(settings.customClass);
         }
     }
 
-}(this, document, jQuery));
+    function safeActiveElement() {
+        // Avoid IE9 `document.activeElement` of death
+        // https://github.com/mathiasbynens/jquery-placeholder/pull/99
+        try {
+            return document.activeElement;
+        } catch (exception) {}
+    }
+
+}));

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: jquery-placeholder-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.1.2
 platform: ruby
 authors:
 - Navin Peiris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: jQuery Placeholder for the Rails asset pipeline
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,17 +67,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: jQuery Placeholder is a utility used to enable HTML5 placeholder text in