Merge lp:~andrewberry/pressflow/529252-has-js-cookie into lp:pressflow

[Andrew Berry]

Set the has_js cookie for authenticated users. This allows the Batch API to use the JS version for authenticated users if they have JS enabled.

[mkalkbrenner (markus-kalkbrenner)]

What happens after the user logs out? Shouldn't the cookie be deleted?

Why don't we set the cookie for anonymous users as well like drupal does?

AFAIK the feature has been removed from pressflow to allow varnish to cache pages for anonymous users. They are destinguished form authenticated users using the session cookie and the "HTTP-Vary-Cookie-Header". But I think that varnish could simply be configured to ignore the has_js-cookie like most people already do for google analytics cookies.

[Andrew Berry (andrewberry)]

I hadn't thought about using the Batch API for anonymous users. But since those requests should be POSTs anyways, there might not be any harm in allowing has_js for anonymous, as long as the cookie is ignored on GET requests.

[David Strauss (davidstrauss)]

Pressflow 6 is now maintained on GitHub, so I'm marking this merge as rejected.

Unmerged revisions

106. By Andrew Berry on 2011-07-30

Allow setting of the has_js cookie for authenticated users.

105. By Andrew Berry on 2011-07-30

Restore the Drupal.jsEnabled variable.

=== modified file 'includes/common.inc'
--- includes/common.inc	2011-06-01 07:13:05 +0000
+++ includes/common.inc	2011-07-30 19:36:34 +0000
@@ -2180,6 +2180,13 @@
         ),
         'inline' => array(),
       );
+
+      // We never cache authenticated user pages, so if they are logged in we
+      // allow setting of the has_js cookie so batch API functions use the JS
+      // version.
+      if (!user_is_anonymous()) {
+        $javascript['header']['core']['misc/jsenabled.js'] = array('cache' => TRUE, 'defer' => FALSE, 'preprocess' => TRUE);
+      }
     }
 
     if (isset($scope) && !isset($javascript[$scope])) {

=== modified file 'misc/drupal.js'
--- misc/drupal.js	2011-05-26 02:58:29 +0000
+++ misc/drupal.js	2011-07-30 19:36:34 +0000
@@ -4,7 +4,7 @@
 /**
  * Set the variable that indicates if JavaScript behaviors should be applied
  */
-Drupal.jsEnabled = true;
+Drupal.jsEnabled = document.getElementsByTagName && document.createElement && document.createTextNode && document.documentElement && document.getElementById;
 
 /**
  * Attach all registered behaviors to a page element.
@@ -35,10 +35,12 @@
  */
 Drupal.attachBehaviors = function(context) {
   context = context || document;
-  // Execute all of them.
-  jQuery.each(Drupal.behaviors, function() {
-    this(context);
-  });
+  if (Drupal.jsEnabled) {
+    // Execute all of them.
+    jQuery.each(Drupal.behaviors, function() {
+      this(context);
+    });
+  }
 };
 
 /**

=== added file 'misc/jsenabled.js'
--- misc/jsenabled.js	1970-01-01 00:00:00 +0000
+++ misc/jsenabled.js	2011-07-30 19:36:34 +0000
@@ -0,0 +1,5 @@
+if (Drupal.jsEnabled) {
+  // 'js enabled' cookie
+  document.cookie = 'has_js=1; path=/';
+}
+