Mercurial > defr > drupal > popups
view patches/2-careful-with-ahah.patch @ 2:c076d54409cb
Popus: Version RF
author | Franck Deroche <franck@defr.org> |
---|---|
date | Fri, 31 Dec 2010 13:46:12 +0100 |
parents | |
children |
line wrap: on
line source
Index: popups.module =================================================================== --- popups.module (révision 337) +++ popups.module (copie de travail) @@ -192,6 +192,10 @@ */ function popups_add_popups($rules=NULL) { static $added = FALSE; + static $shouldAdd = NULL; + if (is_null($shouldAdd)) { + $shouldAdd = $_SERVER['HTTP_X_REQUESTED_WITH'] != 'XMLHttpRequest' || $_SESSION['page_override']; + } $settings = array('popups' => array()); if (is_array($rules)) { @@ -224,7 +228,7 @@ drupal_add_js( $settings, 'setting' ); } } - if (!$added) { + if (!$added && $shouldAdd) { drupal_add_css(drupal_get_path('module', 'popups') .'/popups.css'); drupal_add_css(drupal_get_path('module', 'popups') .'/popups-skin.css'); drupal_add_js(drupal_get_path('module', 'popups') .'/popups.js');