From ac0f69f1dab60057909a8091a522afbdc7c86910 Mon Sep 17 00:00:00 2001 From: David Rothstein Date: Sun, 29 Mar 2015 17:39:52 -0400 Subject: Issue #1303412 by nod_, droplet, Valentine94, KarenS, sahuni: Cannot drag in or out of 'Hidden' on the 'Manage Display' page under certain circumstances --- modules/field_ui/field_ui.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/field_ui') 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; -- cgit v1.2.3