Move tickprefix/suffic coersion back into if block

mdtusz · mdtusz · commit 34c6feff9883 · 2016-02-19T17:48:53.000-05:00
diff --git a/src/plots/cartesian/tick_defaults.js b/src/plots/cartesian/tick_defaults.js
@@ -31,27 +31,25 @@ module.exports = function handleTickDefaults(containerIn, containerOut, coerce,
 
     var showAttrDflt = getShowAttrDflt(containerIn);
 
-    var showTickLabels = coerce('showticklabels'),
-        tickFormat = coerce('tickformat'),
-        tickPrefix = coerce('tickprefix'),
-        tickSuffix = coerce('ticksuffix');
-
-    if(tickPrefix) coerce('showtickprefix', showAttrDflt);
-    if(tickSuffix) coerce('showticksuffix', showAttrDflt);
-
+    var showTickLabels = coerce('showticklabels');
     if(showTickLabels) {
         Lib.coerceFont(coerce, 'tickfont', options.font || {});
         coerce('tickangle');
-    }
 
-    if(axType !== 'category') {
-        if(!options.noHover) coerce('hoverformat');
+        var tickPrefix = coerce('tickprefix');
+        if(tickPrefix) coerce('showtickprefix', showAttrDflt);
 
+        var tickSuffix = coerce('ticksuffix');
+        if(tickSuffix) coerce('showticksuffix', showAttrDflt);
+
+        var tickFormat = coerce('tickformat');
         if(!tickFormat && axType !== 'date') {
             coerce('showexponent', showAttrDflt);
             coerce('exponentformat');
         }
     }
+
+    if(axType !== 'category' && !options.noHover) coerce('hoverformat');
 };
 
 /*
