Disambiguate the FloatProgress and IntProgress widgets.

Fixes jupyter-widgets#1256.

Author: jasongrout

ipywidgets/widgets/widget_float.py

@@ -160,7 +160,7 @@ class FloatProgress(_BoundedFloat):
         colors are: 'success'-green, 'info'-light blue, 'warning'-orange, 'danger'-red
     """
     _view_name = Unicode('ProgressView').tag(sync=True)
-    _model_name = Unicode('ProgressModel').tag(sync=True)
+    _model_name = Unicode('FloatProgressModel').tag(sync=True)
     orientation = CaselessStrEnum(values=['horizontal', 'vertical'],
         default_value='horizontal', help="Vertical or horizontal.").tag(sync=True)
 

ipywidgets/widgets/widget_int.py

@@ -179,7 +179,7 @@ class IntProgress(_BoundedInt):
     """Progress bar that represents an integer bounded from above and below.
     """
     _view_name = Unicode('ProgressView').tag(sync=True)
-    _model_name = Unicode('ProgressModel').tag(sync=True)
+    _model_name = Unicode('IntProgressModel').tag(sync=True)
     orientation = CaselessStrEnum(values=['horizontal', 'vertical'],
         default_value='horizontal', help="Vertical or horizontal.").tag(sync=True)
 

jupyter-js-widgets/src/widget_float.ts

@@ -112,7 +112,7 @@ class FloatTextModel extends FloatModel {
 }
 
 export
-class BoundedFloatTextModel extends FloatTextModel {
+class BoundedFloatTextModel extends BoundedFloatModel {
     defaults() {
         return _.extend(super.defaults(), {
             _model_name: "BoundedFloatTextModel",
@@ -125,3 +125,16 @@ export
 class FloatTextView extends IntTextView {
     _parse_value = parseFloat;
 }
+
+export
+class FloatProgressModel extends BoundedFloatModel {
+    defaults() {
+        return _.extend(super.defaults(), {
+            _model_name: 'FloatProgressModel',
+            _view_name: 'ProgressView',
+            orientation: 'horizontal',
+            bar_style: '',
+            style: void 0
+        });
+    }
+}

jupyter-js-widgets/src/widget_int.ts

@@ -604,10 +604,10 @@ class ProgressStyleModel extends StyleModel {
 
 
 export
-class ProgressModel extends BoundedIntModel {
+class IntProgressModel extends BoundedIntModel {
     defaults() {
         return _.extend(super.defaults(), {
-            _model_name: 'ProgressModel',
+            _model_name: 'IntProgressModel',
             _view_name: 'ProgressView',
             orientation: 'horizontal',
             bar_style: '',