Commit f2a14505 authored by catch's avatar catch
Browse files

Issue #1328900 by Rob Loach, amateescu: Update to jQuery 1.7.

parent 7e62a755
......@@ -12,6 +12,8 @@ Drupal 8.0, xxxx-xx-xx (development version)
- Removed the Garland theme from core.
- Universally Unique IDentifier (UUID):
* Support for generating and validating UUIDs.
- JavaScript changes
* Updated to jQuery 1.7
Drupal 7.0, 2011-01-05
......
This diff is collapsed.
......@@ -249,7 +249,9 @@ states.Trigger.states = {
checked: {
'change': function () {
return this.attr('checked');
// Use prop() here as we want a boolean of the checkbox state. See
// http://api.jquery.com/prop/ for more information.
return this.prop('checked');
}
},
......
......@@ -86,7 +86,7 @@ jQuery.fn.fieldUIPopulateOptions = function (options, selected) {
html += '<option value="' + value + '"' + (is_selected ? ' selected="selected"' : '') + '>' + text + '</option>';
});
$(this).html(html).attr('disabled', disabled ? 'disabled' : '');
$(this).html(html).prop('disabled', disabled);
});
};
......
......@@ -1171,7 +1171,7 @@ function system_library_info() {
$libraries['jquery'] = array(
'title' => 'jQuery',
'website' => 'http://jquery.com',
'version' => '1.4.4',
'version' => '1.7.0',
'js' => array(
'core/misc/jquery.js' => array('group' => JS_LIBRARY, 'weight' => -20),
),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment