##// END OF EJS Templates
Merge master
Merge master

File last commit:

r17198:7d582c78
r17684:d1de54f3 merge
Show More
widget_float.js
30 lines | 884 B | application/javascript | JavascriptLexer
Jonathan Frederic
Almost done!...
r17198 // Copyright (c) IPython Development Team.
// Distributed under the terms of the Modified BSD License.
Jonathan Frederic
Move js *RangeWidget code into *Widget
r14672
Jonathan Frederic
Almost done!...
r17198 define([
"widgets/js/widget",
"widgets/js/widget_int",
], function(widget, int_widgets){
var IntSliderView = int_widgets.IntSliderView;
var IntTextView = int_widgets.IntTextView;
Jonathan Frederic
Move js *RangeWidget code into *Widget
r14672
Jonathan Frederic
Float widget views now inherit from int counterparts
r14694 var FloatSliderView = IntSliderView.extend({
_validate_slide_value: function(x) {
// Validate the value of the slider before sending it to the back-end
// and applying it to the other views on the page.
return x;
Jonathan Frederic
Move js *RangeWidget code into *Widget
r14672 },
});
MinRK
quick review pass on javascript
r14792 var FloatTextView = IntTextView.extend({
Jonathan Frederic
Float widget views now inherit from int counterparts
r14694 _parse_value: function(value) {
// Parse the value stored in a string.
return parseFloat(value);
Jonathan Frederic
Move js *RangeWidget code into *Widget
r14672 },
});
Jonathan Frederic
Almost done!...
r17198
return {
'FloatSliderView': FloatSliderView,
'FloatTextView': FloatTextView,
};
Jonathan Frederic
Move js *RangeWidget code into *Widget
r14672 });