Skip to content

Commit

Permalink
#29 recompiled bin
Browse files Browse the repository at this point in the history
  • Loading branch information
@itayw
itayw committed Oct 26, 2014
1 parent b110e9a commit 358d8c1
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 22 deletions.
19 changes: 10 additions & 9 deletions build/release/joola.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18668,6 +18668,7 @@ joola.init = function (options, callback) {
if (typeof (jQuery) === 'undefined') {
script = document.createElement('script');
expected++;

script.onload = function () {
//jQuery.noConflict(true);

Expand All @@ -18683,23 +18684,23 @@ joola.init = function (options, callback) {
script.onload = function () {
done('highcharts-nodata');
};
script.src = '//code.highcharts.com/modules/no-data-to-display.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//code.highcharts.com/modules/no-data-to-display.js';
document.head.appendChild(script);

done('highcharts');
};
script.src = '//code.highcharts.com/highcharts.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//code.highcharts.com/highcharts.js';
document.head.appendChild(script);


done('jquery-ui');
};
script.src = '//ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js';
document.head.appendChild(script);

done('jquery');
};
script.src = '//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js';
document.head.appendChild(script);
}
else if (typeof (Highcharts) === 'undefined') {
Expand All @@ -18711,12 +18712,12 @@ joola.init = function (options, callback) {
script.onload = function () {
done('highcharts-nodata-2');
};
script.src = '//code.highcharts.com/modules/no-data-to-display.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//code.highcharts.com/modules/no-data-to-display.js';
document.head.appendChild(script);

done('highcharts-2');
};
script.src = '//code.highcharts.com/highcharts.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//code.highcharts.com/highcharts.js';
document.head.appendChild(script);
}

Expand All @@ -18726,7 +18727,7 @@ joola.init = function (options, callback) {
script.onload = function () {
done('tablesort');
};
script.src = '//cdn.rawgit.com/tristen/tablesort/gh-pages/tablesort.min.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//cdn.rawgit.com/tristen/tablesort/gh-pages/tablesort.min.js';
document.head.appendChild(script);
}

Expand Down Expand Up @@ -23115,7 +23116,8 @@ var Table = module.exports = function (options, callback) {
self.tablesort = new Tablesort(self.options.$container.find('table').get(0), {
descending: true
});
self.tablesort.sortTable(self.options.$container.find('th')[2]);
if (self.options.$container.find('th')[2] > 0)
self.tablesort.sortTable(self.options.$container.find('th')[2]);
if (self.options.onDraw)
window[self.options.onDraw](self.options.container, self);

Expand Down Expand Up @@ -24111,7 +24113,6 @@ proto.makeChartTimelineSeries = function (message) {
data: [],
yAxis: _yaxis
};
console.log('y', _yaxis, index, metric._key);
documents.forEach(function (document, docIndex) {
var x = document.fvalues[dimensions[0].key];
var nameBased = true;
Expand Down
7 changes: 4 additions & 3 deletions build/release/joola.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/release/joola.min.js.map
View file

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions build/temp/joola.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18668,6 +18668,7 @@ joola.init = function (options, callback) {
if (typeof (jQuery) === 'undefined') {
script = document.createElement('script');
expected++;

script.onload = function () {
//jQuery.noConflict(true);

Expand All @@ -18683,23 +18684,23 @@ joola.init = function (options, callback) {
script.onload = function () {
done('highcharts-nodata');
};
script.src = '//code.highcharts.com/modules/no-data-to-display.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//code.highcharts.com/modules/no-data-to-display.js';
document.head.appendChild(script);

done('highcharts');
};
script.src = '//code.highcharts.com/highcharts.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//code.highcharts.com/highcharts.js';
document.head.appendChild(script);


done('jquery-ui');
};
script.src = '//ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js';
document.head.appendChild(script);

done('jquery');
};
script.src = '//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js';
document.head.appendChild(script);
}
else if (typeof (Highcharts) === 'undefined') {
Expand All @@ -18711,12 +18712,12 @@ joola.init = function (options, callback) {
script.onload = function () {
done('highcharts-nodata-2');
};
script.src = '//code.highcharts.com/modules/no-data-to-display.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//code.highcharts.com/modules/no-data-to-display.js';
document.head.appendChild(script);

done('highcharts-2');
};
script.src = '//code.highcharts.com/highcharts.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//code.highcharts.com/highcharts.js';
document.head.appendChild(script);
}

Expand All @@ -18726,7 +18727,7 @@ joola.init = function (options, callback) {
script.onload = function () {
done('tablesort');
};
script.src = '//cdn.rawgit.com/tristen/tablesort/gh-pages/tablesort.min.js';
script.src = (location.protocol === 'file:' ? 'http://' : '') + '//cdn.rawgit.com/tristen/tablesort/gh-pages/tablesort.min.js';
document.head.appendChild(script);
}

Expand Down Expand Up @@ -23115,7 +23116,8 @@ var Table = module.exports = function (options, callback) {
self.tablesort = new Tablesort(self.options.$container.find('table').get(0), {
descending: true
});
self.tablesort.sortTable(self.options.$container.find('th')[2]);
if (self.options.$container.find('th')[2] > 0)
self.tablesort.sortTable(self.options.$container.find('th')[2]);
if (self.options.onDraw)
window[self.options.onDraw](self.options.container, self);

Expand Down Expand Up @@ -24111,7 +24113,6 @@ proto.makeChartTimelineSeries = function (message) {
data: [],
yAxis: _yaxis
};
console.log('y', _yaxis, index, metric._key);
documents.forEach(function (document, docIndex) {
var x = document.fvalues[dimensions[0].key];
var nameBased = true;
Expand Down

0 comments on commit 358d8c1

Please sign in to comment.