tweak

src/chart/helper/SymbolDraw.js

@@ -15,16 +15,6 @@ define(function (require) {
         return Math.abs(a - b) < 1e-4;
     }
 
-    // function isShapeSame(a, b) {
-    //     // return isAroundEqual(a[0], b[0]) && isAroundEqual(a[1], b[1]);
-    //     for (var name in a) {
-    //         if (!isAroundEqual(a[name], b[name])) {
-    //             return false;
-    //         }
-    //     }
-    //     return true;
-    // }
-
     function createSymbol(data, idx, enableAnimation) {
         var point = data.getItemLayout(idx);
         var color = data.getItemVisual(idx, 'color');

src/chart/treemap/treemapLayout.js

@@ -6,7 +6,7 @@ define(function (require) {
     var numberUtil = require('../../util/number');
     var layout = require('../../util/layout');
     var parsePercent = numberUtil.parsePercent;
-    var retrieveValue = require('../../util/model').retrieveValue;
+    var retrieveValue = zrUtil.retrieve;
     var BoundingRect = require('zrender/core/BoundingRect');
     var helper = require('./helper');
 

src/component/dataRange/ContinuousView.js

@@ -4,7 +4,7 @@ define(function(require) {
     var graphic = require('../../util/graphic');
     var zrUtil = require('zrender/core/util');
     var numberUtil = require('../../util/number');
-    var modelUtil = require('../../util/model');
+    var sliderMove = require('../helper/sliderMove');
     var linearMap = numberUtil.linearMap;
     var LinearGradient = require('zrender/graphic/LinearGradient');
     var each = zrUtil.each;
@@ -282,7 +282,7 @@ define(function(require) {
             var dataRangeModel = this.dataRangeModel;
             var handleEnds = this._handleEnds;
 
-            modelUtil.sliderMove(
+            sliderMove(
                 delta,
                 handleEnds,
                 [0, dataRangeModel.itemSize[1]],

src/component/dataRange/DataRangeView.js

@@ -3,7 +3,6 @@ define(function (require) {
     var echarts = require('../../echarts');
     var zrUtil = require('zrender/core/util');
     var graphic = require('../../util/graphic');
-    var modelUtil = require('../../util/model');
     var formatUtil = require('../../util/format');
     var layout = require('../../util/layout');
     var VisualMapping = require('../../visual/VisualMapping');
@@ -144,7 +143,7 @@ define(function (require) {
 
             function getAlign(dim, values) {
                 var dim2 = dim + '2';
-                var v = modelUtil.retrieveValue(modelOption[dim], modelOption[dim2], 0);
+                var v = zrUtil.retrieve(modelOption[dim], modelOption[dim2], 0);
                 if (!itemAlign || itemAlign === 'auto') {
                     itemAlign = (orient === 'horizontal' && orient === itemOrient)
                         ? 'right'

src/component/dataZoom/InsideZoomView.js

@@ -2,7 +2,7 @@ define(function (require) {
 
     var DataZoomView = require('./DataZoomView');
     var zrUtil = require('zrender/core/util');
-    var modelUtil = require('../../util/model');
+    var sliderMove = require('../helper/sliderMove');
     var BoundingRect = require('zrender/core/BoundingRect');
     var RoamController = require('../../component/helper/RoamController');
     var bind = zrUtil.bind;
@@ -128,7 +128,7 @@ define(function (require) {
             * (range[1] - range[0])
             * directionInfo.pixel / directionInfo.pixelLength;
 
-        modelUtil.sliderMove(
+        sliderMove(
             percentDelta,
             range,
             [0, 100],

src/component/dataZoom/SliderZoomView.js

@@ -6,8 +6,8 @@ define(function (require) {
     var Rect = graphic.Rect;
     var numberUtil = require('../../util/number');
     var linearMap = numberUtil.linearMap;
-    var modelUtil = require('../../util/model');
-    var retrieveValue = modelUtil.retrieveValue;
+    var sliderMove = require('../helper/sliderMove');
+    var retrieveValue = zrUtil.retrieve;
     var parsePercent = numberUtil.parsePercent;
     var asc = numberUtil.asc;
     var bind = zrUtil.bind;
@@ -416,7 +416,7 @@ define(function (require) {
             var handleEnds = this._handleEnds;
             var viewExtend = this._getViewExtent();
 
-            modelUtil.sliderMove(
+            sliderMove(
                 delta,
                 handleEnds,
                 viewExtend,

src/component/helper/MapDraw.js

@@ -257,11 +257,11 @@ define(function (require) {
                             if (el.type === 'text') {
                                 el.attr('scale', [1 / scale[0], 1 / scale[1]]);
                             }
-                            else if (el.type === 'polygon') {
+                            // else if (el.type === 'polygon') {
                                 // el.setStyle({
 
                                 // });
-                            }
+                            // }
                         });
                     }
                 }, this);

src/component/helper/sliderMove.js

+define(function (require) {
+
+    /**
+     * Calculate slider move result.
+     *
+     * @param {number} delta Move length.
+     * @param {Array.<number>} handleEnds handleEnds[0] and be bigger then handleEnds[1].
+     *                                    handleEnds will be modified in this method.
+     * @param {Array.<number>} extent handleEnds is restricted by extent.
+     *                                extent[0] should less or equals than extent[1].
+     * @param {string} mode 'rigid': Math.abs(handleEnds[0] - handleEnds[1]) remain unchanged,
+     *                      'cross' handleEnds[0] can be bigger then handleEnds[1],
+     *                      'push' handleEnds[0] can not be bigger then handleEnds[1],
+     *                              when they touch, one push other.
+     * @param {number} handleIndex If mode is 'rigid', handleIndex is not required.
+     * @param {Array.<number>} The input handleEnds.
+     */
+    return function (delta, handleEnds, extent, mode, handleIndex) {
+        if (!delta) {
+            return handleEnds;
+        }
+
+        if (mode === 'rigid') {
+            delta = getRealDelta(delta, handleEnds, extent);
+            handleEnds[0] += delta;
+            handleEnds[1] += delta;
+        }
+        else {
+            delta = getRealDelta(delta, handleEnds[handleIndex], extent);
+            handleEnds[handleIndex] += delta;
+
+            if (mode === 'push' && handleEnds[0] > handleEnds[1]) {
+                handleEnds[1 - handleIndex] = handleEnds[handleIndex];
+            }
+        }
+
+        return handleEnds;
+
+        function getRealDelta(delta, handleEnds, extent) {
+            var handleMinMax = !handleEnds.length
+                ? [handleEnds, handleEnds]
+                : handleEnds.slice();
+            handleEnds[0] > handleEnds[1] && handleMinMax.reverse();
+
+            if (delta < 0 && handleMinMax[0] + delta < extent[0]) {
+                delta = extent[0] - handleMinMax[0];
+            }
+            if (delta > 0 && handleMinMax[1] + delta > extent[1]) {
+                delta = extent[1] - handleMinMax[1];
+            }
+            return delta;
+        }
+    };
+});
\ No newline at end of file

src/component/marker/MarkLineView.js

@@ -4,7 +4,6 @@ define(function (require) {
     var zrUtil = require('zrender/core/util');
     var List = require('../../data/List');
     var formatUtil = require('../../util/format');
-    var retrieveValue = require('../../util/model').retrieveValue;
 
     var addCommas = formatUtil.addCommas;
     var encodeHTML = formatUtil.encodeHTML;
@@ -142,7 +141,7 @@ define(function (require) {
             var lineData = mlData.line;
             lineData.getRawValue = function (idx) {
                 var option = this.getItemModel(idx).option;
-                return retrieveValue(option && option.__rawValue, option && option.value, '');
+                return zrUtil.retrieve(option && option.__rawValue, option && option.value, '');
             };
             zrUtil.extend(mlModel, markLineFormatMixin);
             mlModel.setData(lineData);

src/component/marker/MarkPointView.js

@@ -4,7 +4,6 @@ define(function (require) {
     var SymbolDraw = require('../../chart/helper/SymbolDraw');
     var zrUtil = require('zrender/core/util');
     var formatUtil = require('../../util/format');
-    var retrieveValue = require('../../util/model').retrieveValue;
 
     var addCommas = formatUtil.addCommas;
     var encodeHTML = formatUtil.encodeHTML;
@@ -84,7 +83,7 @@ define(function (require) {
             // FIXME
             mpData.getRawValue = function (idx) {
                 var option = this.getItemModel(idx).option;
-                return retrieveValue(option.__rawValue, option.value, '');
+                return zrUtil.retrieve(option.__rawValue, option.value, '');
             };
             // FIXME
             zrUtil.mixin(mpModel, markPointFormatMixin);

src/util/model.js

@@ -56,71 +56,6 @@ define(function(require) {
      */
     util.eachAxisDim = util.createNameEach(AXIS_DIMS, ['axisIndex', 'axis', 'index']);
 
-    /**
-     * Calculate slider move result.
-     *
-     * @param {number} delta Move length.
-     * @param {Array.<number>} handleEnds handleEnds[0] and be bigger then handleEnds[1].
-     *                                    handleEnds will be modified in this method.
-     * @param {Array.<number>} extent handleEnds is restricted by extent.
-     *                                extent[0] should less or equals than extent[1].
-     * @param {string} mode 'rigid': Math.abs(handleEnds[0] - handleEnds[1]) remain unchanged,
-     *                      'cross' handleEnds[0] can be bigger then handleEnds[1],
-     *                      'push' handleEnds[0] can not be bigger then handleEnds[1],
-     *                              when they touch, one push other.
-     * @param {number} handleIndex If mode is 'rigid', handleIndex is not required.
-     * @param {Array.<number>} The input handleEnds.
-     */
-    util.sliderMove = function (delta, handleEnds, extent, mode, handleIndex) {
-        if (!delta) {
-            return handleEnds;
-        }
-
-        if (mode === 'rigid') {
-            delta = getRealDelta(delta, handleEnds, extent);
-            handleEnds[0] += delta;
-            handleEnds[1] += delta;
-        }
-        else {
-            delta = getRealDelta(delta, handleEnds[handleIndex], extent);
-            handleEnds[handleIndex] += delta;
-
-            if (mode === 'push' && handleEnds[0] > handleEnds[1]) {
-                handleEnds[1 - handleIndex] = handleEnds[handleIndex];
-            }
-        }
-
-        return handleEnds;
-
-        function getRealDelta(delta, handleEnds, extent) {
-            var handleMinMax = !handleEnds.length
-                ? [handleEnds, handleEnds]
-                : handleEnds.slice();
-            handleEnds[0] > handleEnds[1] && handleMinMax.reverse();
-
-            if (delta < 0 && handleMinMax[0] + delta < extent[0]) {
-                delta = extent[0] - handleMinMax[0];
-            }
-            if (delta > 0 && handleMinMax[1] + delta > extent[1]) {
-                delta = extent[1] - handleMinMax[1];
-            }
-            return delta;
-        }
-    };
-
-    /**
-     * If value1 is not null, then return value1, otherwise judget rest of values.
-     * @param  {*...} values
-     * @return {*} Final value
-     */
-    util.retrieveValue = function (values) {
-        for (var i = 0, len = arguments.length; i < len; i++) {
-            if (arguments[i] != null) {
-                return arguments[i];
-            }
-        }
-    };
-
     /**
      * If value is not array, then translate it to array.
      * @param  {*} value