mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added labels to basic widgets

Browse Source
This commit is contained in:
Jonathan Frederic 2013-10-29 09:46:27 -07:00
parent 9b891d4018
commit f2d77f3b78
8 changed files with 95 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
IPython/html/static/notebook/js/widgets/bool.js
View File

@ -13,12 +13,14 @@ require(["notebook/js/widget"], function(){
var $label = $('<label />') var $label = $('<label />')
.addClass('checkbox') .addClass('checkbox')
.addClass('widget-label')
.appendTo(this.$el); .appendTo(this.$el);
this.$checkbox_label = $('<div />')
.appendTo($label)
.hide();
this.$checkbox = $('<input />') this.$checkbox = $('<input />')
.attr('type', 'checkbox') .attr('type', 'checkbox')
.appendTo($label); .appendTo($label);
this.$checkbox_label = $('<div />')
.appendTo($label);
this.update(); // Set defaults. this.update(); // Set defaults.
}, },
@ -28,7 +30,14 @@ require(["notebook/js/widget"], function(){
update : function(){ update : function(){
if (!this.user_invoked_update) { if (!this.user_invoked_update) {
this.$checkbox.prop('checked', this.model.get('value')); this.$checkbox.prop('checked', this.model.get('value'));
this.$checkbox_label.html(this.model.get('description'));
var description = this.model.get('description');
if (description.length == 0) {
this.$checkbox_label.hide();
} else {
this.$checkbox_label.html(description);
this.$checkbox_label.show();
}
} }
return IPython.WidgetView.prototype.update.call(this); return IPython.WidgetView.prototype.update.call(this);
}, },
@ -71,7 +80,13 @@ require(["notebook/js/widget"], function(){
} else { } else {
this.$button.removeClass('active'); this.$button.removeClass('active');
} }
this.$button.html(this.model.get('description'));
var description = this.model.get('description');
if (description.length == 0) {
this.$button.html(' '); // Preserve button height
} else {
this.$button.html(description);
}
} }
return IPython.WidgetView.prototype.update.call(this); return IPython.WidgetView.prototype.update.call(this);
}, },

8
IPython/html/static/notebook/js/widgets/button.js
View File

@ -22,7 +22,13 @@ require(["notebook/js/widget"], function(){
// Handles: Backend -> Frontend Sync // Handles: Backend -> Frontend Sync
// Frontent -> Frontend Sync // Frontent -> Frontend Sync
update : function(){ update : function(){
this.$el.html(this.model.get('description')); var description = this.model.get('description');
if (description.length==0) {
this.$el.html(' '); // Preserve button height
} else {
this.$el.html(description);
}
return IPython.WidgetView.prototype.update.call(this); return IPython.WidgetView.prototype.update.call(this);
}, },

36
IPython/html/static/notebook/js/widgets/selection.js
View File

@ -9,6 +9,10 @@ require(["notebook/js/widget"], function(){
this.$el this.$el
.html(''); .html('');
this.$label = $('<div />')
.appendTo(this.$el)
.addClass('widget-label')
.hide();
this.$buttongroup = $('<div />') this.$buttongroup = $('<div />')
.addClass('widget_item') .addClass('widget_item')
.addClass('btn-group') .addClass('btn-group')
@ -60,6 +64,14 @@ require(["notebook/js/widget"], function(){
this.$dropbutton.removeAttr('disabled'); this.$dropbutton.removeAttr('disabled');
this.$droplist.removeAttr('disabled'); this.$droplist.removeAttr('disabled');
} }
var description = this.model.get('description');
if (description.length == 0) {
this.$label.hide();
} else {
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this); return IPython.WidgetView.prototype.update.call(this);
}, },
@ -73,6 +85,10 @@ require(["notebook/js/widget"], function(){
render : function(){ render : function(){
this.$el this.$el
.html(''); .html('');
this.$label = $('<div />')
.appendTo(this.$el)
.addClass('widget-label')
.hide();
this.update(); this.update();
}, },
@ -124,6 +140,14 @@ require(["notebook/js/widget"], function(){
$(obj).parent().remove(); $(obj).parent().remove();
} }
}); });
var description = this.model.get('description');
if (description.length == 0) {
this.$label.hide();
} else {
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this); return IPython.WidgetView.prototype.update.call(this);
}, },
@ -138,6 +162,10 @@ require(["notebook/js/widget"], function(){
render : function(){ render : function(){
this.$el this.$el
.html(''); .html('');
this.$label = $('<div />')
.appendTo(this.$el)
.addClass('widget-label')
.hide();
this.$buttongroup = $('<div />') this.$buttongroup = $('<div />')
.addClass('btn-group') .addClass('btn-group')
.attr('data-toggle', 'buttons-radio') .attr('data-toggle', 'buttons-radio')
@ -189,6 +217,14 @@ require(["notebook/js/widget"], function(){
$(obj).remove(); $(obj).remove();
} }
}); });
var description = this.model.get('description');
if (description.length == 0) {
this.$label.hide();
} else {
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this); return IPython.WidgetView.prototype.update.call(this);
}, },

24
IPython/html/static/notebook/js/widgets/string.js
View File

@ -27,6 +27,10 @@ require(["notebook/js/widget"], function(){
render : function(){ render : function(){
this.$el this.$el
.html(''); .html('');
this.$label = $('<div />')
.appendTo(this.$el)
.addClass('widget-label')
.hide();
this.$textbox = $('<textarea />') this.$textbox = $('<textarea />')
.attr('rows', 5) .attr('rows', 5)
.appendTo(this.$el); .appendTo(this.$el);
@ -39,6 +43,14 @@ require(["notebook/js/widget"], function(){
if (!this.user_invoked_update) { if (!this.user_invoked_update) {
this.$textbox.val(this.model.get('value')); this.$textbox.val(this.model.get('value'));
} }
var description = this.model.get('description');
if (description.length == 0) {
this.$label.hide();
} else {
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this); return IPython.WidgetView.prototype.update.call(this);
}, },
@ -63,6 +75,10 @@ require(["notebook/js/widget"], function(){
render : function(){ render : function(){
this.$el this.$el
.html(''); .html('');
this.$label = $('<div />')
.addClass('widget-label')
.appendTo(this.$el)
.hide();
this.$textbox = $('<input type="text" />') this.$textbox = $('<input type="text" />')
.addClass('input') .addClass('input')
.appendTo(this.$el); .appendTo(this.$el);
@ -75,6 +91,14 @@ require(["notebook/js/widget"], function(){
if (!this.user_invoked_update) { if (!this.user_invoked_update) {
this.$textbox.val(this.model.get('value')); this.$textbox.val(this.model.get('value'));
} }
var description = this.model.get('description');
if (description.length == 0) {
this.$label.hide();
} else {
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this); return IPython.WidgetView.prototype.update.call(this);
}, },

3
IPython/html/widgets/widget_float.py
View File

@ -24,6 +24,7 @@ class FloatWidget(Widget):
default_view_name = Unicode('FloatTextView') default_view_name = Unicode('FloatTextView')
# Keys # Keys
_keys = ['value', 'disabled'] _keys = ['value', 'disabled', 'description']
value = Float(0.0, help="Float value") value = Float(0.0, help="Float value")
disabled = Bool(False, help="Enable or disable user changes") disabled = Bool(False, help="Enable or disable user changes")
description = Unicode(help="Description of the value this widget represents")

3
IPython/html/widgets/widget_int.py
View File

@ -24,6 +24,7 @@ class IntWidget(Widget):
default_view_name = Unicode('IntTextView') default_view_name = Unicode('IntTextView')
# Keys # Keys
_keys = ['value', 'disabled'] _keys = ['value', 'disabled', 'description']
value = Int(0, help="Int value") value = Int(0, help="Int value")
disabled = Bool(False, help="Enable or disable user changes") disabled = Bool(False, help="Enable or disable user changes")
description = Unicode(help="Description of the value this widget represents")

3
IPython/html/widgets/widget_selection.py
View File

@ -24,8 +24,9 @@ class SelectionWidget(Widget):
default_view_name = Unicode('DropdownView') default_view_name = Unicode('DropdownView')
# Keys # Keys
_keys = ['value', 'values', 'disabled'] _keys = ['value', 'values', 'disabled', 'description']
value = Unicode(help="Selected value") value = Unicode(help="Selected value")
values = List(help="List of values the user can select") values = List(help="List of values the user can select")
disabled = Bool(False, help="Enable or disable user changes") disabled = Bool(False, help="Enable or disable user changes")
description = Unicode(help="Description of the value this widget represents")

3
IPython/html/widgets/widget_string.py
View File

@ -24,6 +24,7 @@ class StringWidget(Widget):
default_view_name = Unicode('TextBoxView') default_view_name = Unicode('TextBoxView')
# Keys # Keys
_keys = ['value', 'disabled'] _keys = ['value', 'disabled', 'description']
value = Unicode(help="String value") value = Unicode(help="String value")
disabled = Bool(False, help="Enable or disable user changes") disabled = Bool(False, help="Enable or disable user changes")
description = Unicode(help="Description of the value this widget represents")