#444352 by kkaefer: Remove the 4.7-era JS killswitch.

cf9f223c · Angie Byron · fde09054 · cf9f223c · cf9f223c
Commit cf9f223c authored 15 years ago by Angie Byron
--- a/install.php
+++ b/install.php
@@ -728,13 +728,7 @@ function install_tasks($profile, $task) {
      // We add these strings as settings because JavaScript translation does not
      // work on install time.
      drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail'))), 'setting');
-      drupal_add_js('
-// Global Killswitch
-if (Drupal.jsEnabled) {
-  jQuery(document).ready(function() {
-    Drupal.cleanURLsInstallCheck();
-  });
-}', 'inline');
+      drupal_add_js('jQuery(function() { Drupal.cleanURLsInstallCheck(); });', 'inline');
      // Build menu to allow clean URL check.
      menu_rebuild();


--- a/misc/drupal.js
+++ b/misc/drupal.js
@@ -15,11 +15,6 @@ if ($ === undefined) {

 (function($) {

-/**
- * Set the variable that indicates if JavaScript behaviors should be applied.
- */
-Drupal.jsEnabled = document.getElementsByTagName && document.createElement && document.createTextNode && document.documentElement && document.getElementById;
-
 /**
 * Attach all registered behaviors to a page element.
 *
@@ -317,17 +312,16 @@ Drupal.ahahError = function(xmlhttp, uri) {
  return message.replace(/\n/g, '<br />');
 };

-// Global Killswitch on the <html> element.
-if (Drupal.jsEnabled) {
-  // Global Killswitch on the <html> element.
-  $(document.documentElement).addClass('js');
-  // 'js enabled' cookie.
-  document.cookie = 'has_js=1; path=/';
-  // Attach all behaviors.
-  $(document).ready(function() {
-    Drupal.attachBehaviors(this, Drupal.settings);
-  });
-}
+// Class indicating that JS is enabled; used for styling purpose.
+$('html').addClass('js');
+
+// 'js enabled' cookie.
+document.cookie = 'has_js=1; path=/';
+
+// Attach all behaviors.
+$(function() {
+  Drupal.attachBehaviors(document, Drupal.settings);
+});

 /**
 * The default themes.