Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ab204e3

Browse files
raunakkathuriaraunakkathuria
committed
Merge pull request binary-com#14 from junbon/quant/minor_release
quant/minor_release
2 parents 1c295df + 08a72be commit ab204e3

File tree

8 files changed

+143
-81
lines changed

8 files changed

+143
-81
lines changed

‎Gruntfile.js

Lines changed: 25 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module.exports = function (grunt) {
22
// Configurations
33
grunt.initConfig({
44
pkg: grunt.file.readJSON('package.json'),
5+
javascripts: grunt.file.readJSON('javascript.json'),
56
clean: {
67
build: {
78
src: ['dist'],
@@ -37,82 +38,9 @@ module.exports = function (grunt) {
3738
},
3839
},
3940
},
40-
concat: {
41-
options: {
42-
separator: ';',
43-
},
44-
dist: {
45-
src: [
46-
'src/javascript/external/jquery-2.0.3.min.js',
47-
'src/javascript/external/jQuery.XDomainRequest.js',
48-
'src/javascript/external/jquery.cookie.js',
49-
'src/javascript/external/json2.min.js',
50-
'src/javascript/external/moment-2.5.0.min.js',
51-
'src/javascript/external/moment-lang-2.5.0.min.js',
52-
'src/javascript/external/jquery-ui-1.10.2.min.js',
53-
'src/javascript/external/jquery.sparkline.min.js',
54-
'src/javascript/external/jquery-simplyscroll-2.0.5.min.js',
55-
'src/javascript/external/jquery-scrollto-1.4.3.1-min.js',
56-
'src/javascript/external/jquery-slides-1.2.min.js',
57-
'src/javascript/external/jstree/jquery.jstree.js',
58-
'src/javascript/external/jquery-ui-timepicker/jquery.ui.timepicker.js',
59-
'src/javascript/external/eventsource.js',
60-
'src/javascript/external/deployJava.js',
61-
'src/javascript/base/onerror.js',
62-
'src/javascript/base/pjax-lib.js',
63-
'src/javascript/external/mmenu/jquery.mmenu.min.all.js',
64-
'src/javascript/form_validation.js',
65-
'src/javascript/base/storage.js',
66-
'src/javascript/base/pjax.js',
67-
'src/javascript/base/page.js',
68-
'src/javascript/base/spot_light.js',
69-
'src/javascript/base/menu_content.js',
70-
'src/javascript/base/jquery_color_animation.js',
71-
'src/javascript/base/markets.js',
72-
'src/javascript/base/load_data.js',
73-
'src/javascript/base.js',
74-
'src/javascript/base/inpage_popup.js',
75-
'src/javascript/utility.js',
76-
'src/javascript/gtm.js',
77-
'src/javascript/components/date_picker.js',
78-
'src/javascript/components/date_picker/selected_dates.js',
79-
'src/javascript/components/time_picker.js',
80-
'src/javascript/pages.js',
81-
'src/javascript/pages/bet/bet_form.js',
82-
'src/javascript/pages/bet/bet_form/attributes.js',
83-
'src/javascript/pages/bet/bet_form/barriers.js',
84-
'src/javascript/pages/bet/bet_form/time.js',
85-
'src/javascript/pages/bet/bet_analysis.js',
86-
'src/javascript/pages/bet/bet_analysis/live_chart.js',
87-
'src/javascript/pages/bet/bet_analysis/digit_info.js',
88-
'src/javascript/pages/bet/bet_price.js',
89-
'src/javascript/pages/bet/pricing_details.js',
90-
'src/javascript/pages/bet/bet_sell.js',
91-
'src/javascript/pages/bet/tick_trade.js',
92-
'src/javascript/pages/bet.js',
93-
'src/javascript/pages/client/form.js',
94-
'src/javascript/pages/client.js',
95-
'src/javascript/pages/chart.js',
96-
'src/javascript/pages/pricingtable.js',
97-
'src/javascript/pages/statement.js',
98-
'src/javascript/pages/selfexclusion.js',
99-
'src/javascript/pages/frontend.js',
100-
'src/javascript/pages/portfolio.js',
101-
'src/javascript/pages/contact.js',
102-
'src/javascript/base/on_complete.js',
103-
'src/javascript/base/appcache_check.js',
104-
'src/javascript/livechart/highstock.js',
105-
'src/javascript/livechart/highstock-exporting.js',
106-
'src/javascript/livechart/export-csv.js',
107-
'src/javascript/livechart/config.js',
108-
'src/javascript/livechart/datetime_picker.js',
109-
'src/javascript/livechart/indicator.js',
110-
'src/javascript/livechart.js',
111-
'src/javascript/pages/livechart.js'
112-
],
113-
dest: 'dist/<%= pkg.version %>/js/binary.js',
114-
},
115-
},
41+
concat: {
42+
// will be populated in createJavascriptArray function
43+
},
11644
uglify: {
11745
my_target: {
11846
options: {
@@ -127,6 +55,8 @@ module.exports = function (grunt) {
12755
copy: {
12856
main: {
12957
files: [
58+
{expand: true, src: ['javascript.json'], dest: 'dist/<%= pkg.version %>/',},
59+
{expand: true, src: ['javascript.json'], dest: 'dist/0.0.0/',},
13060
{expand: true, cwd: 'src/config/locales/', src: ['**'], dest: 'dist/<%= pkg.version %>/config/locales/'},
13161
{expand: true, cwd: 'src/config/locales/', src: ['**'], dest: 'dist/0.0.0/config/locales/'},
13262
{expand: true, cwd: 'src/images/', src: ['**'], dest: 'dist/<%= pkg.version %>/images/',},
@@ -143,7 +73,9 @@ module.exports = function (grunt) {
14373
{expand: true, cwd: 'src/css/external/jquery-ui-custom-theme/', src: ['jquery-ui-1.10.2.custom.css'], dest: 'dist/0.0.0/css/',},
14474
{expand: true, cwd: 'src/css/fonts/', src: ['**'], dest: 'dist/<%= pkg.version %>/css/fonts'},
14575
{expand: true, cwd: 'src/css/fonts/', src: ['**'], dest: 'dist/0.0.0/css/fonts'},
146-
{expand: true, cwd: 'dist/<%= pkg.version %>/', src: ['**'], dest: 'dist/0.0.0/',}
76+
{expand: true, cwd: 'dist/<%= pkg.version %>/', src: ['**'], dest: 'dist/0.0.0/',},
77+
{expand: true, cwd: 'src/javascript/', src: ['**'], dest: 'dist/<%= pkg.version %>/dev/javascript/',},
78+
{expand: true, cwd: 'src/javascript/', src: ['**'], dest: 'dist/0.0.0/dev/javascript/',}
14779
],
14880
}
14981
},
@@ -247,6 +179,22 @@ module.exports = function (grunt) {
247179
},
248180
}
249181
});
182+
function createJavascriptArray() {
183+
var jsJson = grunt.file.readJSON('javascript.json');
184+
var jsFiles = jsJson.files.map(function (path) {
185+
return 'src/' + path;
186+
});
187+
grunt.config('concat', {
188+
options: {
189+
separator: ';',
190+
},
191+
dist: {
192+
src: jsFiles,
193+
dest: 'dist/<%= pkg.version %>/js/binary.js',
194+
},
195+
});
196+
}
197+
createJavascriptArray();
250198

251199
// load the plugin that will complete the task
252200
grunt.loadNpmTasks('grunt-bump');

‎javascript.json

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"files": [
3+
"javascript/external/jquery-2.0.3.min.js",
4+
"javascript/external/jQuery.XDomainRequest.js",
5+
"javascript/external/jquery.cookie.js",
6+
"javascript/external/moment-2.5.0.min.js",
7+
"javascript/external/moment-lang-2.5.0.min.js",
8+
"javascript/external/jquery-ui-1.10.2.min.js",
9+
"javascript/external/jquery.sparkline.min.js",
10+
"javascript/external/jquery-simplyscroll-2.0.5.min.js",
11+
"javascript/external/jquery-scrollto-1.4.3.1-min.js",
12+
"javascript/external/jquery-slides-1.2.min.js",
13+
"javascript/external/jstree/jquery.jstree.js",
14+
"javascript/external/jquery-ui-timepicker/jquery.ui.timepicker.js",
15+
"javascript/external/eventsource.js",
16+
"javascript/external/deployJava.js",
17+
"javascript/base/onerror.js",
18+
"javascript/base/pjax-lib.js",
19+
"javascript/external/mmenu/jquery.mmenu.min.all.js",
20+
"javascript/form_validation.js",
21+
"javascript/base/storage.js",
22+
"javascript/base/pjax.js",
23+
"javascript/base/page.js",
24+
"javascript/base/spot_light.js",
25+
"javascript/base/menu_content.js",
26+
"javascript/base/jquery_color_animation.js",
27+
"javascript/base/markets.js",
28+
"javascript/base/load_data.js",
29+
"javascript/base.js",
30+
"javascript/base/inpage_popup.js",
31+
"javascript/utility.js",
32+
"javascript/gtm.js",
33+
"javascript/components/date_picker.js",
34+
"javascript/components/date_picker/selected_dates.js",
35+
"javascript/components/time_picker.js",
36+
"javascript/pages.js",
37+
"javascript/pages/bet/bet_form.js",
38+
"javascript/pages/bet/bet_form/attributes.js",
39+
"javascript/pages/bet/bet_form/barriers.js",
40+
"javascript/pages/bet/bet_form/time.js",
41+
"javascript/pages/bet/bet_analysis.js",
42+
"javascript/pages/bet/bet_analysis/live_chart.js",
43+
"javascript/pages/bet/bet_analysis/digit_info.js",
44+
"javascript/pages/bet/bet_price.js",
45+
"javascript/pages/bet/pricing_details.js",
46+
"javascript/pages/bet/bet_sell.js",
47+
"javascript/pages/bet/tick_trade.js",
48+
"javascript/pages/bet.js",
49+
"javascript/pages/client/form.js",
50+
"javascript/pages/client.js",
51+
"javascript/pages/chart.js",
52+
"javascript/pages/pricingtable.js",
53+
"javascript/pages/statement.js",
54+
"javascript/pages/selfexclusion.js",
55+
"javascript/pages/frontend.js",
56+
"javascript/pages/portfolio.js",
57+
"javascript/pages/contact.js",
58+
"javascript/base/on_complete.js",
59+
"javascript/base/appcache_check.js",
60+
"javascript/livechart/highstock.js",
61+
"javascript/livechart/highstock-exporting.js",
62+
"javascript/livechart/export-csv.js",
63+
"javascript/livechart/config.js",
64+
"javascript/livechart/datetime_picker.js",
65+
"javascript/livechart/indicator.js",
66+
"javascript/livechart.js",
67+
"javascript/pages/livechart.js"
68+
]
69+
}

‎src/images/pages/tick_trade/new_tick_trade_digit.png

185 KB
Loading

‎src/images/pages/tick_trade/new_tick_trade_updown.png

169 KB
Loading

‎src/javascript/livechart.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,20 @@ LiveChartTick.prototype = new LiveChart();
267267
LiveChartTick.prototype.constructor = LiveChartTick;
268268
LiveChartTick.prototype.configure_series = function(chart_params) {
269269
chart_params.chart.type = 'line';
270+
var symbol = this.config.symbol.translated_display_name();
271+
var old_decimal = 0;
272+
chart_params.tooltip = {
273+
formatter: function () {
274+
var that = this;
275+
var new_decimal = that.y.toString().split('.')[1].length;
276+
var decimal_places = Math.max( old_decimal, new_decimal);
277+
old_decimal = decimal_places;
278+
var new_y = that.y.toFixed(decimal_places);
279+
var mom = moment.utc(that.x*1000).format("dddd, MMM D, HH:mm:ss");
280+
return mom + "<br/>" + symbol + " " + new_y;
281+
},
282+
};
283+
270284
if (this.config.with_tick_config) {
271285
chart_params.xAxis.labels = {enabled: false};
272286
} else {

‎src/javascript/pages/bet.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,17 @@ pjax_config_page('portfolio|trade.cgi|statement|f_manager_statement|f_manager_hi
129129
}
130130
};
131131
});
132+
133+
pjax_config_page('tick_trades', function() {
134+
return {
135+
onLoad: function() {
136+
$('#show-new').on('click', function(){
137+
$('#ticktrade-updown').hide();
138+
$('#ticktrade-digit').hide();
139+
$('#ticktrade-new-msg').hide();
140+
$('#runbet_tools_container').show();
141+
$('#ticktrade-flash').show();
142+
});
143+
},
144+
};
145+
});

‎src/javascript/pages/bet/bet_analysis/digit_info.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ BetAnalysis.DigitInfo = function() {
2020
tooltip:{
2121
borderWidth:1,
2222
formatter:function() {
23-
return '<b>Digit:</b> '+ this.x +'<br/>'+
24-
'<b>Count:</b> '+ this.y;
23+
var that = this;
24+
var total = $("select[name='tick_count']").val();
25+
var percentage = that.y/total*100;
26+
return '<b>Digit:</b> '+ that.x +'<br/>'+
27+
'<b>Percentage:</b> '+ percentage.toFixed(2) + " %";
2528
}
2629
},
2730
plotOptions:{
@@ -51,6 +54,13 @@ BetAnalysis.DigitInfo = function() {
5154
tickColor:'#ccc',
5255
lineColor:'#ccc',
5356
endOnTick:true,
57+
labels: {
58+
formatter: function() {
59+
var total = $("select[name='tick_count']").val();
60+
var percentage = parseInt(this.value/total*100);
61+
return percentage + " %";
62+
},
63+
},
5464
},
5565
};
5666

@@ -106,7 +116,6 @@ BetAnalysis.DigitInfo.prototype = {
106116
text: $('#last_digit_title').html(),
107117
};
108118
this.spots = $.parseJSON($('#last_digit_data').html());
109-
this.chart_config.yAxis.tickInterval = this.spots.length / 10;
110119
this.chart = new Highcharts.Chart(this.chart_config);
111120
this.chart.addSeries({name : underlying, data: []});
112121

‎src/javascript/pages/bet/bet_sell.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,25 +1036,33 @@ var BetSell = function() {
10361036
timestring += duration.minutes() + ' ' + input.minute.text_plural + ' ';
10371037
count++;
10381038
}
1039+
10391040
if (duration.seconds() == 1 && count < 2) {
10401041
timestring += duration.seconds() + ' ' + input.second.text;
10411042
count++;
10421043
} else if (duration.seconds() > 1 && count < 2) {
10431044
timestring += duration.seconds() + ' ' + input.second.text_plural;
10441045
count++;
1046+
} else if (duration.seconds() == 0 && count < 2) {
1047+
timestring += duration.seconds() + ' ' + input.second.text;
1048+
count++;
10451049
}
1050+
10461051
if (count === 0) {
10471052
that.resubmit_sell_at_market();
1053+
} else if (duration.seconds() !== 0) {
1054+
selector.html(timestring);
10481055
} else {
10491056
selector.html(timestring);
1057+
that.basic_cleanup();
10501058
}
10511059
return anonymous;
10521060
}(), Math.abs(interval) * 1000);
10531061
},
10541062
create_date_timer: function(selector) {
10551063
var interval = 1;
10561064
var that = this;
1057-
var epoch_time = parseInt(selector.attr('epoch_time'));
1065+
var epoch_time = parseInt(selector.attr('epoch_time')) + 1;
10581066
_timer_interval_obj[Object.keys(_timer_interval_obj).length] = setInterval(function anonymous() {
10591067
epoch_time += interval;
10601068
var date = that.get_date_from_seconds(epoch_time);

0 commit comments

Comments
 (0)