summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/overlay/overlay-parent.js9
-rw-r--r--modules/system/system.module2
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(),
),