upstream/ipython Commit - r14627:f9ac12eb

Widget require.js fix...

Jonathan Frederic -

r14627:f9ac12eb

parent child

IPython/html/static/notebook/js/widgetmanager.js

0 +1 -1

                 // elsewhere.
                 define(["underscore",
                          "backbone",
-                        ], function (underscore, backbone) {
+                        ], function (Underscore, Backbone) {
                     Backbone.sync = function (method, model, options) {
                         // Sync widget models to back-end.

IPython/html/static/notebook/js/widgets/widget.js

0 +4 -4

             define(["notebook/js/widgetmanager",
                     "underscore",
                     "backbone"],
-            function(widget_manager, underscore, backbone){
+            function(WidgetManager, Underscore, Backbone){
                 var WidgetModel = Backbone.Model.extend({
                     constructor: function (widget_manager, model_id, comm) {
                     },
                 });
-                widget_manager.register_widget_model('WidgetModel', WidgetModel);
+                WidgetManager.register_widget_model('WidgetModel', WidgetModel);
                 var WidgetView = Backbone.View.extend({
                 IPython.WidgetView = WidgetView;
                 IPython.DOMWidgetView = DOMWidgetView;
-                // Pass through widget_manager instance (probably not a good practice).
+                // Pass through WidgetManager namespace.
-                return widget_manager;
+                return WidgetManager;
             });

IPython/html/static/notebook/js/widgets/widget_bool.js

0 +3 -3

              * @namespace IPython
              **/
-            define(["notebook/js/widgets/widget"], function(widget_manager){
+            define(["notebook/js/widgets/widget"], function(WidgetManager){
                 var CheckBoxView = IPython.DOMWidgetView.extend({
                     render : function(){
                     },
                 });
-                widget_manager.register_widget_view('CheckBoxView', CheckBoxView);
+                WidgetManager.register_widget_view('CheckBoxView', CheckBoxView);
                 var ToggleButtonView = IPython.DOMWidgetView.extend({
                         this.touch();
                     },
                 });
-                widget_manager.register_widget_view('ToggleButtonView', ToggleButtonView);
+                WidgetManager.register_widget_view('ToggleButtonView', ToggleButtonView);
             });

IPython/html/static/notebook/js/widgets/widget_button.js

0 +2 -2

              * @namespace IPython
              **/
-            define(["notebook/js/widgets/widget"], function(widget_manager){
+            define(["notebook/js/widgets/widget"], function(WidgetManager){
                 var ButtonView = IPython.DOMWidgetView.extend({
                     render : function(){
                         this.send({event: 'click'});
                     },
                 });
-                widget_manager.register_widget_view('ButtonView', ButtonView);
+                WidgetManager.register_widget_view('ButtonView', ButtonView);
             });

IPython/html/static/notebook/js/widgets/widget_container.js

0 +3 -3

              * @namespace IPython
              **/
-            define(["notebook/js/widgets/widget"], function(widget_manager) {
+            define(["notebook/js/widgets/widget"], function(WidgetManager) {
                 var ContainerView = IPython.DOMWidgetView.extend({
                     render: function(){
                         return ContainerView.__super__.update.apply(this);
                     },
                 });
-                widget_manager.register_widget_view('ContainerView', ContainerView);
+                WidgetManager.register_widget_view('ContainerView', ContainerView);
                 var ModalView = IPython.DOMWidgetView.extend({
                         }
                     },
                 });
-                widget_manager.register_widget_view('ModalView', ModalView);
+                WidgetManager.register_widget_view('ModalView', ModalView);
             });

IPython/html/static/notebook/js/widgets/widget_float.js

0 +3 -13

@@ -5,16 +5,6 b''
5	// the file COPYING, distributed as part of this software.	5	// the file COPYING, distributed as part of this software.
6	//----------------------------------------------------------------------------	6	//----------------------------------------------------------------------------
7		7
8	//============================================================================	8	// This file is a place holder to maintain a one to one mapping of widget_*.py
9	// FloatWidget	9	// files and widget_*.js widget and test files. The Views for this model are
10	//============================================================================	10	// shared with the bounded float, and can be found in widget_float_range.js.
11
12	/**
13	* @module IPython
14	* @namespace IPython
15	**/
16
17	define(["notebook/js/widgets/widget"], function(widget_manager){
18	// The Views for this model are shared with the bounded float, and can be
19	// found in widget_float_range.js.
20	}); No newline at end of file

IPython/html/static/notebook/js/widgets/widget_float_range.js

0 +4 -4

              * @namespace IPython
              **/
-            define(["notebook/js/widgets/widget"], function(widget_manager){
+            define(["notebook/js/widgets/widget"], function(WidgetManager){
                 var FloatSliderView = IPython.DOMWidgetView.extend({
                     render : function(){
                         this.touch();
                     },
                 });
-                widget_manager.register_widget_view('FloatSliderView', FloatSliderView);
+                WidgetManager.register_widget_view('FloatSliderView', FloatSliderView);
                 var FloatTextView = IPython.DOMWidgetView.extend({
                         }
                     }
                 });
-                widget_manager.register_widget_view('FloatTextView', FloatTextView);
+                WidgetManager.register_widget_view('FloatTextView', FloatTextView);
                 var ProgressView = IPython.DOMWidgetView.extend({
                         return ProgressView.__super__.update.apply(this);
                     },
                 });
-                widget_manager.register_widget_view('ProgressView', ProgressView);
+                WidgetManager.register_widget_view('ProgressView', ProgressView);
             });

IPython/html/static/notebook/js/widgets/widget_image.js

0 +2 -2

              * @namespace IPython
              **/
-            define(["notebook/js/widgets/widget"], function(widget_manager){
+            define(["notebook/js/widgets/widget"], function(WidgetManager){
                 var ImageView = IPython.DOMWidgetView.extend({
                     render : function(){
                         return ImageView.__super__.update.apply(this);
                     },
                 });
-                widget_manager.register_widget_view('ImageView', ImageView);
+                WidgetManager.register_widget_view('ImageView', ImageView);
             });

IPython/html/static/notebook/js/widgets/widget_int.js

0 +3 -13

@@ -5,16 +5,6 b''
5	// the file COPYING, distributed as part of this software.	5	// the file COPYING, distributed as part of this software.
6	//----------------------------------------------------------------------------	6	//----------------------------------------------------------------------------
7		7
8	//============================================================================	8	// This file is a place holder to maintain a one to one mapping of widget_*.py
9	// IntWidget	9	// files and widget_*.js widget and test files. The Views for this model are
10	//============================================================================	10	// shared with the bounded int, and can be found in widget_int_range.js.
11
12	/**
13	* @module IPython
14	* @namespace IPython
15	**/
16
17	define(["notebook/js/widgets/widget"], function(widget_manager){
18	// The Views for this model are shared with the bounded int, and can be
19	// found in widget_int_range.js.
20	}); No newline at end of file

IPython/html/static/notebook/js/widgets/widget_int_range.js

0 +3 -3

              * @namespace IPython
              **/
-            define(["notebook/js/widgets/widget"], function(widget_manager){
+            define(["notebook/js/widgets/widget"], function(WidgetManager){
                 var IntSliderView = IPython.DOMWidgetView.extend({
                     render : function(){
                         this.touch();
                     },
                 });
-                widget_manager.register_widget_view('IntSliderView', IntSliderView);
+                WidgetManager.register_widget_view('IntSliderView', IntSliderView);
                 var IntTextView = IPython.DOMWidgetView.extend({
                         }
                     }
                 });
-                widget_manager.register_widget_view('IntTextView', IntTextView);
+                WidgetManager.register_widget_view('IntTextView', IntTextView);
             });

IPython/html/static/notebook/js/widgets/widget_selection.js

0 +5 -5

              * @namespace IPython
              **/
-            define(["notebook/js/widgets/widget"], function(widget_manager){
+            define(["notebook/js/widgets/widget"], function(WidgetManager){
                 var DropdownView = IPython.DOMWidgetView.extend({
                     render : function(){
                     },
                 });
-                widget_manager.register_widget_view('DropdownView', DropdownView);
+                WidgetManager.register_widget_view('DropdownView', DropdownView);
                 var RadioButtonsView = IPython.DOMWidgetView.extend({
                         this.touch();
                     },
                 });
-                widget_manager.register_widget_view('RadioButtonsView', RadioButtonsView);
+                WidgetManager.register_widget_view('RadioButtonsView', RadioButtonsView);
                 var ToggleButtonsView = IPython.DOMWidgetView.extend({
                         this.touch();
                     },
                 });
-                widget_manager.register_widget_view('ToggleButtonsView', ToggleButtonsView);
+                WidgetManager.register_widget_view('ToggleButtonsView', ToggleButtonsView);
                 var ListBoxView = IPython.DOMWidgetView.extend({
                         this.touch();
                     },
                 });
-                widget_manager.register_widget_view('ListBoxView', ListBoxView);
+                WidgetManager.register_widget_view('ListBoxView', ListBoxView);
             });

IPython/html/static/notebook/js/widgets/widget_selectioncontainer.js

0 +3 -3

              * @namespace IPython
              **/
-            define(["notebook/js/widgets/widget"], function(widget_manager){
+            define(["notebook/js/widgets/widget"], function(WidgetManager){
                 var AccordionView = IPython.DOMWidgetView.extend({
                     render: function(){
                         setTimeout(function(){ that.update(); }, 500);
                     },
                 });
-                widget_manager.register_widget_view('AccordionView', AccordionView);
+                WidgetManager.register_widget_view('AccordionView', AccordionView);
                 var TabView = IPython.DOMWidgetView.extend({
                         this.containers[index].tab('show');
                     },
                 });
-                widget_manager.register_widget_view('TabView', TabView);
+                WidgetManager.register_widget_view('TabView', TabView);
             });

IPython/html/static/notebook/js/widgets/widget_string.js

0 +5 -5

              * @namespace IPython
              **/
-            define(["notebook/js/widgets/widget"], function(widget_manager){
+            define(["notebook/js/widgets/widget"], function(WidgetManager){
                 var HTMLView = IPython.DOMWidgetView.extend({
                     render : function(){
                         return HTMLView.__super__.update.apply(this);
                     },
                 });
-                widget_manager.register_widget_view('HTMLView', HTMLView);
+                WidgetManager.register_widget_view('HTMLView', HTMLView);
                 var LatexView = IPython.DOMWidgetView.extend({
                         return LatexView.__super__.update.apply(this);
                     },
                 });
-                widget_manager.register_widget_view('LatexView', LatexView);
+                WidgetManager.register_widget_view('LatexView', LatexView);
                 var TextAreaView = IPython.DOMWidgetView.extend({
                         this.touch();
                     },
                 });
-                widget_manager.register_widget_view('TextAreaView', TextAreaView);
+                WidgetManager.register_widget_view('TextAreaView', TextAreaView);
                 var TextBoxView = IPython.DOMWidgetView.extend({
                         }
                     },
                 });
-                widget_manager.register_widget_view('TextBoxView', TextBoxView);
+                WidgetManager.register_widget_view('TextBoxView', TextBoxView);
             });

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages