diff options
author | David Rothstein <drothstein@gmail.com> | 2015-03-29 17:39:52 -0400 |
---|---|---|
committer | David Rothstein <drothstein@gmail.com> | 2015-03-29 17:39:52 -0400 |
commit | ac0f69f1dab60057909a8091a522afbdc7c86910 (patch) | |
tree | ec8cf5334d98506080b29211932c4237791d205e /modules/field_ui/field_ui.js | |
parent | f7cda605f66446c5661a99cfdb343ebb32dd0441 (diff) | |
download | brdo-ac0f69f1dab60057909a8091a522afbdc7c86910.tar.gz brdo-ac0f69f1dab60057909a8091a522afbdc7c86910.tar.bz2 |
Issue #1303412 by nod_, droplet, Valentine94, KarenS, sahuni: Cannot drag in or out of 'Hidden' on the 'Manage Display' page under certain circumstances
Diffstat (limited to 'modules/field_ui/field_ui.js')
-rw-r--r-- | modules/field_ui/field_ui.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/field_ui/field_ui.js b/modules/field_ui/field_ui.js index 65b28d049..c2e8978db 100644 --- a/modules/field_ui/field_ui.js +++ b/modules/field_ui/field_ui.js @@ -168,7 +168,7 @@ Drupal.fieldUIOverview = { var dragObject = this; var row = dragObject.rowObject.element; var rowHandler = $(row).data('fieldUIRowHandler'); - if (rowHandler !== undefined) { + if (typeof rowHandler !== 'undefined') { var regionRow = $(row).prevAll('tr.region-message').get(0); var region = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2'); @@ -319,7 +319,7 @@ Drupal.fieldUIDisplayOverview.field.prototype = { if (currentValue == 'hidden') { // Restore the formatter back to the default formatter. Pseudo-fields do // not have default formatters, we just return to 'visible' for those. - var value = (this.defaultFormatter != undefined) ? this.defaultFormatter : 'visible'; + var value = (typeof this.defaultFormatter !== 'undefined') ? this.defaultFormatter : this.$formatSelect.find('option').val(); } break; |