Removed require.js scheme since it forces async event driven model,

this model does not work with the comm/widget communication model.
We need to be able to load the dependencies before we send the
show() message to the widget manager.  Otherwise a race condition
will exist where the widget manager may recieve the show message
before the dependencies have been loaded (happened almost every time).

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

@@ -15,12 +15,9
  * @submodule widget
  */
 
-
 "use strict";
 
 // Only run once on a notebook.
-require(["components/underscore/underscore-min", 
-         "components/backbone/backbone-min"], function () {
     if (IPython.notebook.widget_manager == undefined) {
 
         //-----------------------------------------------------------------------
@@ -253,5 +250,4 require(["components/underscore/underscore-min",
 
         IPython.notebook.widget_manager = new WidgetManager(IPython.notebook.kernel.comm_manager);    
 
-    }
-});
+};

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

@@ -1,4 +1,3
-require(["notebook/js/widget"], function () {
     var ContainerModel = IPython.WidgetModel.extend({});
     IPython.notebook.widget_manager.register_widget_model('container_widget', ContainerModel);
 
@@ -16,4 +15,3 require(["notebook/js/widget"], function () {
     });
 
     IPython.notebook.widget_manager.register_widget_view('ContainerView', ContainerView);
-});
  No newline at end of file

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

@@ -1,4 +1,3
-require(["notebook/js/widget"], function () {
     var FloatRangeWidgetModel = IPython.WidgetModel.extend({});
     IPython.notebook.widget_manager.register_widget_model('FloatRangeWidgetModel', FloatRangeWidgetModel);
 
@@ -118,4 +117,3 require(["notebook/js/widget"], function () {
     });
 
     IPython.notebook.widget_manager.register_widget_view('FloatTextView', FloatTextView);
-});
  No newline at end of file

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

@@ -1,4 +1,3
-require(["notebook/js/widget"], function () {
     var IntRangeWidgetModel = IPython.WidgetModel.extend({});
     IPython.notebook.widget_manager.register_widget_model('IntRangeWidgetModel', IntRangeWidgetModel);
 
@@ -116,4 +115,3 require(["notebook/js/widget"], function () {
     });
 
     IPython.notebook.widget_manager.register_widget_view('IntTextView', IntTextView);
-});
  No newline at end of file

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

@@ -1,4 +1,3
-require(["notebook/js/widget"], function () {
     var SelectionWidgetModel = IPython.WidgetModel.extend({});
     IPython.notebook.widget_manager.register_widget_model('SelectionWidgetModel', SelectionWidgetModel);
 
@@ -127,4 +126,3 require(["notebook/js/widget"], function () {
     });
 
     IPython.notebook.widget_manager.register_widget_view('RadioButtonView', RadioButtonView);
-});
  No newline at end of file

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

@@ -1,4 +1,3
-require(["notebook/js/widget"], function () {
     var StringWidgetModel = IPython.WidgetModel.extend({});
     IPython.notebook.widget_manager.register_widget_model('StringWidgetModel', StringWidgetModel);
 
@@ -73,5 +72,3 require(["notebook/js/widget"], function () {
     });
 
     IPython.notebook.widget_manager.register_widget_view('TextboxView', TextboxView);
-
-});
  No newline at end of file

IPython/html/templates/page.html

@@ -71,6 +71,8
 <script src="{{static_url("components/jquery/jquery.min.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{static_url("components/jquery-ui/ui/minified/jquery-ui.min.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{static_url("components/bootstrap/bootstrap/js/bootstrap.min.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("components/underscore/underscore-min.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{static_url("components/backbone/backbone-min.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{static_url("base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{static_url("base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{static_url("auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>

IPython/html/widgets/__init__.py

@@ -1,4 +1,4
-from base import Widget, init_widget_js
+from base import Widget
 
 from container import ContainerWidget
 from float_range import FloatRangeWidget

IPython/html/widgets/base.py

@@ -1,4 +1,3
-
 from copy import copy
 from glob import glob
 import uuid
@@ -124,6 +123,7 class Widget(LoggingConfigurable):
             view_name = self.default_view_name
         
         # Require traitlet specified widget js
+        self._require_js('static/notebook/js/widget.js')
         for requirement in self.js_requirements:
             self._require_js(requirement)
 
@@ -165,11 +165,4 class Widget(LoggingConfigurable):
     def _require_js(self, js_path):
         # Since we are loading requirements that must be loaded before this call
         # returns, preform async js load.
-        display(Javascript(data="""
-$.ajax({
-    url: '{0}',
-    async: false,
-    dataType: "script",
-    timeout: 1000, // Wait a maximum of one second for the script to load.
-});
-        """.format(js_path)))
  No newline at end of file
+        display(Javascript(data='$.ajax({url: "%s", async: false, dataType: "script", timeout: 1000});' % js_path))

IPython/html/widgets/container.py

@@ -7,6 +7,6 from IPython.utils.javascript import display_all_js
 class ContainerWidget(Widget):
     target_name = Unicode('container_widget')
     default_view_name = Unicode('ContainerView')
-    js_requirements = List(["notebook/js/widgets/container.js"])
+    js_requirements = List(["static/notebook/js/widgets/container.js"])
     
     _keys = []

IPython/html/widgets/float_range.py

@@ -7,7 +7,7 from IPython.utils.javascript import display_all_js
 class FloatRangeWidget(Widget):
     target_name = Unicode('FloatRangeWidgetModel')
     default_view_name = Unicode('FloatSliderView')
-    js_requirements = List(["notebook/js/widgets/float_range.js"])
+    js_requirements = List(["static/notebook/js/widgets/float_range.js"])
     _keys = ['value', 'step', 'max', 'min', 'disabled', 'orientation']
     
     value = Float(0.0) 

IPython/html/widgets/int_range.py

@@ -7,7 +7,7 from IPython.utils.javascript import display_all_js
 class IntRangeWidget(Widget):
     target_name = Unicode('IntRangeWidgetModel')
     default_view_name = Unicode('IntSliderView')
-    js_requirements = List(["notebook/js/widgets/int_range.js"])
+    js_requirements = List(["static/notebook/js/widgets/int_range.js"])
     _keys = ['value', 'step', 'max', 'min', 'disabled', 'orientation']
 
     value = Int(0) 

IPython/html/widgets/selection.py

@@ -7,7 +7,7 from IPython.utils.javascript import display_all_js
 class SelectionWidget(Widget):
     target_name = Unicode('SelectionWidgetModel')
     default_view_name = Unicode('DropdownView')
-    js_requirements = List(["notebook/js/widgets/selection.js"])
+    js_requirements = List(["static/notebook/js/widgets/selection.js"])
     _keys = ['value', 'values', 'disabled']
 
     value = Unicode()

IPython/html/widgets/string.py

@@ -7,7 +7,7 from IPython.utils.javascript import display_all_js
 class StringWidget(Widget):
     target_name = Unicode('StringWidgetModel')
     default_view_name = Unicode('TextboxView')
-    js_requirements = List(["notebook/js/widgets/string.js"])
+    js_requirements = List(["static/notebook/js/widgets/string.js"])
     _keys = ['value', 'row_count', 'disabled']
     
     value = Unicode()