Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "#5481 Update to ipywidgets v7" #5870

Merged
merged 1 commit into from
Aug 21, 2017
Merged

Revert "#5481 Update to ipywidgets v7" #5870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion beakerx/js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"url-loader": "^0.5.9"
},
"dependencies": {
"@jupyter-widgets/controls": "^0.6.8",
"base64-loader": "^1.0.0",
"big.js": "^3.1.3",
"d3": "^4.9.1",
Expand All @@ -49,6 +48,7 @@
"html-loader": "^0.4.5",
"jquery-contextmenu": "^2.4.5",
"jquery-ui": "^1.12.1",
"jupyter-js-widgets": "^2.1.4",
"moment": "^2.17.1",
"moment-timezone": "^0.5.13",
"underscore": "^1.8.3",
Expand Down
2 changes: 1 addition & 1 deletion beakerx/js/src/CyclingDisplayBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

var widgets = require('@jupyter-widgets/controls');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');

var interval = undefined;
Expand Down
7 changes: 3 additions & 4 deletions beakerx/js/src/EasyForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/

var ENTER_KEY_CODE = 13;
var widgets = require('@jupyter-widgets/base');
var controls = require('@jupyter-widgets/controls');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');

var selectMultipleWidget = require('./easyForm/selectMultipleWidget');
Expand All @@ -25,7 +24,7 @@ var datePickerWidget = require('./easyForm/datePickerWidget');
var textWidget = require('./easyForm/textWidget');
var comboBoxWidget = require('./easyForm/comboBoxWidget');

controls.TextView.prototype.handleEnterKeyPress = function() {
widgets.TextView.prototype.handleEnterKeyPress = function() {
if (e.keyCode == 13) {
this.send({ event: 'submit' });
e.preventDefault();
Expand All @@ -52,7 +51,7 @@ var EasyFormModel = widgets.DOMWidgetModel.extend({
}, widgets.DOMWidgetModel.serializers)
});

var EasyFormView = controls.BoxView.extend({
var EasyFormView = widgets.BoxView.extend({
render: function() {
var that = this;

Expand Down
2 changes: 1 addition & 1 deletion beakerx/js/src/GridView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

var widgets = require('@jupyter-widgets/controls');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');

require('./gridView/grid-view.scss');
Expand Down
2 changes: 1 addition & 1 deletion beakerx/js/src/Plot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

var widgets = require('@jupyter-widgets/base');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');
var d3 = require('d3');

Expand Down
2 changes: 1 addition & 1 deletion beakerx/js/src/TabView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

var widgets = require('@jupyter-widgets/controls');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');

var TabModel = widgets.TabModel.extend({
Expand Down
2 changes: 1 addition & 1 deletion beakerx/js/src/TableDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

var widgets = require('@jupyter-widgets/base');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');
var $ = require('jquery');

Expand Down
2 changes: 1 addition & 1 deletion beakerx/js/src/easyForm/comboBoxWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

var widgets = require('@jupyter-widgets/controls');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');
var comboBox = require('../comboBox/jQueryComboBox');

Expand Down
2 changes: 1 addition & 1 deletion beakerx/js/src/easyForm/datePickerWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

var widgets = require('@jupyter-widgets/controls');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');
var moment = require('moment');

Expand Down
2 changes: 1 addition & 1 deletion beakerx/js/src/easyForm/selectMultipleSingleWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

var widgets = require('@jupyter-widgets/controls');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');

var SelectMultipleSingleModel = widgets.SelectModel.extend({
Expand Down
2 changes: 1 addition & 1 deletion beakerx/js/src/easyForm/selectMultipleWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

var widgets = require('@jupyter-widgets/controls');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');

var SelectMultipleModel = widgets.SelectMultipleModel.extend({
Expand Down
2 changes: 1 addition & 1 deletion beakerx/js/src/easyForm/textWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

var widgets = require('@jupyter-widgets/controls');
var widgets = require('jupyter-js-widgets');
var _ = require('underscore');

var TextModel = widgets.TextModel.extend({
Expand Down
4 changes: 1 addition & 3 deletions beakerx/js/src/extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ if (window.require) {
map: {
"*" : {
"beakerx": "nbextensions/beakerx/index",
"@jupyter-widgets/controls": "nbextensions/jupyter-js-widgets/extension",
"@jupyter-widgets/base": "nbextensions/jupyter-js-widgets/extension",
'@jupyter-widgets/output': 'nbextensions/jupyter-js-widgets/extension'
"jupyter-js-widgets": "nbextensions/jupyter-js-widgets/extension"
}
}
});
Expand Down
4 changes: 2 additions & 2 deletions beakerx/js/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ module.exports = [
modules: ['web_modules', 'node_modules'],
extensions: ['.jsx','.js','.less','.css']
},
externals: ['@jupyter-widgets/controls', '@jupyter-widgets/base'],
externals: ['jupyter-js-widgets'],
watchOptions: {
ignored: /node_modules/
},
Expand Down Expand Up @@ -142,7 +142,7 @@ module.exports = [
modules: ['web_modules', 'node_modules'],
extensions: ['.jsx','.js','.less','.css']
},
externals: ['@jupyter-widgets/controls', '@jupyter-widgets/base', '@jupyter-widgets/base'],
externals: ['jupyter-js-widgets', '@jupyter-widgets/base'],
plugins: plugins
}
];
Loading