Mercurial > defr > drupal > popups

comparison patches/2-careful-with-ahah.patch @ 2:c076d54409cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Popus: Version RF
author Franck Deroche <franck@defr.org>
date Fri, 31 Dec 2010 13:46:12 +0100
parents
children
comparison
equal deleted inserted replaced
0:76f9b43738f2 2:c076d54409cb
1 Index: popups.module
2 ===================================================================
3 --- popups.module (révision 337)
4 +++ popups.module (copie de travail)
5 @@ -192,6 +192,10 @@
6 */
7 function popups_add_popups($rules=NULL) {
8 static $added = FALSE;
9 + static $shouldAdd = NULL;
10 + if (is_null($shouldAdd)) {
11 + $shouldAdd = $_SERVER['HTTP_X_REQUESTED_WITH'] != 'XMLHttpRequest' || $_SESSION['page_override'];
12 + }
13 $settings = array('popups' => array());
14
15 if (is_array($rules)) {
16 @@ -224,7 +228,7 @@
17 drupal_add_js( $settings, 'setting' );
18 }
19 }
20 - if (!$added) {
21 + if (!$added && $shouldAdd) {
22 drupal_add_css(drupal_get_path('module', 'popups') .'/popups.css');
23 drupal_add_css(drupal_get_path('module', 'popups') .'/popups-skin.css');
24 drupal_add_js(drupal_get_path('module', 'popups') .'/popups.js');