From 48d6204f29b7130590417e2def274f6743aaf112 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 10 Apr 2013 09:39:36 +0000 Subject: [PATCH] Skip blank legacy options sooner --- etemplate/js/et2_core_widget.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etemplate/js/et2_core_widget.js b/etemplate/js/et2_core_widget.js index 1da957e91e..6f361192ee 100644 --- a/etemplate/js/et2_core_widget.js +++ b/etemplate/js/et2_core_widget.js @@ -494,6 +494,9 @@ var et2_widget = Class.extend({ for (var j = 0; j < splitted.length && j < _proto.legacyOptions.length; j++) { + // Blank = not set + if(splitted[j].trim().length == 0) continue; + // Check to make sure we don't overwrite a current option with a legacy option if(typeof _target[_proto.legacyOptions[j]] === "undefined") { @@ -508,9 +511,6 @@ var et2_widget = Class.extend({ attrValue = splitted.slice(j); } - // Blank = not set - if(attrValue == "") continue; - var attr = _proto.attributes[_proto.legacyOptions[j]]; // If the attribute is marked as boolean, parse the