Skip to content

Commit

Permalink
Dump 3.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@100pah
100pah committed Nov 3, 2016
1 parent 28692e8 commit 1155d0c
Show file tree
Hide file tree
Showing 9 changed files with 247 additions and 119 deletions.
125 changes: 94 additions & 31 deletions dist/echarts.common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1455,9 +1455,9 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {number}
*/
version: '3.3.0',
version: '3.3.1',
dependencies: {
zrender: '3.2.0'
zrender: '3.2.1'
}
};

Expand Down Expand Up @@ -16632,7 +16632,7 @@ return /******/ (function(modules) { // webpackBootstrap
/**
* @type {string}
*/
zrender.version = '3.2.0';
zrender.version = '3.2.1';

/**
* Initializing a zrender instance
Expand Down Expand Up @@ -18642,7 +18642,10 @@ return /******/ (function(modules) { // webpackBootstrap
return el.getBoundingClientRect ? el.getBoundingClientRect() : {left: 0, top: 0};
}

function clientToLocal(el, e, out) {
// `calculate` is optional, default false
function clientToLocal(el, e, out, calculate) {
out = out || {};

// According to the W3C Working Draft, offsetX and offsetY should be relative
// to the padding edge of the target element. The only browser using this convention
// is IE. Webkit uses the border edge, Opera uses the content edge, and FireFox does
Expand All @@ -18654,8 +18657,7 @@ return /******/ (function(modules) { // webpackBootstrap
// When mousemove event triggered on ec tooltip, target is not zr painter.dom, and
// offsetX/Y is relative to e.target, where the calculation of zrX/Y via offsetX/Y
// is too complex. So css-transfrom dont support in this case temporarily.

if (!e.currentTarget || el !== e.currentTarget) {
if (calculate) {
defaultGetZrXY(el, e, out);
}
// Caution: In FireFox, layerX/layerY Mouse position relative to the closest positioned
Expand Down Expand Up @@ -18685,15 +18687,15 @@ return /******/ (function(modules) { // webpackBootstrap
function defaultGetZrXY(el, e, out) {
// This well-known method below does not support css transform.
var box = getBoundingClientRect(el);
out = out || {};
out.zrX = e.clientX - box.left;
out.zrY = e.clientY - box.top;
}

/**
* 如果存在第三方嵌入的一些dom触发的事件，或touch事件，需要转换一下事件坐标
* 如果存在第三方嵌入的一些dom触发的事件，或touch事件，需要转换一下事件坐标.
* `calculate` is optional, default false.
*/
function normalizeEvent(el, e) {
function normalizeEvent(el, e, calculate) {

e = e || window.event;

Expand All @@ -18705,14 +18707,14 @@ return /******/ (function(modules) { // webpackBootstrap
var isTouch = eventType && eventType.indexOf('touch') >= 0;

if (!isTouch) {
clientToLocal(el, e, e);
clientToLocal(el, e, e, calculate);
e.zrDelta = (e.wheelDelta) ? e.wheelDelta / 120 : -(e.detail || 0) / 3;
}
else {
var touch = eventType != 'touchend'
? e.targetTouches[0]
: e.changedTouches[0];
touch && clientToLocal(el, touch, e);
touch && clientToLocal(el, touch, e, calculate);
}

return e;
Expand Down Expand Up @@ -19109,7 +19111,7 @@ return /******/ (function(modules) { // webpackBootstrap

for (var i = 0, len = touches.length; i < len; i++) {
var touch = touches[i];
var pos = eventUtil.clientToLocal(root, touch);
var pos = eventUtil.clientToLocal(root, touch, {});
trackItem.points.push([pos.zrX, pos.zrY]);
trackItem.touches.push(touch);
}
Expand Down Expand Up @@ -34458,7 +34460,7 @@ return /******/ (function(modules) { // webpackBootstrap
// Try trigger zrender event to avoid mouse
// in and out shape too frequently
var handler = zr.handler;
eventUtil.normalizeEvent(container, e);
eventUtil.normalizeEvent(container, e, true);
handler.dispatch('mousemove', e);
}
};
Expand Down Expand Up @@ -39567,7 +39569,6 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ function(module, exports) {

// shim for using process in browser

var process = module.exports = {};

// cached from whatever global is present so that test runners that stub it
Expand All @@ -39578,22 +39579,84 @@ return /******/ (function(modules) { // webpackBootstrap
var cachedSetTimeout;
var cachedClearTimeout;

function defaultSetTimout() {
throw new Error('setTimeout has not been defined');
}
function defaultClearTimeout () {
throw new Error('clearTimeout has not been defined');
}
(function () {
try {
cachedSetTimeout = setTimeout;
} catch (e) {
cachedSetTimeout = function () {
throw new Error('setTimeout is not defined');
}
}
try {
cachedClearTimeout = clearTimeout;
} catch (e) {
cachedClearTimeout = function () {
throw new Error('clearTimeout is not defined');
}
}
try {
if (typeof setTimeout === 'function') {
cachedSetTimeout = setTimeout;
} else {
cachedSetTimeout = defaultSetTimout;
}
} catch (e) {
cachedSetTimeout = defaultSetTimout;
}
try {
if (typeof clearTimeout === 'function') {
cachedClearTimeout = clearTimeout;
} else {
cachedClearTimeout = defaultClearTimeout;
}
} catch (e) {
cachedClearTimeout = defaultClearTimeout;
}
} ())
function runTimeout(fun) {
if (cachedSetTimeout === setTimeout) {
//normal enviroments in sane situations
return setTimeout(fun, 0);
}
// if setTimeout wasn't available but was latter defined
if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) {
cachedSetTimeout = setTimeout;
return setTimeout(fun, 0);
}
try {
// when when somebody has screwed with setTimeout but no I.E. maddness
return cachedSetTimeout(fun, 0);
} catch(e){
try {
// When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally
return cachedSetTimeout.call(null, fun, 0);
} catch(e){
// same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error
return cachedSetTimeout.call(this, fun, 0);
}
}


}
function runClearTimeout(marker) {
if (cachedClearTimeout === clearTimeout) {
//normal enviroments in sane situations
return clearTimeout(marker);
}
// if clearTimeout wasn't available but was latter defined
if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) {
cachedClearTimeout = clearTimeout;
return clearTimeout(marker);
}
try {
// when when somebody has screwed with setTimeout but no I.E. maddness
return cachedClearTimeout(marker);
} catch (e){
try {
// When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally
return cachedClearTimeout.call(null, marker);
} catch (e){
// same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error.
// Some versions of I.E. have different rules for clearTimeout vs setTimeout
return cachedClearTimeout.call(this, marker);
}
}



}
var queue = [];
var draining = false;
var currentQueue;
Expand All @@ -39618,7 +39681,7 @@ return /******/ (function(modules) { // webpackBootstrap
if (draining) {
return;
}
var timeout = cachedSetTimeout(cleanUpNextTick);
var timeout = runTimeout(cleanUpNextTick);
draining = true;

var len = queue.length;
Expand All @@ -39635,7 +39698,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
currentQueue = null;
draining = false;
cachedClearTimeout(timeout);
runClearTimeout(timeout);
}

process.nextTick = function (fun) {
Expand All @@ -39647,7 +39710,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
queue.push(new Item(fun, args));
if (queue.length === 1 && !draining) {
cachedSetTimeout(drainQueue, 0);
runTimeout(drainQueue);
}
};

Expand Down
Loading

0 comments on commit 1155d0c

Please sign in to comment.