drupal-7.41-states-toooooo-slow.patch

diff --git a/misc/states.js b/misc/states.js
index 5aac65d20c..81519d5317 100644
--- a/misc/states.js
+++ b/misc/states.js
@@ -1,5 +1,17 @@
 (function ($) {
 
+  // We define the following:
+  //   <  jQuery v1.9.1  OLD
+  //   >= jQuery v1.9.1  NEW
+  var jqueryversion = 'old';
+  var vernums = $.fn.jquery.split('.');
+  vernums[0] = parseInt(vernums[0], 10);
+  vernums[1] = parseInt(vernums[1], 10);
+  vernums[2] = parseInt(vernums[2], 10);
+  if (vernums[0] >= 2 || (vernums[0] == 1 && vernums[1] == 9 && vernums[2] >= 1)) {
+    jqueryversion = 'new';
+  }
+
 /**
  * The base States namespace.
  *
@@ -109,6 +121,13 @@ states.Dependent.prototype = {
         $(selector).bind('state:' + state, $.proxy(function (e) {
           this.update(selector, state, e.value);
         }, this));
+        // We also monitor the document monitor the state of the dependee.
+        $(document).bind('state:' + state, $.proxy(function (e) {
+          // Must have our special event, and we must match our selector.
+          if ((e.states_target != null) && ($(e.states_target).is(selector))) {
+            this.update(selector, state, e.value);
+          }
+        }, this));
 
         // Make sure the event we just bound ourselves to is actually fired.
         new states.Trigger({ selector: selector, state: state });
@@ -177,7 +196,21 @@ states.Dependent.prototype = {
 
       // By adding "trigger: true", we ensure that state changes don't go into
       // infinite loops.
-      this.element.trigger({ type: 'state:' + this.state, value: value, trigger: true });
+      if (jqueryversion == 'new') {
+        this.element.triggerHandler({ type: 'state:' + this.state, value: value, trigger: true });
+      }
+      else {
+        var event = jQuery.Event('state:' + this.state);
+        event.value = value;
+        event.trigger = true;
+        event.preventDefault();
+        event.stopPropagation();
+        this.element.trigger(event);
+      }
+      // The element may have been removed from the DOM.
+      if (typeof this.element.get(0) !== 'undefined') {
+        $(document).trigger({ type: 'state:' + this.state, value: value, trigger: true, states_target: this.element.get(0) });
+      }
     }
   },
 
@@ -342,14 +375,42 @@ states.Trigger.prototype = {
       var value = valueFn.call(this.element, e);
       // Only trigger the event if the value has actually changed.
       if (oldValue !== value) {
-        this.element.trigger({ type: 'state:' + this.state, value: value, oldValue: oldValue });
+        if (jqueryversion == 'new') {
+          this.element.triggerHandler({ type: 'state:' + this.state, value: value, oldValue: oldValue });
+        }
+        else {
+          var event = jQuery.Event('state:' + this.state);
+          event.value = value;
+          event.oldValue = oldValue;
+          event.preventDefault();
+          event.stopPropagation();
+          this.element.trigger(event);
+        }
+        // The element may have been removed from the DOM.
+        if (typeof this.element.get(0) !== 'undefined') {
+          $(document).trigger({ type: 'state:' + this.state, value: value, oldValue: oldValue, states_target: this.element.get(0) });
+        }
         oldValue = value;
       }
     }, this));
 
     states.postponed.push($.proxy(function () {
       // Trigger the event once for initialization purposes.
-      this.element.trigger({ type: 'state:' + this.state, value: oldValue, oldValue: null });
+      if (jqueryversion == 'new') {
+        this.element.triggerHandler({ type: 'state:' + this.state, value: oldValue, oldValue: null });
+      }
+      else {
+        var event = jQuery.Event('state:' + this.state);
+        event.value = oldValue;
+        event.oldValue = null;
+        event.preventDefault();
+        event.stopPropagation();
+        this.element.trigger(event);
+      }
+      // The element may have been removed from the DOM.
+      if (typeof this.element.get(0) !== 'undefined') {
+        $(document).trigger({ type: 'state:' + this.state, value: oldValue, oldValue: null, states_target: this.element.get(0) });
+      }
     }, this));
   }
 };
@@ -480,6 +541,7 @@ $(document).bind('state:disabled', function(e) {
   // Only act when this change was triggered by a dependency and not by the
   // element monitoring itself.
   if (e.trigger) {
+    e.target = e.states_target || e.target;
     $(e.target)
       .attr('disabled', e.value)
         .closest('.form-item, .form-submit, .form-wrapper').toggleClass('form-disabled', e.value)
@@ -492,6 +554,7 @@ $(document).bind('state:disabled', function(e) {
 
 $(document).bind('state:required', function(e) {
   if (e.trigger) {
+    e.target = e.states_target || e.target;
     if (e.value) {
       var $label = $(e.target).closest('.form-item, .form-wrapper').find('label');
       // Avoids duplicate required markers on initialization.
@@ -507,18 +570,21 @@ $(document).bind('state:required', function(e) {
 
 $(document).bind('state:visible', function(e) {
   if (e.trigger) {
+      e.target = e.states_target || e.target;
       $(e.target).closest('.form-item, .form-submit, .form-wrapper').toggle(e.value);
   }
 });
 
 $(document).bind('state:checked', function(e) {
   if (e.trigger) {
+    e.target = e.states_target || e.target;
     $(e.target).attr('checked', e.value);
   }
 });
 
 $(document).bind('state:collapsed', function(e) {
   if (e.trigger) {
+    e.target = e.states_target || e.target;
     if ($(e.target).is('.collapsed') !== e.value) {
       $('> legend a', e.target).click();
     }