From 3cae919f52963d26486f73094f4a88525294edd1 Mon Sep 17 00:00:00 2001
From: Dries <dries@buytaert.net>
Date: Sat, 14 Jul 2012 21:44:42 -0400
Subject: [PATCH] - Patch #1684846 by droplet: JSHint field_ui().
---
core/modules/field_ui/field_ui.js | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/core/modules/field_ui/field_ui.js b/core/modules/field_ui/field_ui.js
index a22bacac0322..e49f07bfd3e3 100644
--- a/core/modules/field_ui/field_ui.js
+++ b/core/modules/field_ui/field_ui.js
@@ -58,7 +58,7 @@ Drupal.fieldUIFieldOverview = {
});
$this.bind('change keyup', function (e, updateText) {
- var updateText = (typeof updateText === 'undefined' ? true : updateText);
+ updateText = (typeof updateText === 'undefined' ? true : updateText);
var selectedField = this.options[this.selectedIndex].value;
var selectedFieldType = (selectedField in fields ? fields[selectedField].type : null);
var selectedFieldWidget = (selectedField in fields ? fields[selectedField].widget : null);
@@ -325,19 +325,18 @@ Drupal.fieldUIDisplayOverview.field.prototype = {
// When triggered by a row drag, the 'format' select needs to be adjusted
// to the new region.
var currentValue = this.$formatSelect.val();
- switch (region) {
- case 'visible':
- 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 = (typeof this.defaultFormatter !== 'undefined') ? this.defaultFormatter : 'visible';
- }
- break;
-
- default:
- var value = 'hidden';
- break;
+ var value;
+ if (region === 'visible') {
+ 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.
+ value = (typeof this.defaultFormatter !== 'undefined') ? this.defaultFormatter : 'visible';
+ }
}
+ else {
+ value = 'hidden';
+ }
+
if (typeof value !== 'undefined') {
this.$formatSelect.val(value);
}
--
GitLab