mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-05 12:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

s/BaseWidgetView/WidgetView and s/WidgetView/DOMWidgetView

Browse Source
This commit is contained in:
Jonathan Frederic 2014-01-08 10:16:00 +00:00
parent 44cf406ac0
commit a6fac70e03
8 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IPython/html/static/notebook/js/widgets/widget.js
View File

@ -90,7 +90,6 @@ function(widget_manager, underscore, backbone){
// Handle when a widget is updated via the python side.
apply_update: function (state) {
//this.updating = true;
for (var key in state) {
if (state.hasOwnProperty(key)) {
var value = state[key];
@ -184,7 +183,7 @@ function(widget_manager, underscore, backbone){
//--------------------------------------------------------------------
// WidgetView class
//--------------------------------------------------------------------
var BaseWidgetView = Backbone.View.extend({
var WidgetView = Backbone.View.extend({
initialize: function(options) {
this.model.on('change',this.update,this);
this.widget_manager = options.widget_manager;
@ -244,12 +243,12 @@ function(widget_manager, underscore, backbone){
});
var WidgetView = BaseWidgetView.extend({
var DOMWidgetView = WidgetView.extend({
initialize: function (options) {
// TODO: make changes more granular (e.g., trigger on visible:change)
this.model.on('change', this.update, this);
this.model.on('msg:custom', this.on_msg, this);
BaseWidgetView.prototype.initialize.apply(this, arguments);
WidgetView.prototype.initialize.apply(this, arguments);
},
on_msg: function(msg) {
@ -323,7 +322,7 @@ function(widget_manager, underscore, backbone){
IPython.WidgetModel = WidgetModel;
IPython.WidgetView = WidgetView;
IPython.BaseWidgetView = BaseWidgetView;
IPython.DOMWidgetView = DOMWidgetView;
return widget_manager;
});

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

@ -19,7 +19,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
var BoolWidgetModel = IPython.WidgetModel.extend({});
widget_manager.register_widget_model('BoolWidgetModel', BoolWidgetModel);
var CheckboxView = IPython.WidgetView.extend({
var CheckboxView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render : function(){
@ -61,14 +61,14 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.$label.show();
}
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
});
widget_manager.register_widget_view('CheckboxView', CheckboxView);
var ToggleButtonView = IPython.WidgetView.extend({
var ToggleButtonView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render : function(){
@ -104,7 +104,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.$button.html(description);
}
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
events: {"click button" : "handleClick"},

4
IPython/html/static/notebook/js/widgets/widget_button.js
View File

@ -19,7 +19,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
var ButtonWidgetModel = IPython.WidgetModel.extend({});
widget_manager.register_widget_model('ButtonWidgetModel', ButtonWidgetModel);
var ButtonView = IPython.WidgetView.extend({
var ButtonView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render : function(){
@ -48,7 +48,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.$el.removeAttr('disabled');
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
events: {

10
IPython/html/static/notebook/js/widgets/widget_container.js
View File

@ -47,7 +47,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager) {
var ContainerModel = IPython.WidgetModel.extend({});
widget_manager.register_widget_model('ContainerWidgetModel', ContainerModel);
var ContainerView = IPython.WidgetView.extend({
var ContainerView = IPython.DOMWidgetView.extend({
render: function(){
this.$el
@ -70,14 +70,14 @@ define(["notebook/js/widgets/widget"], function(widget_manager) {
update: function(){
set_flex_properties(this, this.$el);
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
});
widget_manager.register_widget_view('ContainerView', ContainerView);
var ModalView = IPython.WidgetView.extend({
var ModalView = IPython.DOMWidgetView.extend({
render: function(){
var that = this;
@ -250,7 +250,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager) {
this.show();
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
_get_selector_element: function(selector) {
@ -269,7 +269,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager) {
return this.$window.find(selector.substring(6));
}
} else {
return IPython.WidgetView.prototype._get_selector_element.call(this, selector);
return IPython.DOMWidgetView.prototype._get_selector_element.call(this, selector);
}
},

4
IPython/html/static/notebook/js/widgets/widget_image.js
View File

@ -18,7 +18,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
var ImageWidgetModel = IPython.WidgetModel.extend({});
widget_manager.register_widget_model('ImageWidgetModel', ImageWidgetModel);
var ImageView = IPython.WidgetView.extend({
var ImageView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render : function(){
@ -45,7 +45,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
} else {
this.$el.removeAttr('height');
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
});

10
IPython/html/static/notebook/js/widgets/widget_multicontainer.js
View File

@ -18,7 +18,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
var MulticontainerModel = IPython.WidgetModel.extend({});
widget_manager.register_widget_model('MulticontainerWidgetModel', MulticontainerModel);
var AccordionView = IPython.WidgetView.extend({
var AccordionView = IPython.DOMWidgetView.extend({
render: function(){
var guid = 'accordion' + IPython.utils.uuid();
@ -71,7 +71,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
}
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
add_child_view: function(view) {
@ -117,11 +117,11 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
widget_manager.register_widget_view('AccordionView', AccordionView);
var TabView = IPython.WidgetView.extend({
var TabView = IPython.DOMWidgetView.extend({
initialize: function() {
this.containers = [];
IPython.WidgetView.prototype.initialize.apply(this, arguments);
IPython.DOMWidgetView.prototype.initialize.apply(this, arguments);
},
render: function(){
@ -167,7 +167,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.select_page(selected_index);
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
add_child_view: function(view) {

16
IPython/html/static/notebook/js/widgets/widget_selection.js
View File

@ -18,7 +18,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
var SelectionWidgetModel = IPython.WidgetModel.extend({});
widget_manager.register_widget_model('SelectionWidgetModel', SelectionWidgetModel);
var DropdownView = IPython.WidgetView.extend({
var DropdownView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render : function(){
@ -97,7 +97,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
// Handle when a value is clicked.
@ -110,7 +110,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
widget_manager.register_widget_view('DropdownView', DropdownView);
var RadioButtonsView = IPython.WidgetView.extend({
var RadioButtonsView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render : function(){
@ -184,7 +184,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
// Handle when a value is clicked.
@ -197,7 +197,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
widget_manager.register_widget_view('RadioButtonsView', RadioButtonsView);
var ToggleButtonsView = IPython.WidgetView.extend({
var ToggleButtonsView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render : function(){
@ -266,7 +266,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
// Handle when a value is clicked.
@ -279,7 +279,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
widget_manager.register_widget_view('ToggleButtonsView', ToggleButtonsView);
var ListBoxView = IPython.WidgetView.extend({
var ListBoxView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render : function(){
@ -345,7 +345,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
// Handle when a value is clicked.

16
IPython/html/static/notebook/js/widgets/widget_string.js
View File

@ -18,7 +18,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
var StringWidgetModel = IPython.WidgetModel.extend({});
widget_manager.register_widget_model('StringWidgetModel', StringWidgetModel);
var HTMLView = IPython.WidgetView.extend({
var HTMLView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render : function(){
@ -29,7 +29,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
// Frontent -> Frontend Sync
update : function(){
this.$el.html(this.model.get('value'));
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
});
@ -37,7 +37,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
widget_manager.register_widget_view('HTMLView', HTMLView);
var LatexView = IPython.WidgetView.extend({
var LatexView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render : function(){
@ -50,14 +50,14 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.$el.html(this.model.get('value'));
MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$el.get(0)]);
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
});
widget_manager.register_widget_view('LatexView', LatexView);
var TextAreaView = IPython.WidgetView.extend({
var TextAreaView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render: function(){
@ -108,7 +108,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
events: {"keyup textarea": "handleChanging",
@ -126,7 +126,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
widget_manager.register_widget_view('TextAreaView', TextAreaView);
var TextBoxView = IPython.WidgetView.extend({
var TextBoxView = IPython.DOMWidgetView.extend({
// Called when view is rendered.
render: function(){
@ -162,7 +162,7 @@ define(["notebook/js/widgets/widget"], function(widget_manager){
this.$label.html(description);
this.$label.show();
}
return IPython.WidgetView.prototype.update.call(this);
return IPython.DOMWidgetView.prototype.update.call(this);
},
events: {"keyup input": "handleChanging",