diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-04-11 01:07:15 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-04-11 01:07:15 +0000 |
commit | 8926b0a8c13b093128a2a84526b637897ac0b08e (patch) | |
tree | 640bc0c47e04ae730949d74359028c6b2bdcf38e /modules | |
parent | bdb7e56143d52bb8528042591f0e8df9afde45db (diff) | |
download | brdo-8926b0a8c13b093128a2a84526b637897ac0b08e.tar.gz brdo-8926b0a8c13b093128a2a84526b637897ac0b08e.tar.bz2 |
#724642 by casey: Upgrade jQuery BBQ library to 1.2.1.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/overlay/overlay-parent.js | 9 | ||||
-rw-r--r-- | modules/system/system.module | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js index 6362e6794..a3fa7ee5c 100644 --- a/modules/overlay/overlay-parent.js +++ b/modules/overlay/overlay-parent.js @@ -862,13 +862,8 @@ Drupal.overlay.fragmentizeLink = function (link) { // Preserve existing query and fragment parameters in the URL. var destination = path + link.search + link.hash; - // Assemble the overlay-ready link. - var newLink = $.param.fragment(window.location.href, { overlay: destination }); - // $.param.fragment() escaped slashes in the overlay part: unescape them. - var regexp = new RegExp("[#&]overlay=" + encodeURIComponent(path)); - newLink = newLink.replace(regexp, decodeURIComponent); - - return newLink; + // Assemble and return the overlay-ready link. + return $.param.fragment(window.location.href, { overlay: destination }); }; /** diff --git a/modules/system/system.module b/modules/system/system.module index 6badde7c2..822c559ec 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1087,7 +1087,7 @@ function system_library() { $libraries['jquery-bbq'] = array( 'title' => 'jQuery BBQ', 'website' => 'http://benalman.com/projects/jquery-bbq-plugin/', - 'version' => '1.0.2', + 'version' => '1.2.1', 'js' => array( 'misc/jquery.ba-bbq.js' => array(), ), |