Skip to content

Commit

Permalink
Preparations for build
Browse files Browse the repository at this point in the history
  • Loading branch information
TorsteinHonsi committed Jun 12, 2014
1 parent c7e2d85 commit 6188cbd
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@

<!-- This is the list of files for the maps module -->
<filelist id="maps.files" dir="${basedir}/js">
<file name="parts-map/Intro.js"/>
<file name="parts-map/IntroMapModule.js"/>
<file name="parts-map/Globals.js"/>
<file name="parts-map/MapAxis.js"/>
<file name="parts-map/ColorAxis.js"/>
Expand Down
27 changes: 15 additions & 12 deletions js/modules/data.src.js
Original file line number Diff line number Diff line change
Expand Up @@ -488,10 +488,11 @@
data,
i,
j,
seriesIndex;
seriesIndex,
chartOptions;


if (options.complete) {
if (options.complete || options.afterComplete) {

this.getColumnDistribution();

Expand Down Expand Up @@ -560,12 +561,20 @@
}

// Do the callback
options.complete({
chartOptions = {
xAxis: {
type: type
},
series: series
});
};
if (options.complete) {
options.complete(chartOptions);
}
// The afterComplete hook is used internally to avoid conflict with the externally
// available complete option.
if (options.afterComplete) {
options.afterComplete(chartOptions);
}
}
}
});
Expand All @@ -579,18 +588,12 @@
// Extend Chart.init so that the Chart constructor accepts a new configuration
// option group, data.
Highcharts.wrap(Highcharts.Chart.prototype, 'init', function (proceed, userOptions, callback) {
var chart = this,
completeOption;
var chart = this;

if (userOptions && userOptions.data) {
completeOption = userOptions.data.complete;
Highcharts.data(Highcharts.extend(userOptions.data, {
complete: function (dataOptions) {
afterComplete: function (dataOptions) {
var i, series;

if (completeOption) {
completeOption(dataOptions);
}

// Merge series configs
if (userOptions.hasOwnProperty('series')) {
Expand Down
1 change: 1 addition & 0 deletions js/modules/map.src.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* @license Highmaps JS v1.0.0-beta-modified ()
* The map module version 1.0.x is compatible with Highcharts 4.0.x.
*
* (c) 2011-2014 Torstein Honsi
*
Expand Down
12 changes: 12 additions & 0 deletions js/parts-map/IntroMapModule.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* @license @product.name@ JS [email protected]@ (@product.date@)
* The map module version 1.0.x is compatible with Highcharts 4.0.x.
*
* (c) 2011-2014 Torstein Honsi
*
* License: www.highcharts.com/license
*/

/*global HighchartsAdapter*/
(function (Highcharts) {

11 changes: 11 additions & 0 deletions utils/samples/compare-view.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,17 @@ function markList(className, difference) {
})
.html(diff)
.appendTo(li);
} else {
$span = $('<a>')
.attr({
'class': 'dissimilarity-index',
href: location.href.replace(/continue=true/, ''),
target: 'main',
title: 'Compare'
})
.html('<i class="icon-columns"></i>')
.appendTo(li);

}

if (_continue) {
Expand Down

0 comments on commit 6188cbd

Please sign in to comment.