Simplify font options declarations (#5146)

DevExpress · Aug 22, 2018 · fa62205 · fa62205
1 parent 4ec9cd9
commit fa62205
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 75 deletions.
diff --git a/js/viz/docs/docBaseWidget.js b/js/viz/docs/docBaseWidget.js
@@ -11,11 +11,6 @@ var BaseWidget = {
     * @default undefined
     */
 
-    /**
-    * @pseudo CommonVizFontFamily
-    * @default "'Segoe UI', 'Helvetica Neue', 'Trebuchet MS', Verdana, sans-serif" @prop family
-    */
-
     /**
     * @pseudo CommonVizLightFontFamily
     * @default "'Segoe UI Light', 'Helvetica Neue Light', 'Segoe UI', 'Helvetica Neue', 'Trebuchet MS', Verdana, sans-serif" @prop family
@@ -442,9 +437,6 @@ var BaseWidget = {
         * @name BaseWidgetOptions.tooltip.font
         * @type Font
         * @default '#232323' @prop color
-        * @default 12 @prop size
-        * @default 400 @prop weight
-        * @extends CommonVizFontFamily
         */
         font: {
             color: '#232323',
@@ -535,7 +527,6 @@ var BaseWidget = {
         * @name BaseWidgetOptions.loadingIndicator.font
         * @type Font
         * @default '#767676' @prop color
-        * @extends CommonVizFontFamily
         */
         font: {
             family: undefined,
@@ -633,16 +624,20 @@ var tickInterval = {
  /**
  * @name Font.family
  * @type string
+ * @default "'Segoe UI', 'Helvetica Neue', 'Trebuchet MS', Verdana, sans-serif"
  */
  /**
  * @name Font.opacity
  * @type number
+ * @default 1
  */
  /**
  * @name Font.size
  * @type string|number
+ * @default 12
  */
  /**
  * @name Font.weight
  * @type number
+ * @default 400
  */
diff --git a/js/viz/docs/docGaugeIndicators.js b/js/viz/docs/docGaugeIndicators.js
@@ -78,11 +78,7 @@ var CommonIndicator = {
         * @name CommonIndicator.text.font
         * @propertyOf circularRangeBar,linearRangeBar,circularTextCloud,linearTextCloud
         * @type Font
-        * @default null @prop color
-        * @default 1 @prop opacity
         * @default 14 @prop size
-        * @default 400 @prop weight
-        * @extends CommonVizFontFamily
         */
         font: {
             color: null,

diff --git a/js/viz/docs/docSankey.js b/js/viz/docs/docSankey.js
@@ -119,8 +119,7 @@ var dxSankey = {
         /**
         * @name dxSankeyOptions.label.font
         * @type Font
-        * @default '#ffffff' @prop color
-        * @extends CommonVizFontFamily
+        * @default '#FFFFFF' @prop color
         */
         font: {
             color: '#ffffff',

diff --git a/js/viz/docs/doccharts.js b/js/viz/docs/doccharts.js
@@ -485,9 +485,6 @@ var dxChart = {
             * @name dxChartOptions.crosshair.label.font
             * @type Font
             * @default '#FFFFFF' @prop color
-            * @default 12 @prop size
-            * @default 400 @prop weight
-            * @extends CommonVizFontFamily
              */
             font: {
                 family: undefined,
@@ -569,9 +566,6 @@ var dxChart = {
                 * @name dxChartOptions.crosshair.verticalLine.label.font
                 * @type Font
                 * @default '#FFFFFF' @prop color
-                * @default 12 @prop size
-                * @default 400 @prop weight
-                * @extends CommonVizFontFamily
                  */
                 font: {
                     family: undefined,
@@ -654,9 +648,6 @@ var dxChart = {
                 * @name dxChartOptions.crosshair.horizontalLine.label.font
                 * @type Font
                 * @default '#FFFFFF' @prop color
-                * @default 12 @prop size
-                * @default 400 @prop weight
-                * @extends CommonVizFontFamily
                  */
                 font: {
                     family: undefined,
@@ -852,9 +843,6 @@ var dxChart = {
             * @name dxChartOptions.commonAxisSettings.label.font
             * @type Font
             * @default '#767676' @prop color
-            * @default 12 @prop size
-            * @default 400 @prop weight
-            * @extends CommonVizFontFamily
             */
             font: {
                 family: undefined,
@@ -1006,8 +994,6 @@ var dxChart = {
             * @type Font
             * @default '#767676' @prop color
             * @default 16 @prop size
-            * @default 400 @prop weight
-            * @extends CommonVizFontFamily
             */
             font: {
                 family: undefined,
@@ -1061,9 +1047,6 @@ var dxChart = {
                 * @name dxChartOptions.commonAxisSettings.stripStyle.label.font
                 * @type Font
                 * @default '#767676' @prop color
-                * @default 12 @prop size
-                * @default 400 @prop weight
-                * @extends CommonVizFontFamily
                 */
                 font: {
                     family: undefined,
@@ -1130,9 +1113,6 @@ var dxChart = {
                 * @name dxChartOptions.commonAxisSettings.constantLineStyle.label.font
                 * @type Font
                 * @default '#767676' @prop color
-                * @default 12 @prop size
-                * @default 400 @prop weight
-                * @extends CommonVizFontFamily
                 */
                 font: {
                     family: undefined,
@@ -2327,9 +2307,6 @@ var dxPolarChart = {
             * @name dxPolarChartOptions.commonAxisSettings.label.font
             * @type Font
             * @default '#767676' @prop color
-            * @default 12 @prop size
-            * @default 400 @prop weight
-            * @extends CommonVizFontFamily
             */
             font: {
                 family: undefined,
@@ -2485,9 +2462,6 @@ var dxPolarChart = {
                 * @name dxPolarChartOptions.commonAxisSettings.stripStyle.label.font
                 * @type Font
                 * @default '#767676' @prop color
-                * @default 12 @prop size
-                * @default 400 @prop weight
-                * @extends CommonVizFontFamily
                 */
                 font: {
                     family: undefined,
@@ -2536,9 +2510,6 @@ var dxPolarChart = {
                 * @name dxPolarChartOptions.commonAxisSettings.constantLineStyle.label.font
                 * @type Font
                 * @default '#767676' @prop color
-                * @default 12 @prop size
-                * @default 400 @prop weight
-                * @extends CommonVizFontFamily
                 */
                 font: {
                     family: undefined,
@@ -3178,7 +3149,6 @@ var BaseChart = {
         * @name BaseChartOptions.legend.font
         * @type Font
         * @default '#767676' @prop color
-        * @extends CommonVizFontFamily
         */
         font: {
             color: '#767676',

diff --git a/js/viz/docs/docchartseries.js b/js/viz/docs/docchartseries.js
@@ -753,8 +753,6 @@ var commonSeries = {
         * @type Font
         * @default '#FFFFFF' @prop color
         * @default 14 @prop size
-        * @default 400 @prop weight
-        * @extends CommonVizFontFamily
         */
         font: {
             family: undefined,

diff --git a/js/viz/docs/docfunnel.js b/js/viz/docs/docfunnel.js
@@ -266,7 +266,6 @@ var dxFunnel = {
         * @name dxFunnelOptions.label.font
         * @type Font
         * @default '#767676' @prop color
-        * @extends CommonVizFontFamily
         */
         font: {
             color: '#767676',
@@ -429,7 +428,6 @@ var dxFunnel = {
         * @name dxFunnelOptions.legend.font
         * @type Font
         * @default '#767676' @prop color
-        * @extends CommonVizFontFamily
         */
         font: {
             color: '#767676',

diff --git a/js/viz/docs/docgauges.js b/js/viz/docs/docgauges.js
@@ -194,10 +194,6 @@ var BaseGauge = {
             * @name BaseGaugeOptions.scale.label.font
             * @type Font
             * @default '#767676' @prop color
-            * @default 1 @prop opacity
-            * @default 12 @prop size
-            * @default 400 @prop weight
-            * @extends CommonVizFontFamily
             */
             font: {
                 color: '#767676',
@@ -685,10 +681,7 @@ var dxBarGauge = {
         /**
         * @name dxBarGaugeOptions.label.font
         * @type Font
-        * @extends CommonVizFontFamily
-        * @default 1 @prop opacity
         * @default 16 @prop size
-        * @default 400 @prop weight
         */
         font: {
             color: undefined,

diff --git a/js/viz/docs/docpiechartseries.js b/js/viz/docs/docpiechartseries.js
@@ -318,8 +318,6 @@ var commonPieChartSeries = {
         * @type Font
         * @default '#FFFFFF' @prop color
         * @default 14 @prop size
-        * @default 400 @prop weight
-        * @extends CommonVizFontFamily
         */
         font: {
             family: undefined,

diff --git a/js/viz/docs/docpolarchartseries.js b/js/viz/docs/docpolarchartseries.js
@@ -605,8 +605,6 @@ var CommonPolarChartSeries = {
         * @type Font
         * @default '#FFFFFF' @prop color
         * @default 14 @prop size
-        * @default 400 @prop weight
-        * @extends CommonVizFontFamily
         */
         font: {
             family: undefined,

diff --git a/js/viz/docs/docrangeselector.js b/js/viz/docs/docrangeselector.js
@@ -173,8 +173,6 @@ var dxRangeSelector = {
             * @type Font
             * @default '#767676' @prop color
             * @default 11 @prop size
-            * @default 400 @prop weight
-            * @extends CommonVizFontFamily
             */
             font: {
                 color: '#767676',
@@ -390,10 +388,8 @@ var dxRangeSelector = {
         /**
         * @name dxRangeSelectorOptions.sliderMarker.font
         * @type Font
-        * @default 'white' @prop color
+        * @default '#FFFFFF' @prop color
         * @default 14 @prop size
-        * @default 400 @prop weight
-        * @extends CommonVizFontFamily
         */
         font: {
             color: 'white',

diff --git a/js/viz/docs/doctreemap.js b/js/viz/docs/doctreemap.js
@@ -177,10 +177,8 @@ var dxTreeMap = {
             /**
             * @name dxTreeMapOptions.tile.label.font
             * @type Font
-            * @default '#ffffff' @prop color
-            * @default 12 @prop size
+            * @default '#FFFFFF' @prop color
             * @default 300 @prop weight
-            * @extends CommonVizFontFamily
             */
             font: {
                 family: undefined,
@@ -301,9 +299,7 @@ var dxTreeMap = {
             * @name dxTreeMapOptions.group.label.font
             * @type Font
             * @default '#767676' @prop color
-            * @default 12 @prop size
             * @default 600 @prop weight
-            * @extends CommonVizFontFamily
             */
             font: {
                 family: undefined,

diff --git a/js/viz/docs/docvectormap.js b/js/viz/docs/docvectormap.js
@@ -218,9 +218,6 @@ var dxVectorMap = {
             * @name dxVectorMapOptions.layers.label.font
             * @type Font
             * @default '#2b2b2b' @prop color
-            * @default 12 @prop size
-            * @default 400 @prop weight
-            * @extends CommonVizFontFamily
             */
             font: {
                 family: undefined,
@@ -405,8 +402,6 @@ var dxVectorMap = {
         * @name dxVectorMapOptions.legends.font
         * @type Font
         * @default '#2b2b2b' @prop color
-        * @default 12 @prop size
-        * @extends CommonVizFontFamily
         */
         font: {
             color: '#2b2b2b',