WordPress.org
Get WordPress

Plugin Directory

Changeset 662953


Ignore:
Timestamp:
02/03/2013 10:49:31 PM (13 years ago)
Author:
shockware
Message:

Merge branch 'master' into HEAD

Location:
contact-form-7-datepicker/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • contact-form-7-datepicker/trunk/contact-form-7-datepicker.php

    r645880 r662953  
    55Description: Easily add a date field using jQuery UI's datepicker to your CF7 forms. This plugin depends on Contact Form 7.
    66Author: Aurel Canciu
    7 Version: 2.2
     7Version: 2.2.1
    88Author URI: https://github.com/relu/
    99*/

  • contact-form-7-datepicker/trunk/datepicker.php

    r645880 r662953  
    9090
    9191        $this->options['firstDay'] = get_option('start_of_week');
     92
    9293        $this->options = wp_parse_args((array)$options, $this->options);
    9394        $this->options = apply_filters('cf7_datepicker_options', $this->options);
    … …  
    111112        $selector = ($inline) ? "$('$this->input_name')" : "$('input[name=\"{$this->input_name}\"]')";
    112113
    113         $out  = self::_regionalize($selector);
    114         $out .= "{$selector}.datepicker({$this->options_encode()});\n";
     114        $out  = "{$selector}.datepicker({$this->options_encode()})";
     115        $out .= self::_regionalize();
     116
     117        // Remove watermark class onSelect
     118        $out .= ".datepicker('option', 'onSelect', function(){ $(this).removeClass('watermark'); });\n";
    115119
    116120        $out = "jQuery(function($){ $out });";
    … …  
    128132    }
    129133
    130     private static function _regionalize($selector) {
     134    private static function _regionalize() {
    131135        $regional = self::get_regional_match();
    132136
    … …  
    134138
    135139        if ($regional)
    136             return "{$selector}.datepicker('option', $.datepicker.regional['{$regional}']);";
     140            return ".datepicker('option', $.datepicker.regional['{$regional}'])";
    137141
    138142        return '';

  • contact-form-7-datepicker/trunk/readme.txt

    r645880 r662953  
    44Requires at least: 2.9
    55Tested up to: 3.5
    6 Stable tag: 2.2
     6Stable tag: 2.2.1
    77License: GPLv2 or later
    88License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    3434
    3535== Changelog ==
     36
     37= 2.2.1 =
     38* Added fix for watermark on field update
    3639
    3740= 2.2 =
Note: See TracChangeset for help on using the changeset viewer.