-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathdrupal-7-states-toooooo-slow.patch
133 lines (124 loc) · 5.06 KB
/
drupal-7-states-toooooo-slow.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
diff --git a/misc/states.js b/misc/states.js
index 6d98da8..da27024 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,18 @@ 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);
+ }
+ $(document).trigger({ type: 'state:' + this.state, value: value, trigger: true, states_target: this.element.get(0) });
}
},
@@ -342,14 +372,36 @@ 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);
+ }
+ $(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);
+ }
+ $(document).trigger({ type: 'state:' + this.state, value: oldValue, oldValue: null, states_target: this.element.get(0) });
}, this));
}
};
@@ -480,6 +532,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 +545,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) {
$(e.target).closest('.form-item, .form-wrapper').find('label').append('<span class="form-required">*</span>');
}
@@ -503,18 +557,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();
}