diff --git a/core/CHANGELOG.txt b/core/CHANGELOG.txt index e9cf5aa..2824c56 100644 --- a/core/CHANGELOG.txt +++ b/core/CHANGELOG.txt @@ -1,4 +1,3 @@ - Drupal 8.0, xxxx-xx-xx (development version) ---------------------- - Added Twig as the default template engine and converted all .tpl.php templates @@ -43,6 +42,7 @@ Drupal 8.0, xxxx-xx-xx (development version) * Poll * Profile * Trigger +- Removed the Overlay module from core. - Removed the Garland theme from core. - Removed the Statistics module's accesslog functionality and reports from core. - Removed backwards-compatibility with 'magic_quotes_gpc'/'magic_quotes_runtime' @@ -52,6 +52,7 @@ Drupal 8.0, xxxx-xx-xx (development version) - JavaScript changes: * Updated to jQuery 2.0.3 * Updated to jQuery UI 1.10.2 + * Removed jquery.bbq - Tremendously improved language support all around. * Great language improvements for users: * Improved language selection with user preference detection in the diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt index 59eb6c5..c863eca 100644 --- a/core/MAINTAINERS.txt +++ b/core/MAINTAINERS.txt @@ -318,9 +318,6 @@ Number module Options module - Yves Chedemois 'yched' http://drupal.org/user/39567 -Overlay module -- ? - Path module - ? diff --git a/core/assets/vendor/jquery-bbq/jquery.ba-bbq.js b/core/assets/vendor/jquery-bbq/jquery.ba-bbq.js deleted file mode 100644 index 1b02aca..0000000 --- a/core/assets/vendor/jquery-bbq/jquery.ba-bbq.js +++ /dev/null @@ -1,1380 +0,0 @@ -/*! - * jQuery BBQ: Back Button & Query Library - v1.3pre - 8/26/2010 - * http://benalman.com/projects/jquery-bbq-plugin/ - * - * Copyright (c) 2010 "Cowboy" Ben Alman - * Dual licensed under the MIT and GPL licenses. - * http://benalman.com/about/license/ - */ - -// Script: jQuery BBQ: Back Button & Query Library -// -// *Version: 1.3pre, Last updated: 8/26/2010* -// -// Project Home - http://benalman.com/projects/jquery-bbq-plugin/ -// GitHub - http://github.com/cowboy/jquery-bbq/ -// Source - http://github.com/cowboy/jquery-bbq/raw/master/jquery.ba-bbq.js -// (Minified) - http://github.com/cowboy/jquery-bbq/raw/master/jquery.ba-bbq.min.js (2.2kb gzipped) -// -// About: License -// -// Copyright (c) 2010 "Cowboy" Ben Alman, -// Dual licensed under the MIT and GPL licenses. -// http://benalman.com/about/license/ -// -// About: Examples -// -// These working examples, complete with fully commented code, illustrate a few -// ways in which this plugin can be used. -// -// Basic AJAX - http://benalman.com/code/projects/jquery-bbq/examples/fragment-basic/ -// Advanced AJAX - http://benalman.com/code/projects/jquery-bbq/examples/fragment-advanced/ -// jQuery UI Tabs - http://benalman.com/code/projects/jquery-bbq/examples/fragment-jquery-ui-tabs/ -// Deparam - http://benalman.com/code/projects/jquery-bbq/examples/deparam/ -// -// About: Support and Testing -// -// Information about what version or versions of jQuery this plugin has been -// tested with, what browsers it has been tested in, and where the unit tests -// reside (so you can test it yourself). -// -// jQuery Versions - 1.2.6, 1.3.2, 1.4.1, 1.4.2 -// Browsers Tested - Internet Explorer 6-8, Firefox 2-4, Chrome 5-6, Safari 3.2-5, -// Opera 9.6-10.60, iPhone 3.1, Android 1.6-2.2, BlackBerry 4.6-5. -// Unit Tests - http://benalman.com/code/projects/jquery-bbq/unit/ -// -// About: Release History -// -// 1.3pre - (8/26/2010) Integrated v1.3, which adds -// document.title and document.domain support in IE6/7, BlackBerry -// support, better Iframe hiding for accessibility reasons, and the new -// "shortcut" method. Added the -// method which reduces the possibility of -// extraneous hashchange event triggering. Added the -// method which can be used to -// enable Google "AJAX Crawlable mode." -// 1.2.1 - (2/17/2010) Actually fixed the stale window.location Safari bug from -// in BBQ, which was the main reason for the -// previous release! -// 1.2 - (2/16/2010) Integrated v1.2, which fixes a -// Safari bug, the event can now be bound before DOM ready, and IE6/7 -// page should no longer scroll when the event is first bound. Also -// added the method, and reworked the -// internal "add" method to be compatible with -// changes made to the jQuery 1.4.2 special events API. -// 1.1.1 - (1/22/2010) Integrated v1.1, which fixes an -// obscure IE8 EmulateIE7 meta tag compatibility mode bug. -// 1.1 - (1/9/2010) Broke out the jQuery BBQ event.special -// functionality into a separate plugin for users who want just the -// basic event & back button support, without all the extra awesomeness -// that BBQ provides. This plugin will be included as part of jQuery BBQ, -// but also be available separately. See -// plugin for more information. Also added the -// method and added additional examples. -// 1.0.3 - (12/2/2009) Fixed an issue in IE 6 where location.search and -// location.hash would report incorrectly if the hash contained the ? -// character. Also and -// will no longer parse params out of a URL that doesn't contain ? or #, -// respectively. -// 1.0.2 - (10/10/2009) Fixed an issue in IE 6/7 where the hidden IFRAME caused -// a "This page contains both secure and nonsecure items." warning when -// used on an https:// page. -// 1.0.1 - (10/7/2009) Fixed an issue in IE 8. Since both "IE7" and "IE8 -// Compatibility View" modes erroneously report that the browser -// supports the native window.onhashchange event, a slightly more -// robust test needed to be added. -// 1.0 - (10/2/2009) Initial release - -(function($,window){ - '$:nomunge'; // Used by YUI compressor. - - // Some convenient shortcuts. - var undefined, - aps = Array.prototype.slice, - decode = decodeURIComponent, - - // Method / object references. - jq_param = $.param, - jq_param_sorted, - jq_param_fragment, - jq_deparam, - jq_deparam_fragment, - jq_bbq = $.bbq = $.bbq || {}, - jq_bbq_pushState, - jq_bbq_getState, - jq_elemUrlAttr, - special = $.event.special, - - // Reused strings. - str_hashchange = 'hashchange', - str_querystring = 'querystring', - str_fragment = 'fragment', - str_elemUrlAttr = 'elemUrlAttr', - str_href = 'href', - str_src = 'src', - - // Reused RegExp. - re_params_querystring = /^.*\?|#.*$/g, - re_params_fragment, - re_fragment, - re_no_escape, - - ajax_crawlable, - fragment_prefix, - - // Used by jQuery.elemUrlAttr. - elemUrlAttr_cache = {}; - - // A few commonly used bits, broken out to help reduce minified file size. - - function is_string( arg ) { - return typeof arg === 'string'; - }; - - // Why write the same function twice? Let's curry! Mmmm, curry.. - - function curry( func ) { - var args = aps.call( arguments, 1 ); - - return function() { - return func.apply( this, args.concat( aps.call( arguments ) ) ); - }; - }; - - // Get location.hash (or what you'd expect location.hash to be) sans any - // leading #. Thanks for making this necessary, Firefox! - function get_fragment( url ) { - return url.replace( re_fragment, '$2' ); - }; - - // Get location.search (or what you'd expect location.search to be) sans any - // leading #. Thanks for making this necessary, IE6! - function get_querystring( url ) { - return url.replace( /(?:^[^?#]*\?([^#]*).*$)?.*/, '$1' ); - }; - - // Section: Param (to string) - // - // Method: jQuery.param.querystring - // - // Retrieve the query string from a URL or if no arguments are passed, the - // current window.location.href. - // - // Usage: - // - // > jQuery.param.querystring( [ url ] ); - // - // Arguments: - // - // url - (String) A URL containing query string params to be parsed. If url - // is not passed, the current window.location.href is used. - // - // Returns: - // - // (String) The parsed query string, with any leading "?" removed. - // - - // Method: jQuery.param.querystring (build url) - // - // Merge a URL, with or without pre-existing query string params, plus any - // object, params string or URL containing query string params into a new URL. - // - // Usage: - // - // > jQuery.param.querystring( url, params [, merge_mode ] ); - // - // Arguments: - // - // url - (String) A valid URL for params to be merged into. This URL may - // contain a query string and/or fragment (hash). - // params - (String) A params string or URL containing query string params to - // be merged into url. - // params - (Object) A params object to be merged into url. - // merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not - // specified, and is as-follows: - // - // * 0: params in the params argument will override any query string - // params in url. - // * 1: any query string params in url will override params in the params - // argument. - // * 2: params argument will completely replace any query string in url. - // - // Returns: - // - // (String) A URL with a urlencoded query string in the format '?a=b&c=d&e=f'. - - // Method: jQuery.param.fragment - // - // Retrieve the fragment (hash) from a URL or if no arguments are passed, the - // current window.location.href. - // - // Usage: - // - // > jQuery.param.fragment( [ url ] ); - // - // Arguments: - // - // url - (String) A URL containing fragment (hash) params to be parsed. If - // url is not passed, the current window.location.href is used. - // - // Returns: - // - // (String) The parsed fragment (hash) string, with any leading "#" removed. - - // Method: jQuery.param.fragment (build url) - // - // Merge a URL, with or without pre-existing fragment (hash) params, plus any - // object, params string or URL containing fragment (hash) params into a new - // URL. - // - // Usage: - // - // > jQuery.param.fragment( url, params [, merge_mode ] ); - // - // Arguments: - // - // url - (String) A valid URL for params to be merged into. This URL may - // contain a query string and/or fragment (hash). - // params - (String) A params string or URL containing fragment (hash) params - // to be merged into url. - // params - (Object) A params object to be merged into url. - // merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not - // specified, and is as-follows: - // - // * 0: params in the params argument will override any fragment (hash) - // params in url. - // * 1: any fragment (hash) params in url will override params in the - // params argument. - // * 2: params argument will completely replace any query string in url. - // - // Returns: - // - // (String) A URL with a urlencoded fragment (hash) in the format '#a=b&c=d&e=f'. - - function jq_param_sub( is_fragment, get_func, url, params, merge_mode ) { - var result, - qs, - matches, - url_params, - hash; - - if ( params !== undefined ) { - // Build URL by merging params into url string. - - // matches[1] = url part that precedes params, not including trailing ?/# - // matches[2] = params, not including leading ?/# - // matches[3] = if in 'querystring' mode, hash including leading #, otherwise '' - matches = url.match( is_fragment ? re_fragment : /^([^#?]*)\??([^#]*)(#?.*)/ ); - - // Get the hash if in 'querystring' mode, and it exists. - hash = matches[3] || ''; - - if ( merge_mode === 2 && is_string( params ) ) { - // If merge_mode is 2 and params is a string, merge the fragment / query - // string into the URL wholesale, without converting it into an object. - qs = params.replace( is_fragment ? re_params_fragment : re_params_querystring, '' ); - - } else { - // Convert relevant params in url to object. - url_params = jq_deparam( matches[2] ); - - params = is_string( params ) - - // Convert passed params string into object. - ? jq_deparam[ is_fragment ? str_fragment : str_querystring ]( params ) - - // Passed params object. - : params; - - qs = merge_mode === 2 ? params // passed params replace url params - : merge_mode === 1 ? $.extend( {}, params, url_params ) // url params override passed params - : $.extend( {}, url_params, params ); // passed params override url params - - // Convert params object into a sorted params string. - qs = jq_param_sorted( qs ); - - // Unescape characters specified via $.param.noEscape. Since only hash- - // history users have requested this feature, it's only enabled for - // fragment-related params strings. - if ( is_fragment ) { - qs = qs.replace( re_no_escape, decode ); - } - } - - // Build URL from the base url, querystring and hash. In 'querystring' - // mode, ? is only added if a query string exists. In 'fragment' mode, # - // is always added. - result = matches[1] + ( is_fragment ? fragment_prefix : qs || !matches[1] ? '?' : '' ) + qs + hash; - - } else { - // If URL was passed in, parse params from URL string, otherwise parse - // params from window.location.href. - result = get_func( url !== undefined ? url : location.href ); - } - - return result; - }; - - jq_param[ str_querystring ] = curry( jq_param_sub, 0, get_querystring ); - jq_param[ str_fragment ] = jq_param_fragment = curry( jq_param_sub, 1, get_fragment ); - - // Method: jQuery.param.sorted - // - // Returns a params string equivalent to that returned by the internal - // jQuery.param method, but sorted, which makes it suitable for use as a - // cache key. - // - // For example, in most browsers jQuery.param({z:1,a:2}) returns "z=1&a=2" - // and jQuery.param({a:2,z:1}) returns "a=2&z=1". Even though both the - // objects being serialized and the resulting params strings are equivalent, - // if these params strings were set into the location.hash fragment - // sequentially, the hashchange event would be triggered unnecessarily, since - // the strings are different (even though the data described by them is the - // same). By sorting the params string, unecessary hashchange event triggering - // can be avoided. - // - // Usage: - // - // > jQuery.param.sorted( obj [, traditional ] ); - // - // Arguments: - // - // obj - (Object) An object to be serialized. - // traditional - (Boolean) Params deep/shallow serialization mode. See the - // documentation at http://api.jquery.com/jQuery.param/ for more detail. - // - // Returns: - // - // (String) A sorted params string. - - jq_param.sorted = jq_param_sorted = function( a, traditional ) { - var arr = [], - obj = {}; - - $.each( jq_param( a, traditional ).split( '&' ), function(i,v){ - var key = v.replace( /(?:%5B|=).*$/, '' ), - key_obj = obj[ key ]; - - if ( !key_obj ) { - key_obj = obj[ key ] = []; - arr.push( key ); - } - - key_obj.push( v ); - }); - - return $.map( arr.sort(), function(v){ - return obj[ v ]; - }).join( '&' ); - }; - - // Method: jQuery.param.fragment.noEscape - // - // Specify characters that will be left unescaped when fragments are created - // or merged using , or when the fragment is modified - // using . This option only applies to serialized data - // object fragments, and not set-as-string fragments. Does not affect the - // query string. Defaults to ",/" (comma, forward slash). - // - // Note that this is considered a purely aesthetic option, and will help to - // create URLs that "look pretty" in the address bar or bookmarks, without - // affecting functionality in any way. That being said, be careful to not - // unescape characters that are used as delimiters or serve a special - // purpose, such as the "#?&=+" (octothorpe, question mark, ampersand, - // equals, plus) characters. - // - // Usage: - // - // > jQuery.param.fragment.noEscape( [ chars ] ); - // - // Arguments: - // - // chars - (String) The characters to not escape in the fragment. If - // unspecified, defaults to empty string (escape all characters). - // - // Returns: - // - // Nothing. - - jq_param_fragment.noEscape = function( chars ) { - chars = chars || ''; - var arr = $.map( chars.split(''), encodeURIComponent ); - re_no_escape = new RegExp( arr.join('|'), 'g' ); - }; - - // A sensible default. These are the characters people seem to complain about - // "uglifying up the URL" the most. - jq_param_fragment.noEscape( ',/' ); - - // Method: jQuery.param.fragment.ajaxCrawlable - // - // TODO: DESCRIBE - // - // Usage: - // - // > jQuery.param.fragment.ajaxCrawlable( [ state ] ); - // - // Arguments: - // - // state - (Boolean) TODO: DESCRIBE - // - // Returns: - // - // (Boolean) The current ajaxCrawlable state. - - jq_param_fragment.ajaxCrawlable = function( state ) { - if ( state !== undefined ) { - if ( state ) { - re_params_fragment = /^.*(?:#!|#)/; - re_fragment = /^([^#]*)(?:#!|#)?(.*)$/; - fragment_prefix = '#!'; - } else { - re_params_fragment = /^.*#/; - re_fragment = /^([^#]*)#?(.*)$/; - fragment_prefix = '#'; - } - ajax_crawlable = !!state; - } - - return ajax_crawlable; - }; - - jq_param_fragment.ajaxCrawlable( 0 ); - - // Section: Deparam (from string) - // - // Method: jQuery.deparam - // - // Deserialize a params string into an object, optionally coercing numbers, - // booleans, null and undefined values; this method is the counterpart to the - // internal jQuery.param method. - // - // Usage: - // - // > jQuery.deparam( params [, coerce ] ); - // - // Arguments: - // - // params - (String) A params string to be parsed. - // coerce - (Boolean) If true, coerces any numbers or true, false, null, and - // undefined to their actual value. Defaults to false if omitted. - // - // Returns: - // - // (Object) An object representing the deserialized params string. - - $.deparam = jq_deparam = function( params, coerce ) { - var obj = {}, - coerce_types = { 'true': !0, 'false': !1, 'null': null }; - - // Iterate over all name=value pairs. - $.each( params.replace( /\+/g, ' ' ).split( '&' ), function(j,v){ - var param = v.split( '=' ), - key = decode( param[0] ), - val, - cur = obj, - i = 0, - - // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it - // into its component parts. - keys = key.split( '][' ), - keys_last = keys.length - 1; - - // If the first keys part contains [ and the last ends with ], then [] - // are correctly balanced. - if ( /\[/.test( keys[0] ) && /\]$/.test( keys[ keys_last ] ) ) { - // Remove the trailing ] from the last keys part. - keys[ keys_last ] = keys[ keys_last ].replace( /\]$/, '' ); - - // Split first keys part into two parts on the [ and add them back onto - // the beginning of the keys array. - keys = keys.shift().split('[').concat( keys ); - - keys_last = keys.length - 1; - } else { - // Basic 'foo' style key. - keys_last = 0; - } - - // Are we dealing with a name=value pair, or just a name? - if ( param.length === 2 ) { - val = decode( param[1] ); - - // Coerce values. - if ( coerce ) { - val = val && !isNaN(val) ? +val // number - : val === 'undefined' ? undefined // undefined - : coerce_types[val] !== undefined ? coerce_types[val] // true, false, null - : val; // string - } - - if ( keys_last ) { - // Complex key, build deep object structure based on a few rules: - // * The 'cur' pointer starts at the object top-level. - // * [] = array push (n is set to array length), [n] = array if n is - // numeric, otherwise object. - // * If at the last keys part, set the value. - // * For each keys part, if the current level is undefined create an - // object or array based on the type of the next keys part. - // * Move the 'cur' pointer to the next level. - // * Rinse & repeat. - for ( ; i <= keys_last; i++ ) { - key = keys[i] === '' ? cur.length : keys[i]; - cur = cur[key] = i < keys_last - ? cur[key] || ( keys[i+1] && isNaN( keys[i+1] ) ? {} : [] ) - : val; - } - - } else { - // Simple key, even simpler rules, since only scalars and shallow - // arrays are allowed. - - if ( $.isArray( obj[key] ) ) { - // val is already an array, so push on the next value. - obj[key].push( val ); - - } else if ( obj[key] !== undefined ) { - // val isn't an array, but since a second value has been specified, - // convert val into an array. - obj[key] = [ obj[key], val ]; - - } else { - // val is a scalar. - obj[key] = val; - } - } - - } else if ( key ) { - // No value was defined, so set something meaningful. - obj[key] = coerce - ? undefined - : ''; - } - }); - - return obj; - }; - - // Method: jQuery.deparam.querystring - // - // Parse the query string from a URL or the current window.location.href, - // deserializing it into an object, optionally coercing numbers, booleans, - // null and undefined values. - // - // Usage: - // - // > jQuery.deparam.querystring( [ url ] [, coerce ] ); - // - // Arguments: - // - // url - (String) An optional params string or URL containing query string - // params to be parsed. If url is omitted, the current - // window.location.href is used. - // coerce - (Boolean) If true, coerces any numbers or true, false, null, and - // undefined to their actual value. Defaults to false if omitted. - // - // Returns: - // - // (Object) An object representing the deserialized params string. - - // Method: jQuery.deparam.fragment - // - // Parse the fragment (hash) from a URL or the current window.location.href, - // deserializing it into an object, optionally coercing numbers, booleans, - // null and undefined values. - // - // Usage: - // - // > jQuery.deparam.fragment( [ url ] [, coerce ] ); - // - // Arguments: - // - // url - (String) An optional params string or URL containing fragment (hash) - // params to be parsed. If url is omitted, the current window.location.href - // is used. - // coerce - (Boolean) If true, coerces any numbers or true, false, null, and - // undefined to their actual value. Defaults to false if omitted. - // - // Returns: - // - // (Object) An object representing the deserialized params string. - - function jq_deparam_sub( is_fragment, url_or_params, coerce ) { - if ( url_or_params === undefined || typeof url_or_params === 'boolean' ) { - // url_or_params not specified. - coerce = url_or_params; - url_or_params = jq_param[ is_fragment ? str_fragment : str_querystring ](); - } else { - url_or_params = is_string( url_or_params ) - ? url_or_params.replace( is_fragment ? re_params_fragment : re_params_querystring, '' ) - : url_or_params; - } - - return jq_deparam( url_or_params, coerce ); - }; - - jq_deparam[ str_querystring ] = curry( jq_deparam_sub, 0 ); - jq_deparam[ str_fragment ] = jq_deparam_fragment = curry( jq_deparam_sub, 1 ); - - // Section: Element manipulation - // - // Method: jQuery.elemUrlAttr - // - // Get the internal "Default URL attribute per tag" list, or augment the list - // with additional tag-attribute pairs, in case the defaults are insufficient. - // - // In the and methods, this list - // is used to determine which attribute contains the URL to be modified, if - // an "attr" param is not specified. - // - // Default Tag-Attribute List: - // - // a - href - // base - href - // iframe - src - // img - src - // input - src - // form - action - // link - href - // script - src - // - // Usage: - // - // > jQuery.elemUrlAttr( [ tag_attr ] ); - // - // Arguments: - // - // tag_attr - (Object) An object containing a list of tag names and their - // associated default attribute names in the format { tag: 'attr', ... } to - // be merged into the internal tag-attribute list. - // - // Returns: - // - // (Object) An object containing all stored tag-attribute values. - - // Only define function and set defaults if function doesn't already exist, as - // the urlInternal plugin will provide this method as well. - $[ str_elemUrlAttr ] || ($[ str_elemUrlAttr ] = function( obj ) { - return $.extend( elemUrlAttr_cache, obj ); - })({ - a: str_href, - base: str_href, - iframe: str_src, - img: str_src, - input: str_src, - form: 'action', - link: str_href, - script: str_src - }); - - jq_elemUrlAttr = $[ str_elemUrlAttr ]; - - // Method: jQuery.fn.querystring - // - // Update URL attribute in one or more elements, merging the current URL (with - // or without pre-existing query string params) plus any params object or - // string into a new URL, which is then set into that attribute. Like - // , but for all elements in a jQuery - // collection. - // - // Usage: - // - // > jQuery('selector').querystring( [ attr, ] params [, merge_mode ] ); - // - // Arguments: - // - // attr - (String) Optional name of an attribute that will contain a URL to - // merge params or url into. See for a list of default - // attributes. - // params - (Object) A params object to be merged into the URL attribute. - // params - (String) A URL containing query string params, or params string - // to be merged into the URL attribute. - // merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not - // specified, and is as-follows: - // - // * 0: params in the params argument will override any params in attr URL. - // * 1: any params in attr URL will override params in the params argument. - // * 2: params argument will completely replace any query string in attr - // URL. - // - // Returns: - // - // (jQuery) The initial jQuery collection of elements, but with modified URL - // attribute values. - - // Method: jQuery.fn.fragment - // - // Update URL attribute in one or more elements, merging the current URL (with - // or without pre-existing fragment/hash params) plus any params object or - // string into a new URL, which is then set into that attribute. Like - // , but for all elements in a jQuery - // collection. - // - // Usage: - // - // > jQuery('selector').fragment( [ attr, ] params [, merge_mode ] ); - // - // Arguments: - // - // attr - (String) Optional name of an attribute that will contain a URL to - // merge params into. See for a list of default - // attributes. - // params - (Object) A params object to be merged into the URL attribute. - // params - (String) A URL containing fragment (hash) params, or params - // string to be merged into the URL attribute. - // merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not - // specified, and is as-follows: - // - // * 0: params in the params argument will override any params in attr URL. - // * 1: any params in attr URL will override params in the params argument. - // * 2: params argument will completely replace any fragment (hash) in attr - // URL. - // - // Returns: - // - // (jQuery) The initial jQuery collection of elements, but with modified URL - // attribute values. - - function jq_fn_sub( mode, force_attr, params, merge_mode ) { - if ( !is_string( params ) && typeof params !== 'object' ) { - // force_attr not specified. - merge_mode = params; - params = force_attr; - force_attr = undefined; - } - - return this.each(function(){ - var that = $(this), - - // Get attribute specified, or default specified via $.elemUrlAttr. - attr = force_attr || jq_elemUrlAttr()[ ( this.nodeName || '' ).toLowerCase() ] || '', - - // Get URL value. - url = attr && that.attr( attr ) || ''; - - // Update attribute with new URL. - that.attr( attr, jq_param[ mode ]( url, params, merge_mode ) ); - }); - - }; - - $.fn[ str_querystring ] = curry( jq_fn_sub, str_querystring ); - $.fn[ str_fragment ] = curry( jq_fn_sub, str_fragment ); - - // Section: History, hashchange event - // - // Method: jQuery.bbq.pushState - // - // Adds a 'state' into the browser history at the current position, setting - // location.hash and triggering any bound callbacks - // (provided the new state is different than the previous state). - // - // If no arguments are passed, an empty state is created, which is just a - // shortcut for jQuery.bbq.pushState( {}, 2 ). - // - // Usage: - // - // > jQuery.bbq.pushState( [ params [, merge_mode ] ] ); - // - // Arguments: - // - // params - (String) A serialized params string or a hash string beginning - // with # to merge into location.hash. - // params - (Object) A params object to merge into location.hash. - // merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not - // specified (unless a hash string beginning with # is specified, in which - // case merge behavior defaults to 2), and is as-follows: - // - // * 0: params in the params argument will override any params in the - // current state. - // * 1: any params in the current state will override params in the params - // argument. - // * 2: params argument will completely replace current state. - // - // Returns: - // - // Nothing. - // - // Additional Notes: - // - // * Setting an empty state may cause the browser to scroll. - // * Unlike the fragment and querystring methods, if a hash string beginning - // with # is specified as the params agrument, merge_mode defaults to 2. - - jq_bbq.pushState = jq_bbq_pushState = function( params, merge_mode ) { - if ( is_string( params ) && /^#/.test( params ) && merge_mode === undefined ) { - // Params string begins with # and merge_mode not specified, so completely - // overwrite window.location.hash. - merge_mode = 2; - } - - var has_args = params !== undefined, - // Merge params into window.location using $.param.fragment. - url = jq_param_fragment( location.href, - has_args ? params : {}, has_args ? merge_mode : 2 ); - - // Set new window.location.href. Note that Safari 3 & Chrome barf on - // location.hash = '#' so the entire URL is set. - location.href = url; - }; - - // Method: jQuery.bbq.getState - // - // Retrieves the current 'state' from the browser history, parsing - // location.hash for a specific key or returning an object containing the - // entire state, optionally coercing numbers, booleans, null and undefined - // values. - // - // Usage: - // - // > jQuery.bbq.getState( [ key ] [, coerce ] ); - // - // Arguments: - // - // key - (String) An optional state key for which to return a value. - // coerce - (Boolean) If true, coerces any numbers or true, false, null, and - // undefined to their actual value. Defaults to false. - // - // Returns: - // - // (Anything) If key is passed, returns the value corresponding with that key - // in the location.hash 'state', or undefined. If not, an object - // representing the entire 'state' is returned. - - jq_bbq.getState = jq_bbq_getState = function( key, coerce ) { - return key === undefined || typeof key === 'boolean' - ? jq_deparam_fragment( key ) // 'key' really means 'coerce' here - : jq_deparam_fragment( coerce )[ key ]; - }; - - // Method: jQuery.bbq.removeState - // - // Remove one or more keys from the current browser history 'state', creating - // a new state, setting location.hash and triggering any bound - // callbacks (provided the new state is different than - // the previous state). - // - // If no arguments are passed, an empty state is created, which is just a - // shortcut for jQuery.bbq.pushState( {}, 2 ). - // - // Usage: - // - // > jQuery.bbq.removeState( [ key [, key ... ] ] ); - // - // Arguments: - // - // key - (String) One or more key values to remove from the current state, - // passed as individual arguments. - // key - (Array) A single array argument that contains a list of key values - // to remove from the current state. - // - // Returns: - // - // Nothing. - // - // Additional Notes: - // - // * Setting an empty state may cause the browser to scroll. - - jq_bbq.removeState = function( arr ) { - var state = {}; - - // If one or more arguments is passed.. - if ( arr !== undefined ) { - - // Get the current state. - state = jq_bbq_getState(); - - // For each passed key, delete the corresponding property from the current - // state. - $.each( $.isArray( arr ) ? arr : arguments, function(i,v){ - delete state[ v ]; - }); - } - - // Set the state, completely overriding any existing state. - jq_bbq_pushState( state, 2 ); - }; - - // Event: hashchange event (BBQ) - // - // Usage in jQuery 1.4 and newer: - // - // In jQuery 1.4 and newer, the event object passed into any hashchange event - // callback is augmented with a copy of the location.hash fragment at the time - // the event was triggered as its event.fragment property. In addition, the - // event.getState method operates on this property (instead of location.hash) - // which allows this fragment-as-a-state to be referenced later, even after - // window.location may have changed. - // - // Note that event.fragment and event.getState are not defined according to - // W3C (or any other) specification, but will still be available whether or - // not the hashchange event exists natively in the browser, because of the - // utility they provide. - // - // The event.fragment property contains the output of - // and the event.getState method is equivalent to the - // method. - // - // > $(window).bind( 'hashchange', function( event ) { - // > var hash_str = event.fragment, - // > param_obj = event.getState(), - // > param_val = event.getState( 'param_name' ), - // > param_val_coerced = event.getState( 'param_name', true ); - // > ... - // > }); - // - // Usage in jQuery 1.3.2: - // - // In jQuery 1.3.2, the event object cannot to be augmented as in jQuery 1.4+, - // so the fragment state isn't bound to the event object and must instead be - // parsed using the and methods. - // - // > $(window).bind( 'hashchange', function( event ) { - // > var hash_str = $.param.fragment(), - // > param_obj = $.bbq.getState(), - // > param_val = $.bbq.getState( 'param_name' ), - // > param_val_coerced = $.bbq.getState( 'param_name', true ); - // > ... - // > }); - // - // Additional Notes: - // - // * Due to changes in the special events API, jQuery BBQ v1.2 or newer is - // required to enable the augmented event object in jQuery 1.4.2 and newer. - // * See for more detailed information. - - special[ str_hashchange ] = $.extend( special[ str_hashchange ], { - - // Augmenting the event object with the .fragment property and .getState - // method requires jQuery 1.4 or newer. Note: with 1.3.2, everything will - // work, but the event won't be augmented) - add: function( handleObj ) { - var old_handler; - - function new_handler(e) { - // e.fragment is set to the value of location.hash (with any leading # - // removed) at the time the event is triggered. - var hash = e[ str_fragment ] = jq_param_fragment(); - - // e.getState() works just like $.bbq.getState(), but uses the - // e.fragment property stored on the event object. - e.getState = function( key, coerce ) { - return key === undefined || typeof key === 'boolean' - ? jq_deparam( hash, key ) // 'key' really means 'coerce' here - : jq_deparam( hash, coerce )[ key ]; - }; - - old_handler.apply( this, arguments ); - }; - - // This may seem a little complicated, but it normalizes the special event - // .add method between jQuery 1.4/1.4.1 and 1.4.2+ - if ( $.isFunction( handleObj ) ) { - // 1.4, 1.4.1 - old_handler = handleObj; - return new_handler; - } else { - // 1.4.2+ - old_handler = handleObj.handler; - handleObj.handler = new_handler; - } - } - - }); - -})(jQuery,this); - -/*! - * jQuery hashchange event - v1.3 - 7/21/2010 - * http://benalman.com/projects/jquery-hashchange-plugin/ - * - * Copyright (c) 2010 "Cowboy" Ben Alman - * Dual licensed under the MIT and GPL licenses. - * http://benalman.com/about/license/ - */ - -// Script: jQuery hashchange event -// -// *Version: 1.3, Last updated: 7/21/2010* -// -// Project Home - http://benalman.com/projects/jquery-hashchange-plugin/ -// GitHub - http://github.com/cowboy/jquery-hashchange/ -// Source - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.js -// (Minified) - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.min.js (0.8kb gzipped) -// -// About: License -// -// Copyright (c) 2010 "Cowboy" Ben Alman, -// Dual licensed under the MIT and GPL licenses. -// http://benalman.com/about/license/ -// -// About: Examples -// -// These working examples, complete with fully commented code, illustrate a few -// ways in which this plugin can be used. -// -// hashchange event - http://benalman.com/code/projects/jquery-hashchange/examples/hashchange/ -// document.domain - http://benalman.com/code/projects/jquery-hashchange/examples/document_domain/ -// -// About: Support and Testing -// -// Information about what version or versions of jQuery this plugin has been -// tested with, what browsers it has been tested in, and where the unit tests -// reside (so you can test it yourself). -// -// jQuery Versions - 1.2.6, 1.3.2, 1.4.1, 1.4.2 -// Browsers Tested - Internet Explorer 6-8, Firefox 2-4, Chrome 5-6, Safari 3.2-5, -// Opera 9.6-10.60, iPhone 3.1, Android 1.6-2.2, BlackBerry 4.6-5. -// Unit Tests - http://benalman.com/code/projects/jquery-hashchange/unit/ -// -// About: Known issues -// -// While this jQuery hashchange event implementation is quite stable and -// robust, there are a few unfortunate browser bugs surrounding expected -// hashchange event-based behaviors, independent of any JavaScript -// window.onhashchange abstraction. See the following examples for more -// information: -// -// Chrome: Back Button - http://benalman.com/code/projects/jquery-hashchange/examples/bug-chrome-back-button/ -// Firefox: Remote XMLHttpRequest - http://benalman.com/code/projects/jquery-hashchange/examples/bug-firefox-remote-xhr/ -// WebKit: Back Button in an Iframe - http://benalman.com/code/projects/jquery-hashchange/examples/bug-webkit-hash-iframe/ -// Safari: Back Button from a different domain - http://benalman.com/code/projects/jquery-hashchange/examples/bug-safari-back-from-diff-domain/ -// -// Also note that should a browser natively support the window.onhashchange -// event, but not report that it does, the fallback polling loop will be used. -// -// About: Release History -// -// 1.3 - (7/21/2010) Reorganized IE6/7 Iframe code to make it more -// "removable" for mobile-only development. Added IE6/7 document.title -// support. Attempted to make Iframe as hidden as possible by using -// techniques from http://www.paciellogroup.com/blog/?p=604. Added -// support for the "shortcut" format $(window).hashchange( fn ) and -// $(window).hashchange() like jQuery provides for built-in events. -// Renamed jQuery.hashchangeDelay to and -// lowered its default value to 50. Added -// and properties plus document-domain.html -// file to address access denied issues when setting document.domain in -// IE6/7. -// 1.2 - (2/11/2010) Fixed a bug where coming back to a page using this plugin -// from a page on another domain would cause an error in Safari 4. Also, -// IE6/7 Iframe is now inserted after the body (this actually works), -// which prevents the page from scrolling when the event is first bound. -// Event can also now be bound before DOM ready, but it won't be usable -// before then in IE6/7. -// 1.1 - (1/21/2010) Incorporated document.documentMode test to fix IE8 bug -// where browser version is incorrectly reported as 8.0, despite -// inclusion of the X-UA-Compatible IE=EmulateIE7 meta tag. -// 1.0 - (1/9/2010) Initial Release. Broke out the jQuery BBQ event.special -// window.onhashchange functionality into a separate plugin for users -// who want just the basic event & back button support, without all the -// extra awesomeness that BBQ provides. This plugin will be included as -// part of jQuery BBQ, but also be available separately. - -(function($,window,undefined){ - '$:nomunge'; // Used by YUI compressor. - - // Reused string. - var str_hashchange = 'hashchange', - - // Method / object references. - doc = document, - fake_onhashchange, - special = $.event.special, - - // Does the browser support window.onhashchange? Note that IE8 running in - // IE7 compatibility mode reports true for 'onhashchange' in window, even - // though the event isn't supported, so also test document.documentMode. - doc_mode = doc.documentMode, - supports_onhashchange = 'on' + str_hashchange in window && ( doc_mode === undefined || doc_mode > 7 ); - - // Get location.hash (or what you'd expect location.hash to be) sans any - // leading #. Thanks for making this necessary, Firefox! - function get_fragment( url ) { - url = url || location.href; - return '#' + url.replace( /^[^#]*#?(.*)$/, '$1' ); - }; - - // Method: jQuery.fn.hashchange - // - // Bind a handler to the window.onhashchange event or trigger all bound - // window.onhashchange event handlers. This behavior is consistent with - // jQuery's built-in event handlers. - // - // Usage: - // - // > jQuery(window).hashchange( [ handler ] ); - // - // Arguments: - // - // handler - (Function) Optional handler to be bound to the hashchange - // event. This is a "shortcut" for the more verbose form: - // jQuery(window).bind( 'hashchange', handler ). If handler is omitted, - // all bound window.onhashchange event handlers will be triggered. This - // is a shortcut for the more verbose - // jQuery(window).trigger( 'hashchange' ). These forms are described in - // the section. - // - // Returns: - // - // (jQuery) The initial jQuery collection of elements. - - // Allow the "shortcut" format $(elem).hashchange( fn ) for binding and - // $(elem).hashchange() for triggering, like jQuery does for built-in events. - $.fn[ str_hashchange ] = function( fn ) { - return fn ? this.bind( str_hashchange, fn ) : this.trigger( str_hashchange ); - }; - - // Property: jQuery.fn.hashchange.delay - // - // The numeric interval (in milliseconds) at which the - // polling loop executes. Defaults to 50. - - // Property: jQuery.fn.hashchange.domain - // - // If you're setting document.domain in your JavaScript, and you want hash - // history to work in IE6/7, not only must this property be set, but you must - // also set document.domain BEFORE jQuery is loaded into the page. This - // property is only applicable if you are supporting IE6/7 (or IE8 operating - // in "IE7 compatibility" mode). - // - // In addition, the property must be set to the - // path of the included "document-domain.html" file, which can be renamed or - // modified if necessary (note that the document.domain specified must be the - // same in both your main JavaScript as well as in this file). - // - // Usage: - // - // jQuery.fn.hashchange.domain = document.domain; - - // Property: jQuery.fn.hashchange.src - // - // If, for some reason, you need to specify an Iframe src file (for example, - // when setting document.domain as in ), you can - // do so using this property. Note that when using this property, history - // won't be recorded in IE6/7 until the Iframe src file loads. This property - // is only applicable if you are supporting IE6/7 (or IE8 operating in "IE7 - // compatibility" mode). - // - // Usage: - // - // jQuery.fn.hashchange.src = 'path/to/file.html'; - - $.fn[ str_hashchange ].delay = 50; - /* - $.fn[ str_hashchange ].domain = null; - $.fn[ str_hashchange ].src = null; - */ - - // Event: hashchange event - // - // Fired when location.hash changes. In browsers that support it, the native - // HTML5 window.onhashchange event is used, otherwise a polling loop is - // initialized, running every milliseconds to - // see if the hash has changed. In IE6/7 (and IE8 operating in "IE7 - // compatibility" mode), a hidden Iframe is created to allow the back button - // and hash-based history to work. - // - // Usage as described in : - // - // > // Bind an event handler. - // > jQuery(window).hashchange( function(e) { - // > var hash = location.hash; - // > ... - // > }); - // > - // > // Manually trigger the event handler. - // > jQuery(window).hashchange(); - // - // A more verbose usage that allows for event namespacing: - // - // > // Bind an event handler. - // > jQuery(window).bind( 'hashchange', function(e) { - // > var hash = location.hash; - // > ... - // > }); - // > - // > // Manually trigger the event handler. - // > jQuery(window).trigger( 'hashchange' ); - // - // Additional Notes: - // - // * The polling loop and Iframe are not created until at least one handler - // is actually bound to the 'hashchange' event. - // * If you need the bound handler(s) to execute immediately, in cases where - // a location.hash exists on page load, via bookmark or page refresh for - // example, use jQuery(window).hashchange() or the more verbose - // jQuery(window).trigger( 'hashchange' ). - // * The event can be bound before DOM ready, but since it won't be usable - // before then in IE6/7 (due to the necessary Iframe), recommended usage is - // to bind it inside a DOM ready handler. - - // Override existing $.event.special.hashchange methods (allowing this plugin - // to be defined after jQuery BBQ in BBQ's source code). - special[ str_hashchange ] = $.extend( special[ str_hashchange ], { - - // Called only when the first 'hashchange' event is bound to window. - setup: function() { - // If window.onhashchange is supported natively, there's nothing to do.. - if ( supports_onhashchange ) { return false; } - - // Otherwise, we need to create our own. And we don't want to call this - // until the user binds to the event, just in case they never do, since it - // will create a polling loop and possibly even a hidden Iframe. - $( fake_onhashchange.start ); - }, - - // Called only when the last 'hashchange' event is unbound from window. - teardown: function() { - // If window.onhashchange is supported natively, there's nothing to do.. - if ( supports_onhashchange ) { return false; } - - // Otherwise, we need to stop ours (if possible). - $( fake_onhashchange.stop ); - } - - }); - - // fake_onhashchange does all the work of triggering the window.onhashchange - // event for browsers that don't natively support it, including creating a - // polling loop to watch for hash changes and in IE 6/7 creating a hidden - // Iframe to enable back and forward. - fake_onhashchange = (function(){ - var self = {}, - timeout_id, - - // Remember the initial hash so it doesn't get triggered immediately. - last_hash = get_fragment(), - - fn_retval = function(val){ return val; }, - history_set = fn_retval, - history_get = fn_retval; - - // Start the polling loop. - self.start = function() { - timeout_id || poll(); - }; - - // Stop the polling loop. - self.stop = function() { - timeout_id && clearTimeout( timeout_id ); - timeout_id = undefined; - }; - - // This polling loop checks every $.fn.hashchange.delay milliseconds to see - // if location.hash has changed, and triggers the 'hashchange' event on - // window when necessary. - function poll() { - var hash = get_fragment(), - history_hash = history_get( last_hash ); - - if ( hash !== last_hash ) { - history_set( last_hash = hash, history_hash ); - - $(window).trigger( str_hashchange ); - - } else if ( history_hash !== last_hash ) { - location.href = location.href.replace( /#.*/, '' ) + history_hash; - } - - timeout_id = setTimeout( poll, $.fn[ str_hashchange ].delay ); - }; - - // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv - // vvvvvvvvvvvvvvvvvvv REMOVE IF NOT SUPPORTING IE6/7/8 vvvvvvvvvvvvvvvvvvv - // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv - // FIX: jQuery 1.9 dropped $.browser, this detects IE 6/7/8 with fallback - ( $.browser ? $.browser.msie : ( $.support ? $.support.leadingWhitespace == false : null ) ) - //$.browser.msie - && !supports_onhashchange && (function(){ - // Not only do IE6/7 need the "magical" Iframe treatment, but so does IE8 - // when running in "IE7 compatibility" mode. - - var iframe, - iframe_src; - - // When the event is bound and polling starts in IE 6/7, create a hidden - // Iframe for history handling. - self.start = function(){ - if ( !iframe ) { - iframe_src = $.fn[ str_hashchange ].src; - iframe_src = iframe_src && iframe_src + get_fragment(); - - // Create hidden Iframe. Attempt to make Iframe as hidden as possible - // by using techniques from http://www.paciellogroup.com/blog/?p=604. - iframe = $(''; - } -}); - -})(jQuery, Drupal, Drupal.displace, drupalSettings); diff --git a/core/modules/overlay/overlay.api.php b/core/modules/overlay/overlay.api.php deleted file mode 100644 index bc23546..0000000 --- a/core/modules/overlay/overlay.api.php +++ /dev/null @@ -1,40 +0,0 @@ -#overlay=admin/modules on hook_init(). - $_SESSION['overlay_enable_redirect'] = 1; - } -} - -/** - * Implements hook_update_dependencies(). - */ -function overlay_update_dependencies() { - // Migrate users.data after User module prepared the tables. - $dependencies['overlay'][8000] = array( - 'user' => 8016, - ); - return $dependencies; -} - -/** - * Migrate {users}.data into {users_data}. - */ -function overlay_update_8000() { - $query = db_select('_d7_users_data', 'ud'); - $query->condition('name', 'overlay'); - $query->addField('ud', 'uid'); - $query->addExpression("'overlay'", 'module'); - $query->addExpression("'enabled'", 'name'); - $query->addField('ud', 'value', 'value'); - $query->addExpression(1, 'serialized'); - - db_insert('users_data') - ->from($query) - ->execute(); - - // Migrate 'overlay_message_dismissed'. - $query = db_select('_d7_users_data', 'ud'); - $query->condition('name', 'overlay_message_dismissed'); - $query->addField('ud', 'uid'); - $query->addExpression("'overlay'", 'module'); - $query->addExpression("'message_dismissed'", 'name'); - $query->addField('ud', 'value', 'value'); - $query->addExpression(1, 'serialized'); - - db_insert('users_data') - ->from($query) - ->execute(); - - db_delete('_d7_users_data') - ->condition('name', array('overlay', 'overlay_message_dismissed')) - ->execute(); -} diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module deleted file mode 100644 index 81279c1..0000000 --- a/core/modules/overlay/overlay.module +++ /dev/null @@ -1,845 +0,0 @@ -' . t('About') . ''; - $output .= '

' . t('The Overlay module uses JavaScript to open administration pages in an overlay of the page you were viewing when you clicked the administrative link, instead of replacing the page in your browser window. This ensures that you return to the page you were viewing once you close the overlay, even if you have visited several administration pages. For more information, see the online documentation for the Overlay module.', array('!overlay' => 'https://drupal.org/documentation/modules/overlay')) . '

'; - $output .= '
'; - $output .= '
' . t('Disabling the overlay for individual users') . '
'; - $output .= '
' . t('Users can individually disable the overlay functionality on their Profile page.') . '
'; - $output .= '
'; - return $output; - } -} - -/** - * Implements hook_admin_paths(). - */ -function overlay_admin_paths() { - $paths = array( - // This is marked as an administrative path so that if it is visited from - // within the overlay, the user will stay within the overlay while the - // callback is being processed. - 'overlay/dismiss-message' => TRUE, - ); - return $paths; -} - -/** - * Implements hook_permission(). - */ -function overlay_permission() { - return array( - 'access overlay' => array( - 'title' => t('Access the administrative overlay'), - 'description' => t('View administrative pages in the overlay.'), - ), - ); -} - -/** - * Implements hook_theme(). - */ -function overlay_theme() { - return array( - 'overlay' => array( - 'render element' => 'page', - 'template' => 'overlay', - ), - 'overlay_disable_message' => array( - 'render element' => 'element', - 'template' => 'overlay-disable-message', - ), - ); -} - -/** - * Implements hook_field_extra_fields(). - */ -function overlay_field_extra_fields() { - $fields['user']['user']['form']['overlay_control'] = array( - 'label' => t('Administrative overlay'), - 'description' => t('Overlay module form element.'), - 'weight' => 4, - ); - return $fields; -} - -/** - * Implements hook_form_FORM_ID_alter(). - */ -function overlay_form_user_form_alter(&$form, &$form_state) { - $account = $form_state['controller']->getEntity(); - if ($account->hasPermission('access overlay')) { - $account_data = \Drupal::service('user.data')->get('overlay', $account->id(), 'enabled'); - $form['overlay_control'] = array( - '#type' => 'details', - '#title' => t('Administrative overlay'), - '#weight' => 4, - ); - $form['overlay_control']['overlay'] = array( - '#type' => 'checkbox', - '#title' => t('Use the overlay for administrative pages.'), - '#description' => t('Show administrative pages on top of the page you started from.'), - '#default_value' => isset($account_data) ? $account_data : 1, - ); - $form['actions']['submit']['#submit'][] = 'overlay_user_profile_form_submit'; - } -} - -/** - * Submit callback for the user profile form to save the overlay page setting. - */ -function overlay_user_profile_form_submit($form, &$form_state) { - $account = $form_state['controller']->getEntity(); - if ($account->id() && isset($form_state['values']['overlay'])) { - \Drupal::service('user.data')->set('overlay', $account->id(), 'enabled', (int) $form_state['values']['overlay']); - } -} - -/** - * Implements hook_library_info(). - */ -function overlay_library_info() { - $module_path = drupal_get_path('module', 'overlay'); - - // Overlay parent. - $libraries['drupal.overlay.parent'] = array( - 'title' => 'Overlay: Parent', - 'website' => 'http://drupal.org/documentation/modules/overlay', - 'version' => '1.0', - 'js' => array( - $module_path . '/overlay-parent.js' => array(), - ), - 'css' => array( - $module_path . '/css/overlay-parent.css' => array(), - ), - 'dependencies' => array( - array('system', 'jquery'), - array('system', 'drupal'), - array('system', 'drupalSettings'), - array('system', 'drupal.displace'), - array('system', 'drupal.tabbingmanager'), - array('system', 'drupal.announce'), - array('system', 'jquery.ui.core'), - array('system', 'jquery.bbq'), - ), - ); - // Overlay child. - $libraries['drupal.overlay.child'] = array( - 'title' => 'Overlay: Child', - 'website' => 'http://drupal.org/documentation/modules/overlay', - 'version' => '1.0', - 'js' => array( - $module_path . '/overlay-child.js' => array(), - ), - 'css' => array( - $module_path . '/css/overlay-child.css' => array(), - ), - 'dependencies' => array( - array('system', 'jquery'), - array('system', 'drupal'), - array('system', 'drupalSettings'), - array('system', 'jquery.once'), - ), - ); - - return $libraries; -} - -/** - * Implements hook_batch_alter(). - * - * If the current page request is inside the overlay, add ?render=overlay to - * the success callback URL, so that it appears correctly within the overlay. - * - * @see overlay_get_mode() - */ -function overlay_batch_alter(&$batch) { - if (overlay_get_mode() == 'child') { - if (isset($batch['url_options']['query'])) { - $batch['url_options']['query']['render'] = 'overlay'; - } - else { - $batch['url_options']['query'] = array('render' => 'overlay'); - } - } -} - -/** - * Implements hook_page_alter(). - */ -function overlay_page_alter(&$page) { - // If we are limiting rendering to a subset of page regions, deny access to - // all other regions so that they will not be processed. - if ($regions_to_render = overlay_get_regions_to_render()) { - $skipped_regions = array_diff(element_children($page), $regions_to_render); - foreach ($skipped_regions as $skipped_region) { - $page[$skipped_region]['#access'] = FALSE; - } - } - - $mode = overlay_get_mode(); - if ($mode == 'child') { - // Add the overlay wrapper before the html wrapper. - array_unshift($page['#theme_wrappers'], 'overlay'); - } - elseif ($mode == 'parent' && ($message = overlay_disable_message())) { - $page['page_top']['disable_overlay'] = $message; - } -} - -/** - * Returns a renderable array representing a message for disabling the overlay. - * - * If the current user can access the overlay and has not previously indicated - * that this message should be dismissed, this function returns a message - * containing a link to disable the overlay. Nothing is returned for anonymous - * users, because the links control per-user settings. Because some screen - * readers are unable to properly read overlay contents, site builders are - * discouraged from granting the "access overlay" permission to the anonymous - * role. - * - * @see http://drupal.org/node/890284 - */ -function overlay_disable_message() { - $user = \Drupal::currentUser(); - - $build = array(); - if ($user->isAnonymous() || !$user->hasPermission('access overlay')) { - return $build; - } - - $user_data = \Drupal::service('user.data')->get('overlay', $user->id()); - if (empty($user_data['message_dismissed']) && (!isset($user_data['enabled']) || $user_data['enabled'])) { - $build = array( - '#theme' => 'overlay_disable_message', - '#weight' => -99, - // Link to the user's profile page, where the overlay can be disabled. - 'profile_link' => array( - '#type' => 'link', - '#title' => t('If you have problems accessing administrative pages on this site, disable the overlay on your profile page.'), - '#href' => 'user/' . $user->id() . '/edit', - '#options' => array( - 'query' => drupal_get_destination(), - 'fragment' => 'edit-overlay-control', - 'attributes' => array( - 'id' => 'overlay-profile-link', - // Prevent the target page from being opened in the overlay. - 'class' => array('overlay-exclude'), - ), - ), - ), - // Link to a menu callback that allows this message to be permanently - // dismissed for the current user. - 'dismiss_message_link' => array( - '#type' => 'link', - '#title' => t('Dismiss this message.'), - '#href' => 'overlay/dismiss-message', - '#options' => array( - 'query' => drupal_get_destination() + array( - // Add a token to protect against cross-site request forgeries. - 'token' => drupal_get_token('overlay'), - ), - 'attributes' => array( - 'id' => 'overlay-dismiss-message', - // If this message is being displayed outside the overlay, prevent - // this link from opening the overlay. - 'class' => (overlay_get_mode() == 'parent') ? array('overlay-exclude') : array(), - ), - ), - ) - ); - } - - return $build; -} - -/** - * Prepares variables for overlay disable message templates. - * - * Default template: overlay-disable-message.html.twig. - * - * @param array $variables - * An associative array with an 'element' element, which itself is an - * associative array containing: - * - profile_link: The link to this user's account. - * - dismiss_message_link: The link to dismiss the overlay. - */ -function template_preprocess_overlay_disable_message(&$variables) { - $element = $variables['element']; - - // Add CSS classes to hide the links from most sighted users, while keeping - // them accessible to screen-reader users and keyboard-only users. To assist - // screen-reader users, this message appears in both the parent and child - // documents, but only the one in the child document is part of the tab order. - foreach (array('profile_link', 'dismiss_message_link') as $key) { - $element[$key]['#options']['attributes']['class'][] = 'visually-hidden'; - if (overlay_get_mode() == 'child') { - $element[$key]['#options']['attributes']['class'][] = 'focusable'; - } - } - - $variables['profile_link'] = $element['profile_link']; - $variables['dismiss_link'] = $element['dismiss_message_link']; -} - -/** - * Implements hook_block_access(). - */ -function overlay_block_access(Block $block, $operation, AccountInterface $account, $langcode) { - // If we are limiting rendering to a subset of page regions, hide all blocks - // which appear in regions not on that list. Note that overlay_page_alter() - // does a more comprehensive job of preventing unwanted regions from being - // displayed (regardless of whether they contain blocks or not), but the - // reason for duplicating effort here is performance; we do not even want - // these blocks to be built if they are not going to be displayed. - if ($regions_to_render = overlay_get_regions_to_render()) { - if (!in_array($block->get('region'), $regions_to_render)) { - return FALSE; - } - } -} - -/** - * Implements hook_system_info_alter(). - * - * Add default regions for the overlay. - */ -function overlay_system_info_alter(&$info, $file, $type) { - if ($type == 'theme') { - $info['overlay_regions'][] = 'content'; - $info['overlay_regions'][] = 'help'; - } -} - -/** - * Implements hook_preprocess_HOOK() for HTML document templates. - * - * If the current page request is inside the overlay, add appropriate classes - * to the element, and simplify the page title. - * - * @see overlay_get_mode() - */ -function overlay_preprocess_html(&$variables) { - if (overlay_get_mode() == 'child') { - // Add overlay class, so themes can react to being displayed in the overlay. - $variables['attributes']['class'][] = 'overlay'; - } -} - -/** - * Implements hook_preprocess_HOOK() for maintenance page templates. - * - * If the current page request is inside the overlay, add appropriate classes - * to the element, and simplify the page title. - */ -function overlay_preprocess_maintenance_page(&$variables) { - overlay_preprocess_html($variables); -} - -/** - * Prepares variables for overlay templates. - * - * Default template: overlay.html.twig. - * - * If the current page request is inside the overlay, add appropriate classes - * to the element, and simplify the page title. - * - * @param array $variables - * An associative array containing: - * - page: A render element representing the page. - */ -function template_preprocess_overlay(&$variables) { - $variables['tabs'] = menu_primary_local_tasks(); - - if (isset($variables['page']['#title'])) { - $variables['title'] = $variables['page']['#title']; - } - else { - $variables['title'] = new RenderWrapper('drupal_get_title'); - } - $variables['disable_overlay'] = overlay_disable_message(); - - // Add attributes for the overlay container. - $variables['attributes']['id'] = 'overlay'; - $variables['attributes']['class'][] = 'overlay'; - // Add attributes for the overlay title. - $variables['title_attributes']['id'] = 'overlay-title'; - // Add attributes for the overlay content. - $variables['content_attributes']['id'] = 'overlay-content'; - $variables['content_attributes']['class'][] = 'clearfix'; -} - -/** - * Implements hook_preprocess_HOOK() for page templates. - * - * If the current page request is inside the overlay, hide the tabs. - * - * @see overlay_get_mode() - */ -function overlay_preprocess_page(&$variables) { - if (overlay_get_mode() == 'child') { - unset($variables['tabs']['#primary']); - } -} - -/** - * Prints an empty page. - * - * This function is used to print out a bare minimum empty page which still has - * the scripts and styles necessary in order to trigger the overlay to close. - * - * It can be used to prevent a page request which closes the overlay (for - * example, a form submission) from being fully re-rendered before the overlay - * is closed, thereby allowing the dialog to be closed faster and with less - * interruption, and also allowing the display of messages to be deferred to - * the parent window (rather than displaying them in the child window, which - * will close before the user has had a chance to read them). - * - * @return \Symfony\Component\HttpFoundation\Response - * A Response object. - */ -function overlay_deliver_empty_page() { - $empty_page = '' . drupal_get_css() . drupal_get_js() . ''; - return new Response($empty_page); -} - -/** - * Gets the current overlay mode. - * - * @see overlay_set_mode() - */ -function overlay_get_mode() { - return overlay_set_mode(NULL); -} - -/** - * Sets the overlay mode and adds proper JavaScript and styles to the page. - * - * Note that since setting the overlay mode triggers a variety of behaviors - * (including hooks being invoked), it can only be done once per page request. - * Therefore, the first call to this function which passes along a value of the - * $mode parameter controls the overlay mode that will be used. - * - * @param $mode - * To set the mode, pass in one of the following values: - * - 'parent': This is used in the context of a parent window (a regular - * browser window). If set, JavaScript is added so that administrative - * links in the parent window will open in an overlay. - * - 'child': This is used in the context of the child overlay window (the - * page actually appearing within the overlay iframe). If set, JavaScript - * and CSS are added so that Drupal behaves nicely from within the overlay. - * - 'none': This is used to avoid adding any overlay-related code to the - * page at all. Modules can set this to explicitly prevent the overlay from - * being used. For example, since the overlay module itself sets the mode - * to 'parent' or 'child' in the overlay event subscriber when certain - * conditions are met, other modules which want to override that behavior - * can do so by setting the mode to 'none' earlier in the page request - - * e.g., in their own event subscribers, if they have a higher priority. - * This parameter is optional, and if omitted, the current mode will be - * returned with no action taken. - * - * @return - * The current mode, if any has been set, or NULL if no mode has been set. - * - * @ingroup overlay_api - * @see \Drupal\overlay\EventSubscriber\OverlaySubscriber::onRequest() - */ -function overlay_set_mode($mode = NULL) { - // We're not using drupal_static() here since the static cache is reset in - // drupal_flush_all_caches(); this could lead to the loss of the overlay when - // submitting the admin/modules form, for instance. - static $overlay_mode; - - // Make sure external resources are not included more than once. Also return - // the current mode, if no mode was specified. - if (isset($overlay_mode) || !isset($mode)) { - return $overlay_mode; - } - $overlay_mode = $mode; - - switch ($overlay_mode) { - case 'parent': - drupal_add_library('overlay', 'drupal.overlay.parent'); - - // Allow modules to act upon overlay events. - \Drupal::moduleHandler()->invokeAll('overlay_parent_initialize'); - break; - - case 'child': - drupal_add_library('overlay', 'drupal.overlay.child'); - - // Allow modules to act upon overlay events. - \Drupal::moduleHandler()->invokeAll('overlay_child_initialize'); - break; - } - return $overlay_mode; -} - -/** - * Implements hook_overlay_parent_initialize(). - */ -function overlay_overlay_parent_initialize() { - // Let the client side know which paths are administrative. - $paths = path_get_admin_paths(); - foreach ($paths as &$type) { - $type = str_replace('', \Drupal::config('system.site')->get('page.front'), $type); - } - drupal_add_js(array('overlay' => array('paths' => $paths)), 'setting'); - $path_prefixes = array(); - if (\Drupal::moduleHandler()->moduleExists('language')) { - language_negotiation_include(); - if (\Drupal::config('language.negotiation')->get('url.source') == LANGUAGE_NEGOTIATION_URL_PREFIX) { - // Skip the empty string indicating the default language. We always accept - // paths without a prefix. - $path_prefixes = language_negotiation_url_prefixes(); - $path_prefixes = array_values(array_filter($path_prefixes)); - } - } - drupal_add_js(array('overlay' => array('pathPrefixes' => $path_prefixes)), 'setting'); - // Pass along the Ajax callback for rerendering sections of the parent window. - drupal_add_js(array('overlay' => array('ajaxCallback' => 'overlay-ajax')), 'setting'); -} - -/** - * Implements hook_overlay_child_initialize(). - */ -function overlay_overlay_child_initialize() { - // Check if the parent window needs to refresh any page regions on this page - // request. - overlay_trigger_refresh(); - // If this is a POST request, or a GET request with a token parameter, we - // have an indication that something in the supplemental regions of the - // overlay might change during the current page request. We therefore store - // the initial rendered content of those regions here, so that we can compare - // it to the same content rendered in OverlaySubscriber::onResponse(), - // at the end of the page request. This allows us to check if anything - // actually did change, and, if so, trigger an immediate Ajax refresh - // of the parent window. - $token = \Drupal::request()->query->get('token'); - $post = \Drupal::request()->request->count(); - if (!empty($post) || isset($token)) { - foreach (overlay_supplemental_regions() as $region) { - overlay_store_rendered_content($region, overlay_render_region($region)); - } - // In addition, notify the parent window that when the overlay closes, - // the entire parent window should be refreshed. - overlay_request_page_refresh(); - } - // Indicate that when the main page rendering occurs later in the page - // request, only the regions that appear within the overlay should be - // rendered. - overlay_set_regions_to_render(overlay_regions()); -} - -/** - * Immediately returns HTML to to the browser and closes the overlay. - * - * @param $redirect - * (optional) The path that should open in the parent window after the - * overlay closes. If not set, no redirect will be performed on the parent - * window. - * - * @param $redirect_options - * (optional) An associative array of options to use when generating the - * redirect URL. - * - * @return \Symfony\Component\HttpFoundation\Response - * A Response object. - * - * @todo This function should only request that the overlay close when the page - * is displayed (as it did in Drupal 7), not immediately end the request. - */ -function overlay_close_dialog($redirect = NULL, $redirect_options = array()) { - $settings = array( - 'overlayChild' => array( - 'closeOverlay' => TRUE, - ), - ); - - // Tell the child window to perform the redirection when requested to. - if (isset($redirect)) { - $settings['overlayChild']['redirect'] = url($redirect, $redirect_options); - } - - drupal_add_js($settings, array('type' => 'setting')); - - // Since we are closing the overlay as soon as the page is displayed, we do - // not want to show any of the page's actual content. - return overlay_deliver_empty_page(); -} - -/** - * Returns a list of page regions that appear in the overlay. - * - * Overlay regions correspond to the entire contents of the overlay child - * window and are refreshed each time a new page request is made within the - * overlay. - * - * @return - * An array of region names that correspond to those which appear in the - * overlay, within the theme that is being used to display the current page. - * - * @see overlay_supplemental_regions() - */ -function overlay_regions() { - return _overlay_region_list('overlay_regions'); -} - -/** - * Returns a list of supplemental page regions for the overlay. - * - * Supplemental overlay regions are those which are technically part of the - * parent window, but appear to the user as being related to the overlay - * (usually because they are displayed next to, rather than underneath, the - * main overlay regions) and therefore need to be dynamically refreshed if any - * administrative actions taken within the overlay change their contents. - * - * An example of a typical overlay supplemental region would be the 'page_top' - * region, in the case where a toolbar is being displayed there. - * - * @return - * An array of region names that correspond to supplemental overlay regions, - * within the theme that is being used to display the current page. - * - * @see overlay_regions() - */ -function overlay_supplemental_regions() { - return _overlay_region_list('overlay_supplemental_regions'); -} - -/** - * Returns a list of page regions related to the overlay. - * - * @param $type - * The type of regions to return. This can either be 'overlay_regions' or - * 'overlay_supplemental_regions'. - * - * @return - * An array of region names of the given type, within the theme that is being - * used to display the current page. - * - * @see overlay_regions() - * @see overlay_supplemental_regions() - */ -function _overlay_region_list($type) { - // Obtain the current theme. We need to first make sure the theme system is - // initialized, since this function can be called early in the page request. - drupal_theme_initialize(); - $themes = list_themes(); - $theme = $themes[$GLOBALS['theme']]; - // Return the list of regions stored within the theme's info array, or an - // empty array if no regions of the appropriate type are defined. - return !empty($theme->info[$type]) ? $theme->info[$type] : array(); -} - -/** - * Returns a list of page regions that rendering should be limited to. - * - * @return - * An array containing the names of the regions that will be rendered when - * drupal_render_page() is called. If empty, then no limits will be imposed, - * and all regions of the page will be rendered. - * - * @see overlay_page_alter() - * @see overlay_block_access() - * @see overlay_set_regions_to_render() - */ -function overlay_get_regions_to_render() { - return overlay_set_regions_to_render(); -} - -/** - * Sets the regions of the page that rendering will be limited to. - * - * @param $regions - * (Optional) An array containing the names of the regions that should be - * rendered when drupal_render_page() is called. Pass in an empty array to - * remove all limits and cause drupal_render_page() to render all page - * regions (the default behavior). If this parameter is omitted, no change - * will be made to the current list of regions to render. - * - * @return - * The current list of regions to render, or an empty array if the regions - * are not being limited. - * - * @see overlay_page_alter() - * @see overlay_block_access() - * @see overlay_get_regions_to_render() - */ -function overlay_set_regions_to_render($regions = NULL) { - $regions_to_render = &drupal_static(__FUNCTION__, array()); - if (isset($regions)) { - $regions_to_render = $regions; - } - return $regions_to_render; -} - -/** - * Renders an individual page region. - * - * This function is primarily intended to be used for checking the content of - * supplemental overlay regions (e.g., a region containing a toolbar). Passing - * in a region that is intended to display the main page content is not - * supported; the region will be rendered by this function, but the main page - * content will not appear in it. In addition, although this function returns - * the rendered HTML for the provided region, it does not place it on the final - * page, nor add any of its associated JavaScript or CSS to the page. - * - * @param $region - * The name of the page region that should be rendered. - * - * @return - * The rendered HTML of the provided region. - */ -function overlay_render_region($region) { - // Indicate the region that we will be rendering, so that other regions will - // be hidden by overlay_page_alter() and overlay_block_access(). - overlay_set_regions_to_render(array($region)); - // Do what is necessary to force drupal_render_page() to only display HTML - // from the requested region. Specifically, declare that the main page - // content does not need to automatically be added to the page, and pass in - // a page array that has all theme functions removed (so that overall HTML - // for the page will not be added either). - $system_main_content_added = &drupal_static('system_main_content_added'); - $system_main_content_added = TRUE; - $page = array( - '#type' => 'page', - '#theme' => NULL, - '#theme_wrappers' => array(), - ); - // Render the region, but do not cache any JavaScript or CSS associated with - // it. This region might not be included the next time drupal_render_page() - // is called, and we do not want its JavaScript or CSS to erroneously appear - // on the final rendered page. - $original_js = drupal_add_js(); - $original_css = drupal_add_css(); - $original_libraries = drupal_static('drupal_add_library'); - $js = &drupal_static('drupal_add_js'); - $css = &drupal_static('drupal_add_css'); - $libraries = &drupal_static('drupal_add_library'); - $markup = drupal_render_page($page); - $js = $original_js; - $css = $original_css; - $libraries = $original_libraries; - // Indicate that the main page content has not, in fact, been displayed, so - // that future calls to drupal_render_page() will be able to render it - // correctly. - $system_main_content_added = FALSE; - // Restore the original behavior of rendering all regions for the next time - // drupal_render_page() is called. - overlay_set_regions_to_render(array()); - return $markup; -} - -/** - * Returns any rendered content that was stored earlier in the page request. - * - * @return - * An array of all rendered HTML that was stored earlier in the page request, - * keyed by the identifier with which it was stored. If no content was - * stored, an empty array is returned. - * - * @see overlay_store_rendered_content() - */ -function overlay_get_rendered_content() { - return overlay_store_rendered_content(); -} - -/** - * Stores strings representing rendered HTML content. - * - * This function is used to keep a static cache of rendered content that can be - * referred to later in the page request. - * - * @param $id - * (Optional) An identifier for the content which is being stored, which will - * be used as an array key in the returned array. If omitted, no change will - * be made to the current stored data. - * @param $content - * (Optional) A string representing the rendered data to store. This only has - * an effect if $id is also provided. - * - * @return - * An array representing all data that is currently being stored, or an empty - * array if there is none. - * - * @see overlay_get_rendered_content() - */ -function overlay_store_rendered_content($id = NULL, $content = NULL) { - $rendered_content = &drupal_static(__FUNCTION__, array()); - if (isset($id)) { - $rendered_content[$id] = $content; - } - return $rendered_content; -} - -/** - * Requests that the parent window refreshes a particular page region. - * - * @param $region - * The name of the page region to refresh. The parent window will trigger a - * refresh of this region on the next page load. - * - * @see overlay_trigger_refresh() - * @see Drupal.overlay.refreshRegions() - */ -function overlay_request_refresh($region) { - $class = drupal_html_class("region-$region"); - $_SESSION['overlay_regions_to_refresh'][] = array($class => $region); -} - -/** - * Requests that the entire parent window is reloaded when the overlay closes. - * - * @see overlay_trigger_refresh() - */ -function overlay_request_page_refresh() { - $_SESSION['overlay_refresh_parent'] = TRUE; -} - -/** - * Checks if the parent window needs to be refreshed on this page load. - * - * If the previous page load requested that any page regions be refreshed, or - * if it requested that the entire page be refreshed when the overlay closes, - * pass that request via JavaScript to the child window, so it can in turn pass - * the request to the parent window. - * - * @see overlay_request_refresh() - * @see overlay_request_page_refresh() - * @see Drupal.overlay.refreshRegions() - */ -function overlay_trigger_refresh() { - if (!empty($_SESSION['overlay_regions_to_refresh'])) { - $settings = array( - 'overlayChild' => array( - 'refreshRegions' => $_SESSION['overlay_regions_to_refresh'], - ), - ); - drupal_add_js($settings, array('type' => 'setting')); - unset($_SESSION['overlay_regions_to_refresh']); - } - if (!empty($_SESSION['overlay_refresh_parent'])) { - drupal_add_js(array('overlayChild' => array('refreshPage' => TRUE)), array('type' => 'setting')); - unset($_SESSION['overlay_refresh_parent']); - } -} diff --git a/core/modules/overlay/overlay.routing.yml b/core/modules/overlay/overlay.routing.yml deleted file mode 100644 index cc6ba04..0000000 --- a/core/modules/overlay/overlay.routing.yml +++ /dev/null @@ -1,13 +0,0 @@ -overlay.message: - path: '/overlay/dismiss-message' - defaults: - _controller: '\Drupal\overlay\Controller\OverlayController::overlayMessage' - requirements: - _access_overlay_dismiss_message: 'TRUE' - -overlay.ajax: - path: '/overlay-ajax/{region}' - defaults: - _controller: '\Drupal\overlay\Controller\OverlayController::regionRender' - requirements: - _permission: 'access overlay' diff --git a/core/modules/overlay/overlay.services.yml b/core/modules/overlay/overlay.services.yml deleted file mode 100644 index aed4378..0000000 --- a/core/modules/overlay/overlay.services.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - overlay.subscriber: - class: Drupal\overlay\EventSubscriber\OverlaySubscriber - tags: - - { name: event_subscriber } - arguments: ['@content_negotiation', '@user.data', '@url_generator'] - - access_check.overlay.dismiss_message: - class: Drupal\overlay\Access\DismissMessageAccessCheck - tags: - - { name: access_check } diff --git a/core/modules/overlay/templates/overlay-disable-message.html.twig b/core/modules/overlay/templates/overlay-disable-message.html.twig deleted file mode 100644 index d5891a3..0000000 --- a/core/modules/overlay/templates/overlay-disable-message.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -{# -/** - * @file - * Default theme implementation for the message about disabling the overlay. - * - * Available variables: - * - profile_link: The link to this user's account. - * - dismiss_link: The link to dismiss the overlay. - * - * @see template_preprocess_overlay_disable_message() - * - * @ingroup themeable - */ -#} -
- - {{ profile_link }} {{ dismiss_link }} -
diff --git a/core/modules/overlay/templates/overlay.html.twig b/core/modules/overlay/templates/overlay.html.twig deleted file mode 100644 index 732bc33..0000000 --- a/core/modules/overlay/templates/overlay.html.twig +++ /dev/null @@ -1,37 +0,0 @@ -{# -/** - * @file - * Default theme implementation to display a page in the overlay. - * - * Available variables: - * - attributes: HTML attributes for the containing element. - * - content_attributes: HTML attributes for the content. - * - title_attributes: HTML attributes for the title. - * - title: The (sanitized) title of the page. - * - page: The rendered page content. - * - tabs: Tabs linking to any sub-pages beneath the current page (e.g., the - * view and edit tabs when displaying a node). - * - disable_overlay: The message about how to disable the overlay. - * - * @see template_preprocess_overlay() - * - * @ingroup themeable - */ -#} -{{ disable_overlay }} - -
-
- {{ title }} -
- - {% if tabs %} -
    {{ tabs }}
- {% endif %} -
- - {{ page }} - - diff --git a/core/modules/overlay/tests/Drupal/overlay/Tests/Controller/OverlayControllerTest.php b/core/modules/overlay/tests/Drupal/overlay/Tests/Controller/OverlayControllerTest.php deleted file mode 100644 index 03e01a7..0000000 --- a/core/modules/overlay/tests/Drupal/overlay/Tests/Controller/OverlayControllerTest.php +++ /dev/null @@ -1,149 +0,0 @@ - 'Overlay controller tests', - 'description' => 'Tests the overlay controller.', - 'group' => 'Overlay', - ); - } - - protected function setUp() { - $this->userData = $this->getMock('Drupal\user\UserDataInterface'); - $this->csrfGenerator = $this->getMockBuilder('Drupal\Core\Access\CsrfTokenGenerator') - ->disableOriginalConstructor() - ->getMock(); - $this->account = $this->getMock('Drupal\Core\Session\AccountInterface'); - $this->urlGenerator = $this->getMock('Drupal\Core\Routing\UrlGeneratorInterface'); - - $this->overlayController = new OverlayController($this->userData, $this->csrfGenerator, $this->account); - - $translation = $this->getMock('Drupal\Core\StringTranslation\TranslationInterface'); - $container = new ContainerBuilder(); - $container->set('url_generator', $this->urlGenerator); - $container->set('string_translation', $translation); - \Drupal::setContainer($container); - } - - /** - * Tests the overlayMessage method. - * - * @see \Drupal\overlay\Controller\OverlayController::overlayMessage() - */ - public function testOverlayMessage() { - $this->account->expects($this->any()) - ->method('id') - ->will($this->returnValue(31)); - $this->userData->expects($this->once()) - ->method('set') - ->with('overlay', 31, 'message_dismissed', 1); - $this->urlGenerator->expects($this->once()) - ->method('generate') - ->with('user_edit', array('user' => 31)) - ->will($this->returnValue('http://drupal/user/31/edit')); - - $token = $this->randomName(); - $this->csrfGenerator->expects($this->once()) - ->method('validate') - ->with($token, 'overlay') - ->will($this->returnValue(TRUE)); - - $request = new Request(); - $request->attributes->set('token', $token); - $result = $this->overlayController->overlayMessage($request); - - $this->assertTrue($result instanceof RedirectResponse); - $this->assertEquals('http://drupal/user/31/edit', $result->getTargetUrl()); - } - - /** - * Tests the overlayMessage method with non existing token. - * - * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException - */ - public function testOverlayMessageWithoutToken() { - $request = new Request(); - $this->overlayController->overlayMessage($request); - } - - /** - * Tests the overlayMessage method with invalid token. - * - * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException - */ - public function testOverlayMessageWithInvalidToken() { - $this->csrfGenerator->expects($this->once()) - ->method('validate') - ->with('invalid_token', 'overlay') - ->will($this->returnValue(FALSE)); - $request = new Request(); - $request->attributes->set('token', 'invalid_token'); - $this->overlayController->overlayMessage($request); - } - -} - -} - -namespace { - // @todo Convert once drupal_set_message is an object - if (!function_exists('drupal_set_message')) { - function drupal_set_message($message) { - } - } -} diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php index 7457533..623e536 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php @@ -125,10 +125,6 @@ public function testFilledStandardUpgrade() { $this->assertEqual(unserialize($userdata[1]['contact']['enabled']->value), 1); $this->assertEqual($userdata[1]['contact']['enabled']->serialized, 1); $this->assertEqual(unserialize($userdata[2]['contact']['enabled']->value), 0); - $this->assertEqual(unserialize($userdata[1]['overlay']['enabled']->value), 1); - $this->assertEqual(unserialize($userdata[2]['overlay']['enabled']->value), 1); - $this->assertEqual(unserialize($userdata[1]['overlay']['message_dismissed']->value), 1); - $this->assertFalse(isset($userdata[2]['overlay']['message_dismissed'])); // Make sure that only the garbage is remaining in the helper table. $this->assertEqual(db_query('SELECT COUNT(*) FROM {_d7_users_data}')->fetchField(), 2); diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index c6f7d2c..f1c217a 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -51,8 +51,7 @@ function hook_hook_info() { * * Modules may specify whether or not the routing paths they define are * to be considered administrative. Other modules may use this information to - * display those pages differently (e.g. in a modal overlay, or in a different - * theme). + * display those pages differently. * * To change the administrative status of menu items defined in another module's * routing paths, modules should implement hook_admin_paths_alter(). diff --git a/core/modules/system/system.module b/core/modules/system/system.module index cf057b2..bacbb5e 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1124,7 +1124,7 @@ function system_library_info() { // A utility that measures and reports viewport offset dimensions from // elements like the toolbar that can potentially displace the positioning of - // elements like the overlay. + // elements. $libraries['drupal.displace'] = array( 'title' => 'Drupal displace', 'version' => \Drupal::VERSION, @@ -1213,19 +1213,6 @@ function system_library_info() { ), ); - // jQuery BBQ plugin. - $libraries['jquery.bbq'] = array( - 'title' => 'jQuery BBQ', - 'website' => 'http://benalman.com/projects/jquery-bbq-plugin/', - 'version' => '1.3pre', - 'js' => array( - 'core/assets/vendor/jquery-bbq/jquery.ba-bbq.js' => array(), - ), - 'dependencies' => array( - array('system', 'jquery'), - ), - ); - // Dropbutton. $libraries['drupal.dropbutton'] = array( 'title' => 'Dropbutton', diff --git a/core/modules/system/tests/upgrade/drupal-7.user_data.database.php b/core/modules/system/tests/upgrade/drupal-7.user_data.database.php index d55f4bf..a2f7d46 100644 --- a/core/modules/system/tests/upgrade/drupal-7.user_data.database.php +++ b/core/modules/system/tests/upgrade/drupal-7.user_data.database.php @@ -16,8 +16,6 @@ ->fields(array( 'data' => serialize(array( 'contact' => 1, - 'overlay_message_dismissed' => '1', - 'overlay' => '1', 'garbage' => 'data', )), )) @@ -28,7 +26,6 @@ ->fields(array( 'data' => serialize(array( 'contact' => '0', - 'overlay' => 1, 'more' => array('garbage', 'data'), )), )) diff --git a/core/modules/toolbar/js/toolbar.js b/core/modules/toolbar/js/toolbar.js index d94fde6..aba0e2d 100644 --- a/core/modules/toolbar/js/toolbar.js +++ b/core/modules/toolbar/js/toolbar.js @@ -110,15 +110,6 @@ Drupal.behaviors.toolbar = { // Update the model when the viewport offset changes. .on('drupalViewportOffsetChange.toolbar', function (event, offsets) { model.set('offsets', offsets); - }) - // The overlay will hide viewport overflow, potentially stranding tray - // items that are offscreen. The toolbar will adjust tray presentation - // to prevent this when viewport overflow is hidden. - .on('drupalOverlayOpen.toolbar', function () { - model.set('isViewportOverflowConstrained', true); - }) - .on('drupalOverlayClose.toolbar', function () { - model.set('isViewportOverflowConstrained', false); }); // Broadcast model changes to other modules. @@ -217,9 +208,9 @@ Drupal.toolbar = { // Menu subtrees are loaded through an AJAX request only when the Toolbar // is set to a vertical orientation. areSubtreesLoaded: false, - // If the viewport overflow becomes constrained, such as when the overlay - // is open, isFixed must be true so that elements in the trays aren't - // lost offscreen and impossible to get to. + // If the viewport overflow becomes constrained, isFixed must be true so + // that elements in the trays aren't lost off-screen and impossible to + // get to. isViewportOverflowConstrained: false, // The orientation of the active tray. orientation: 'vertical', diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index 85bfafa..6625170 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -390,8 +390,7 @@ function theme_toolbar_tray_heading_wrapper(&$variables) { * is an overlay supplemental region that should be refreshed whenever its * content is updated. * - * This information is provided for any module that might need to use it, not - * just the core Overlay module. + * This information is provided for any module that might need to use it. */ function toolbar_system_info_alter(&$info, $file, $type) { if ($type == 'theme') { diff --git a/core/modules/tour/js/tour.js b/core/modules/tour/js/tour.js index 86357e7..9a8b648 100644 --- a/core/modules/tour/js/tour.js +++ b/core/modules/tour/js/tour.js @@ -7,6 +7,8 @@ "use strict"; +var queryString = decodeURI(window.location.search); + /** * Attaches the tour's toolbar tab behavior. * @@ -28,33 +30,6 @@ Drupal.behaviors.tour = { model: model }); - // Update the model based on Overlay events. - $(document) - // Overlay is opening: cancel tour if active and mark overlay as open. - .on('drupalOverlayOpen.tour', function () { - model.set({ isActive: false, overlayIsOpen: true }); - }) - // Overlay is loading a new URL: clear tour & cancel if active. - .on('drupalOverlayBeforeLoad.tour', function () { - model.set({ isActive: false, overlayTour: [] }); - }) - // Overlay is closing: clear tour & cancel if active, mark overlay closed. - .on('drupalOverlayClose.tour', function () { - model.set({ isActive: false, overlayIsOpen: false, overlayTour: [] }); - }) - // Overlay has loaded DOM: check whether a tour is available. - .on('drupalOverlayReady.tour', function () { - // We must select the tour in the Overlay's window using the Overlay's - // jQuery, because the joyride plugin only works for the window in which - // it was loaded. - // @todo Make upstream contribution so this can be simplified, which - // should also allow us to *not* load jquery.joyride.js in the Overlay, - // resulting in better front-end performance. - var overlay = Drupal.overlay.iframeWindow; - var $overlayContext = overlay.jQuery(overlay.document); - model.set('overlayTour', $overlayContext.find('ol#tour')); - }); - model // Allow other scripts to respond to tour events. .on('change:isActive', function (model, isActive) { @@ -64,8 +39,7 @@ Drupal.behaviors.tour = { .set('tour', $(context).find('ol#tour')); // Start the tour imediately if toggled via query string. - var query = $.deparam.querystring(); - if (query.tour) { + if (/tour=?/i.test(queryString)) { model.set('isActive', true); } @@ -82,10 +56,6 @@ Drupal.tour.models.StateModel = Backbone.Model.extend({ defaults: { // Indicates whether the Drupal root window has a tour. tour: [], - // Indicates whether the Overlay is open. - overlayIsOpen: false, - // Indicates whether the Overlay window has a tour. - overlayTour: [], // Indicates whether the tour is currently running. isActive: false, // Indicates which tour is the active one (necessary to cleanly stop). @@ -104,7 +74,7 @@ Drupal.tour.views.ToggleTourView = Backbone.View.extend({ * Implements Backbone Views' initialize(). */ initialize: function () { - this.model.on('change:tour change:overlayTour change:overlayIsOpen change:isActive', this.render, this); + this.model.on('change:tour change:isActive', this.render, this); this.model.on('change:isActive', this.toggleTour, this); }, @@ -159,8 +129,7 @@ Drupal.tour.views.ToggleTourView = Backbone.View.extend({ * A jQuery element pointing to a
    containing tour items. */ _getTour: function () { - var whichTour = (this.model.get('overlayIsOpen')) ? 'overlayTour' : 'tour'; - return this.model.get(whichTour); + return this.model.get('tour'); }, /** @@ -168,12 +137,10 @@ Drupal.tour.views.ToggleTourView = Backbone.View.extend({ * * @return jQuery * A jQuery element pointing to the document within which a tour would be - * started given the current state. I.e. when the Overlay is open, this will - * point to the HTML document inside the Overlay's iframe, otherwise it will - * point to the Drupal root window. + * started given the current state. */ _getDocument: function () { - return (this.model.get('overlayIsOpen')) ? $(Drupal.overlay.iframeWindow.document) : $(document); + return $(document); }, /** @@ -196,7 +163,7 @@ Drupal.tour.views.ToggleTourView = Backbone.View.extend({ */ _removeIrrelevantTourItems: function ($tour, $document) { var removals = false; - var query = $.deparam.querystring(); + var tips = /tips=([^&]+)/.exec(queryString); $tour .find('li') .each(function () { @@ -205,7 +172,7 @@ Drupal.tour.views.ToggleTourView = Backbone.View.extend({ var itemClass = $this.attr('data-class'); // If the query parameter 'tips' is set, remove all tips that don't // have the matching class. - if (query.tips && !$(this).hasClass(query.tips)) { + if (tips && !$(this).hasClass(tips[1])) { removals = true; $this.remove(); return; diff --git a/core/modules/tour/tests/tour_test/tour_test.info.yml b/core/modules/tour/tests/tour_test/tour_test.info.yml index 0617983..efe4c87 100644 --- a/core/modules/tour/tests/tour_test/tour_test.info.yml +++ b/core/modules/tour/tests/tour_test/tour_test.info.yml @@ -4,6 +4,6 @@ description: Tests module for tour module. package: Core version: VERSION core: 8.x -hidden: TRUE +#hidden: TRUE dependencies: - tour diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module index df7eaa9..7aafeb3 100644 --- a/core/modules/tour/tour.module +++ b/core/modules/tour/tour.module @@ -28,15 +28,12 @@ function tour_library_info() { 'title' => 'Tour', 'version' => \Drupal::VERSION, 'js' => array( - // Add the JavaScript, with a group and weight such that it will run - // before modules/overlay/overlay-parent.js. - $path . '/js/tour.js' => array('group' => JS_LIBRARY, 'weight' => -1), + $path . '/js/tour.js' => array('group' => JS_LIBRARY), ), 'dependencies' => array( array('system', 'jquery'), array('system', 'drupal'), array('system', 'backbone'), - array('system', 'jquery.bbq'), array('tour', 'jquery.joyride'), array('tour', 'tour-styling'), ), @@ -47,7 +44,7 @@ function tour_library_info() { 'version' => \Drupal::VERSION, 'css' => array( $path . '/css/tour.module.css' => array('media' => 'screen'), - ) + ), ); $libraries['jquery.joyride'] = array( diff --git a/core/modules/views_ui/js/ajax.js b/core/modules/views_ui/js/ajax.js index 0b416c9..84d65c8 100644 --- a/core/modules/views_ui/js/ajax.js +++ b/core/modules/views_ui/js/ajax.js @@ -23,8 +23,7 @@ }; Drupal.AjaxCommands.prototype.viewsReplaceTitle = function (ajax, response, status) { - // In case we're in the overlay, get a reference to the underlying window. - var doc = parent.document; + var doc = document; // For the element, make a best-effort attempt to replace the page // title and leave the site name alone. If the theme doesn't use the site // name in the <title> element, this will fail. @@ -36,7 +35,6 @@ doc.title = oldTitle.replace(re, response.title + ' $1 ' + response.siteName); $('h1.page-title').text(response.title); - $('h1#overlay-title').text(response.title); }; /** diff --git a/core/profiles/standard/standard.info.yml b/core/profiles/standard/standard.info.yml index 4502ecd..ba41dd5 100644 --- a/core/profiles/standard/standard.info.yml +++ b/core/profiles/standard/standard.info.yml @@ -30,7 +30,6 @@ dependencies: - search - shortcut - toolbar - - overlay - field_ui - file - rdf diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css index 96f3877..1ad555a 100644 --- a/core/themes/bartik/css/colors.css +++ b/core/themes/bartik/css/colors.css @@ -1,7 +1,6 @@ /* ---------- Color Module Styles ----------- */ -body, -body.overlay { +body { color: #3b3b3b; } .comment .comment-arrow { diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css index 5dad110..738d55a 100644 --- a/core/themes/bartik/css/style.css +++ b/core/themes/bartik/css/style.css @@ -1535,10 +1535,6 @@ input.form-submit:focus { div.password-suggestions { border: 0; } -.ui-widget-overlay { - background: #222222; - opacity: 0.7; -} #forum .name { font-size: 1.083em; } @@ -1679,9 +1675,6 @@ ol.search-results { div.add-or-remove-shortcuts { padding-top: 0.9em; } -.overlay div.add-or-remove-shortcuts { - padding-top: 0.8em; -} /* ---------- Admin-specific Theming ---------- */ @@ -1710,13 +1703,7 @@ div.add-or-remove-shortcuts { .page-admin #admin-dblog img { margin: 0 5px; } -/* Fix spacing when Seven is used in the overlay. */ -#system-theme-settings details { - padding: 0; -} -#system-theme-settings details summary { - margin-top: 0; -} + /* Configuration. */ div.admin .right, div.admin .left { @@ -1743,33 +1730,6 @@ div.admin-panel .description { margin: 0 0 14px 7px; } -/* ---------- Overlay layout styles ----------- */ - -.overlay #main, -.overlay #content { - width: auto; - float: none; -} -.overlay #page { - padding: 0 2em; -} -.overlay .region-page-top, -.overlay #header, -.overlay #page-title, -.overlay #featured, -.overlay #sidebar-first, -.overlay #triptych-wrapper, -.overlay #footer-wrapper { - display: none; -} -.overlay-processed .field-type-image { - display: block; - float: none; -} -.overlay #messages { - width: auto; -} - /* ---------- book ----------- */ .book-navigation .menu { border-top: 1px solid #d6d6d6; diff --git a/core/themes/seven/jquery.ui.theme.css b/core/themes/seven/jquery.ui.theme.css index 5099b9a..89aa38b 100644 --- a/core/themes/seven/jquery.ui.theme.css +++ b/core/themes/seven/jquery.ui.theme.css @@ -323,21 +323,6 @@ } /** - * Overlays - */ -.ui-widget-overlay { - background: #000; - opacity: .70; - filter: Alpha(Opacity=70); -} -.overlay { - padding-right: 26px; -} -.overlay .ui-dialog-titlebar { - background: transparent; -} - -/** * Slider */ .ui-slider { diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index 1bcb085..c711295 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -1165,50 +1165,6 @@ body.in-maintenance #logo { color: green; } -/* Overlay theming */ -.overlay #branding { - background-color: #fff; - padding-top: 15px; - padding-bottom: 15px; -} -.overlay #branding h1.page-title, -.overlay #left, -.overlay #footer { - display: none; -} -.overlay #page { - margin: 0; - padding: 0 20px; -} -.overlay #branding .breadcrumb { - float: left; /* LTR */ - position: relative; - z-index: 10; -} -[dir="rtl"] .overlay #branding .breadcrumb { - float: right; -} -#overlay-tabs { - bottom: -1px; - font-size: 1.54em; - line-height: 1.54em; - margin: 0; -} -.overlay ul.secondary { - background: transparent none; - margin: -1.4em 0 0.3em 0; /* LTR */ - overflow: visible; -} -[dir="rtl"] .overlay ul.secondary { - margin: -1.4em 0 0.3em 0; -} -.overlay #content { - padding: 0; -} -h1#overlay-title { - font-weight: normal; -} - /* Shortcut theming */ .add-or-remove-shortcuts a:focus span.text, .add-or-remove-shortcuts a:hover span.text { @@ -1326,28 +1282,6 @@ h1#overlay-title { background-color: #73b3dd; } -/* Disable overlay message */ -#overlay-disable-message { - background-color: #addafc; -} -#overlay-disable-message a, -#overlay-disable-message a:visited { - color: #000; -} -#overlay-disable-message a:focus, -#overlay-disable-message a:active { - outline: none; - text-decoration: underline; -} -.overlay-disable-message-focused a { - padding: 0.4em 0.6em; -} -.overlay-disable-message-focused #overlay-dismiss-message { - background-color: #59a0d8; - color: #fff; - border-radius: 8px; -} - /** * Views styling */ @@ -1714,9 +1648,6 @@ details.fieldset-no-legend { .entity-meta details .summary { display: none; /* Hide JS summaries. @todo Rethink summaries. */ } -.overlay .layout-region-node-footer { - padding-bottom: .5em; -} /** * Widescreen @@ -1789,47 +1720,6 @@ details.fieldset-no-legend { .entity-meta-header { border-top: 0; } - - /* Additional overlay theming */ - - /** - * These are terrible selectors. - * @todo Add a proper class to the overlay for this page. - */ - .overlay[class*="page-node-add-"] #overlay-content, - .overlay.page-node-edit #overlay-content { - padding: 0; - } - .overlay[class*="page-node-add-"] #page, - .overlay.page-node-edit #page { - padding: 0; - } - .overlay[class*="page-node-add-"] #branding, - .overlay.page-node-edit #branding { - padding-left: 2em; - padding-right: 2em; - } - .overlay[class*="page-node-add-"] #console, - .overlay.page-node-edit #console { - margin: 0 2em; - } - .overlay[class*="page-node-add-"] .messages, - .overlay.page-node-edit .messages { - margin-bottom: 1em; - } - .overlay .layout-node-form { - border-top: 1px solid #bfbfbf; - } - .overlay .layout-node-form:before { - display: none; - } - .overlay .layout-region-node-main, - .overlay .layout-region-node-footer { - padding-left: 2em; - } - .overlay .layout-region-node-footer { - padding-bottom: 1.5em; - } } @media screen and (max-width: 1020px),