From a6fac70e03b5d65d39aca318e5ab7ff2761415d9 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Wed, 8 Jan 2014 10:16:00 +0000 Subject: [PATCH] s/BaseWidgetView/WidgetView and s/WidgetView/DOMWidgetView --- .../html/static/notebook/js/widgets/widget.js | 9 ++++----- .../static/notebook/js/widgets/widget_bool.js | 8 ++++---- .../static/notebook/js/widgets/widget_button.js | 4 ++-- .../notebook/js/widgets/widget_container.js | 10 +++++----- .../static/notebook/js/widgets/widget_image.js | 4 ++-- .../notebook/js/widgets/widget_multicontainer.js | 10 +++++----- .../notebook/js/widgets/widget_selection.js | 16 ++++++++-------- .../static/notebook/js/widgets/widget_string.js | 16 ++++++++-------- 8 files changed, 38 insertions(+), 39 deletions(-) diff --git a/IPython/html/static/notebook/js/widgets/widget.js b/IPython/html/static/notebook/js/widgets/widget.js index 41419adcf..382a650ef 100644 --- a/IPython/html/static/notebook/js/widgets/widget.js +++ b/IPython/html/static/notebook/js/widgets/widget.js @@ -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; }); diff --git a/IPython/html/static/notebook/js/widgets/widget_bool.js b/IPython/html/static/notebook/js/widgets/widget_bool.js index 2d6776462..be090ac09 100644 --- a/IPython/html/static/notebook/js/widgets/widget_bool.js +++ b/IPython/html/static/notebook/js/widgets/widget_bool.js @@ -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"}, diff --git a/IPython/html/static/notebook/js/widgets/widget_button.js b/IPython/html/static/notebook/js/widgets/widget_button.js index 956ee12c3..60d535f85 100644 --- a/IPython/html/static/notebook/js/widgets/widget_button.js +++ b/IPython/html/static/notebook/js/widgets/widget_button.js @@ -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: { diff --git a/IPython/html/static/notebook/js/widgets/widget_container.js b/IPython/html/static/notebook/js/widgets/widget_container.js index c7ffeae20..c04b29675 100644 --- a/IPython/html/static/notebook/js/widgets/widget_container.js +++ b/IPython/html/static/notebook/js/widgets/widget_container.js @@ -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); } }, diff --git a/IPython/html/static/notebook/js/widgets/widget_image.js b/IPython/html/static/notebook/js/widgets/widget_image.js index 3ffa1d10e..e72010af4 100644 --- a/IPython/html/static/notebook/js/widgets/widget_image.js +++ b/IPython/html/static/notebook/js/widgets/widget_image.js @@ -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); }, }); diff --git a/IPython/html/static/notebook/js/widgets/widget_multicontainer.js b/IPython/html/static/notebook/js/widgets/widget_multicontainer.js index 14ab50af3..d4781e7fa 100644 --- a/IPython/html/static/notebook/js/widgets/widget_multicontainer.js +++ b/IPython/html/static/notebook/js/widgets/widget_multicontainer.js @@ -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) { diff --git a/IPython/html/static/notebook/js/widgets/widget_selection.js b/IPython/html/static/notebook/js/widgets/widget_selection.js index 7bf7cef58..02ad8ef7c 100644 --- a/IPython/html/static/notebook/js/widgets/widget_selection.js +++ b/IPython/html/static/notebook/js/widgets/widget_selection.js @@ -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. diff --git a/IPython/html/static/notebook/js/widgets/widget_string.js b/IPython/html/static/notebook/js/widgets/widget_string.js index 65b765f28..d8e51067b 100644 --- a/IPython/html/static/notebook/js/widgets/widget_string.js +++ b/IPython/html/static/notebook/js/widgets/widget_string.js @@ -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",