Mercurial > defr > drupal > popups

annotate 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
rev   line source
franck@2 1 Index: popups.module
franck@2 2 ===================================================================
franck@2 3 --- popups.module (révision 337)
franck@2 4 +++ popups.module (copie de travail)
franck@2 5 @@ -192,6 +192,10 @@
franck@2 6 */
franck@2 7 function popups_add_popups($rules=NULL) {
franck@2 8 static $added = FALSE;
franck@2 9 + static $shouldAdd = NULL;
franck@2 10 + if (is_null($shouldAdd)) {
franck@2 11 + $shouldAdd = $_SERVER['HTTP_X_REQUESTED_WITH'] != 'XMLHttpRequest' || $_SESSION['page_override'];
franck@2 12 + }
franck@2 13 $settings = array('popups' => array());
franck@2 14
franck@2 15 if (is_array($rules)) {
franck@2 16 @@ -224,7 +228,7 @@
franck@2 17 drupal_add_js( $settings, 'setting' );
franck@2 18 }
franck@2 19 }
franck@2 20 - if (!$added) {
franck@2 21 + if (!$added && $shouldAdd) {
franck@2 22 drupal_add_css(drupal_get_path('module', 'popups') .'/popups.css');
franck@2 23 drupal_add_css(drupal_get_path('module', 'popups') .'/popups-skin.css');
franck@2 24 drupal_add_js(drupal_get_path('module', 'popups') .'/popups.js');