X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Ffield_ui%2Ffield_ui.js;h=985790d46ab499b07fcf726f1cfd92df4779d634;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hp=d0e8a6d7126f0574577be9d7c84aa184f8d22087;hpb=af6d1fb995500ae68849458ee10d66abbdcfb252;p=yaffs-website
diff --git a/web/core/modules/field_ui/field_ui.js b/web/core/modules/field_ui/field_ui.js
index d0e8a6d71..985790d46 100644
--- a/web/core/modules/field_ui/field_ui.js
+++ b/web/core/modules/field_ui/field_ui.js
@@ -126,7 +126,7 @@
});
if (rowNames.length) {
- $(ajaxElements).after('
');
+ $(ajaxElements).after(Drupal.theme.ajaxProgressThrobber());
$('input[name=refresh_rows]').val(rowNames.join(' '));
$('input[data-drupal-selector="edit-refresh"]').trigger('mousedown');
@@ -163,10 +163,12 @@
this.$regionSelect.val(region);
- var value = typeof this.defaultPlugin !== 'undefined' ? this.defaultPlugin : this.$pluginSelect.find('option').val();
+ if (this.region === 'hidden') {
+ var value = typeof this.defaultPlugin !== 'undefined' ? this.defaultPlugin : this.$pluginSelect.find('option').val();
- if (typeof value !== 'undefined') {
- this.$pluginSelect.val(value);
+ if (typeof value !== 'undefined') {
+ this.$pluginSelect.val(value);
+ }
}
var refreshRows = {};