Skip to content

Commit

Permalink
Merge pull request #5 from Gamemaniak/master
Browse files Browse the repository at this point in the history
updated to 1.3.10
  • Loading branch information
nesbert committed Mar 13, 2014
2 parents 8ec2b13 + dfa972d commit 10835f6
Show file tree
Hide file tree
Showing 24 changed files with 3,265 additions and 2,749 deletions.
2 changes: 1 addition & 1 deletion adapters/mootools-adapter.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion adapters/mootools-adapter.src.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Highstock JS v1.3.9 (2014-01-15)
* @license Highstock JS v1.3.10 (2014-03-10)
* MooTools adapter
*
* (c) 2010-2014 Torstein Honsi
Expand Down
2 changes: 1 addition & 1 deletion adapters/prototype-adapter.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion adapters/prototype-adapter.src.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Highstock JS v1.3.9 (2014-01-15)
* @license Highstock JS v1.3.10 (2014-03-10)
* Prototype adapter
*
* @author Michael Nelson, Torstein Honsi.
Expand Down
23 changes: 12 additions & 11 deletions adapters/standalone-framework.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 13 additions & 15 deletions adapters/standalone-framework.src.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Highstock JS v1.3.9 (2014-01-15)
* @license Highstock JS v1.3.10 (2014-03-10)
*
* Standalone Highcharts Framework
*
Expand Down Expand Up @@ -304,7 +304,7 @@ return {
// HTML styles
} else {
styles = {};
styles[elem] = this.now + this.unit;
styles[this.prop] = this.now + this.unit;
Highcharts.css(elem, styles);
}

Expand Down Expand Up @@ -350,9 +350,10 @@ return {
ret,
done,
options = this.options,
elem = this.elem,
i;

if (this.elem.stopAnimation) {
if (elem.stopAnimation || (elem.attr && !elem.element)) { // #2616, element including flag is destroyed
ret = false;

} else if (gotoEnd || t >= options.duration + this.startTime) {
Expand All @@ -371,7 +372,7 @@ return {

if (done) {
if (options.complete) {
options.complete.call(this.elem);
options.complete.call(elem);
}
}
ret = false;
Expand Down Expand Up @@ -504,19 +505,16 @@ return {
return results;
},

/**
* Get the element's offset position, corrected by overflow:auto. Loosely based on jQuery's offset method.
*/
offset: function (el) {
var left = 0,
top = 0;

while (el) {
left += el.offsetLeft;
top += el.offsetTop;
el = el.offsetParent;
}
var docElem = document.documentElement,
box = el.getBoundingClientRect();

return {
left: left,
top: top
top: box.top + (window.pageYOffset || docElem.scrollTop) - (docElem.clientTop || 0),
left: box.left + (window.pageXOffset || docElem.scrollLeft) - (docElem.clientLeft || 0)
};
},

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "highstock",
"version": "1.3.9",
"version": "1.3.10",
"description": "Highstock lets you create stock or general timeline charts in pure JavaScript, including sophisticated navigation options like a small navigator series, preset date ranges, date picker, scrolling and panning.",
"homepage": "http://www.highcharts.com/products/highstock",
"keywords": [
Expand Down
Loading

0 comments on commit 10835f6

Please sign in to comment.