diff --git a/core/includes/theme.inc b/core/includes/theme.inc index f807979..9d90f2c 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -649,7 +649,7 @@ function _theme_build_registry($theme, $base_theme, $theme_engine) { * their base theme), direct sub-themes of sub-themes, etc. The keys are * the themes' machine names, and the values are the themes' human-readable * names. This element is not set if there are no themes on the system that - * declare this theme as their base theme. + * declare this theme as their base theme. */ function list_themes($refresh = FALSE) { $list = &drupal_static(__FUNCTION__, array()); diff --git a/core/misc/jquery.form.js b/core/misc/jquery.form.js index 4c044b4..1d30e89 100644 --- a/core/misc/jquery.form.js +++ b/core/misc/jquery.form.js @@ -49,7 +49,7 @@ $.fn.ajaxSubmit = function(options) { log('ajaxSubmit: skipping submit process - no element selected'); return this; } - + var method, action, url, $form = this; if (typeof options == 'function') { @@ -91,7 +91,7 @@ $.fn.ajaxSubmit = function(options) { if ( traditional === undefined ) { traditional = $.ajaxSettings.traditional; } - + var qx,n,v,a = this.formToArray(options.semantic); if (options.data) { options.extraData = options.data; @@ -143,8 +143,8 @@ $.fn.ajaxSubmit = function(options) { callbacks.push(options.success); } - options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg - var context = options.context || options; // jQuery 1.4+ supports scope context + options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg + var context = options.context || options; // jQuery 1.4+ supports scope context for (var i=0, max=callbacks.length; i < max; i++) { callbacks[i].apply(context, [data, status, xhr || $form, $form]); } @@ -208,7 +208,7 @@ $.fn.ajaxSubmit = function(options) { alert('Error: Form elements must not have name or id of "submit".'); return; } - + s = $.extend(true, {}, $.ajaxSettings, options); s.context = s.context || s; id = 'jqFormIO' + (new Date().getTime()); @@ -280,7 +280,7 @@ $.fn.ajaxSubmit = function(options) { } } } - + var CLIENT_TIMEOUT_ABORT = 1; var SERVER_ABORT = 2; @@ -288,7 +288,7 @@ $.fn.ajaxSubmit = function(options) { var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document; return doc; } - + // take a breath so that pending repaints get some cpu time before the upload starts function doSubmit() { // make sure form attrs are set @@ -315,7 +315,7 @@ $.fn.ajaxSubmit = function(options) { if (s.timeout) { timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout); } - + // look for server aborts function checkState() { try { @@ -905,7 +905,7 @@ $.fn.ajaxSubmit.debug = false; // helper fn for console logging function log() { - if (!$.fn.ajaxSubmit.debug) + if (!$.fn.ajaxSubmit.debug) return; var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,''); if (window.console && window.console.log) { @@ -916,4 +916,5 @@ function log() { } }; -})(jQuery); \ No newline at end of file +})(jQuery); + diff --git a/core/misc/ui/themes/base/jquery.ui.button.css b/core/misc/ui/themes/base/jquery.ui.button.css index 0f3eab4..68114fd 100644 --- a/core/misc/ui/themes/base/jquery.ui.button.css +++ b/core/misc/ui/themes/base/jquery.ui.button.css @@ -11,8 +11,8 @@ .ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; } .ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ -.ui-button-icons-only { width: 3.4em; } -button.ui-button-icons-only { width: 3.7em; } +.ui-button-icons-only { width: 3.4em; } +button.ui-button-icons-only { width: 3.7em; } /*button text element */ .ui-button .ui-button-text { display: block; line-height: 1.4; } @@ -37,3 +37,4 @@ input.ui-button { padding: .4em 1em; } /* workarounds */ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ + diff --git a/core/misc/ui/themes/base/jquery.ui.datepicker.css b/core/misc/ui/themes/base/jquery.ui.datepicker.css index 393d863..0a64c30 100644 --- a/core/misc/ui/themes/base/jquery.ui.datepicker.css +++ b/core/misc/ui/themes/base/jquery.ui.datepicker.css @@ -19,7 +19,7 @@ .ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } .ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } .ui-datepicker select.ui-datepicker-month-year {width: 100%;} -.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year { width: 49%;} .ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } .ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } @@ -65,4 +65,4 @@ left: -4px; /*must have*/ width: 200px; /*must have*/ height: 200px; /*must have*/ -} \ No newline at end of file +} diff --git a/core/modules/filter/tests/filter.url-input.txt b/core/modules/filter/tests/filter.url-input.txt index 7b33af5..d045258 100644 --- a/core/modules/filter/tests/filter.url-input.txt +++ b/core/modules/filter/tests/filter.url-input.txt @@ -30,7 +30,8 @@ The old URL filter has problems with -This is the end! \ No newline at end of file +This is the end! +