Skip to content

Commit 9c6f83b

Browse files
authored
Bugfix/26215 remove trigger UI glitches (#29376)
* Fixing JavaScript problems in params UI tutorial for color picker * Fixing JavaScript TypeError when no recent config list is rendered in UI * Fixing JavaScript event handler after un-folding generated JSON formatting
1 parent 7ee1a56 commit 9c6f83b

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

airflow/example_dags/example_params_ui_tutorial.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,25 +195,25 @@
195195
</td></tr></tbody></table>
196196
<script lang="javascript">
197197
const hex_chars = "0123456789ABCDEF";
198-
const dgebi = document.getElementById;
199198
function i2hex(name) {
200-
var i = dgebi(name).value;
199+
var i = document.getElementById(name).value;
201200
return hex_chars.substr(parseInt(i / 16), 1) + hex_chars.substr(parseInt(i % 16), 1)
202201
}
203202
function u_{name}() {
204-
dgebi("{name}").value = "#"+i2hex("r_{name}")+i2hex("g_{name}")+i2hex("b_{name}");
205-
dgebi("preview_{name}").style.background = dgebi("{name}").value;
203+
var hex_val = "#"+i2hex("r_{name}")+i2hex("g_{name}")+i2hex("b_{name}");
204+
document.getElementById("{name}").value = hex_val;
205+
document.getElementById("preview_{name}").style.background = hex_val;
206206
updateJSONconf();
207207
}
208208
function hex2i(text) {
209209
return hex_chars.indexOf(text.substr(0,1)) * 16 + hex_chars.indexOf(text.substr(1,1));
210210
}
211211
function v_{name}() {
212-
var value = dgebi("{name}").value.toUpperCase();
213-
dgebi("r_{name}").value = hex2i(value.substr(1,2));
214-
dgebi("g_{name}").value = hex2i(value.substr(3,2));
215-
dgebi("b_{name}").value = hex2i(value.substr(5,2));
216-
dgebi("preview_{name}").style.background = dgebi("{name}").value;
212+
var value = document.getElementById("{name}").value.toUpperCase();
213+
document.getElementById("r_{name}").value = hex2i(value.substr(1,2));
214+
document.getElementById("g_{name}").value = hex2i(value.substr(3,2));
215+
document.getElementById("b_{name}").value = hex2i(value.substr(5,2));
216+
document.getElementById("preview_{name}").style.background = value;
217217
}
218218
v_{name}();
219219
</script>""",

airflow/www/static/js/trigger.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,9 @@ function initForm() {
149149

150150
// Ensure layout is refreshed on generated JSON as well
151151
document.getElementById('generated_json_toggle').addEventListener('click', () => {
152-
setTimeout(jsonForm.refresh, 300);
152+
setTimeout(() => {
153+
jsonForm.refresh();
154+
}, 300);
153155
});
154156

155157
// Update generated conf once
@@ -196,4 +198,6 @@ function setRecentConfig(e) {
196198
jsonForm.setValue(value);
197199
}
198200

199-
recentConfigList.addEventListener('change', setRecentConfig);
201+
if (recentConfigList) {
202+
recentConfigList.addEventListener('change', setRecentConfig);
203+
}

0 commit comments

Comments
 (0)