##// END OF EJS Templates
Fix all the tests
Jonathan Frederic -
Show More
@@ -6,6 +6,7 b' define(['
6 'jquery',
6 'jquery',
7 'base/js/utils',
7 'base/js/utils',
8 'notebook/js/tour',
8 'notebook/js/tour',
9 'components/bootstrap/js/bootstrap.min',
9 ], function(IPython, $, utils, tour) {
10 ], function(IPython, $, utils, tour) {
10 "use strict";
11 "use strict";
11
12
@@ -52,7 +52,7 b' define(['
52 this.events = options.events;
52 this.events = options.events;
53 this.keyboard_manager = options.keyboard_manager;
53 this.keyboard_manager = options.keyboard_manager;
54 this.save_widget = options.save_widget;
54 this.save_widget = options.save_widget;
55 this.tooltip = tooltip.Tooltip(this.events);
55 this.tooltip = new tooltip.Tooltip(this.events);
56 // TODO: This code smells (and the other `= this` line a couple lines down)
56 // TODO: This code smells (and the other `= this` line a couple lines down)
57 // We need a better way to deal with circular instance references.
57 // We need a better way to deal with circular instance references.
58 this.keyboard_manager.notebook = this;
58 this.keyboard_manager.notebook = this;
@@ -4,7 +4,8 b''
4 define([
4 define([
5 "underscore",
5 "underscore",
6 "backbone",
6 "backbone",
7 ], function (_, Backbone) {
7 "base/js/namespace"
8 ], function (_, Backbone, IPython) {
8
9
9 //--------------------------------------------------------------------
10 //--------------------------------------------------------------------
10 // WidgetManager class
11 // WidgetManager class
@@ -193,5 +194,8 b' define(['
193 this._models[model_id] = widget_model;
194 this._models[model_id] = widget_model;
194 };
195 };
195
196
197 // Backwards compatability.
198 IPython.WidgetManager = WidgetManager;
199
196 return {'WidgetManager': WidgetManager};
200 return {'WidgetManager': WidgetManager};
197 });
201 });
@@ -3,8 +3,10 b''
3
3
4 define(["widgets/js/manager",
4 define(["widgets/js/manager",
5 "underscore",
5 "underscore",
6 "backbone"],
6 "backbone",
7 function(widgetmanager, _, Backbone){
7 "jquery",
8 "base/js/namespace",
9 ], function(widgetmanager, _, Backbone, $, IPython){
8
10
9 var WidgetModel = Backbone.Model.extend({
11 var WidgetModel = Backbone.Model.extend({
10 constructor: function (widget_manager, model_id, comm) {
12 constructor: function (widget_manager, model_id, comm) {
@@ -458,9 +460,14 b' function(widgetmanager, _, Backbone){'
458 },
460 },
459 });
461 });
460
462
461 return {
463 var widget = {
462 'WidgetModel': WidgetModel,
464 'WidgetModel': WidgetModel,
463 'WidgetView': WidgetView,
465 'WidgetView': WidgetView,
464 'DOMWidgetView': DOMWidgetView,
466 'DOMWidgetView': DOMWidgetView,
465 };
467 };
468
469 // For backwards compatability.
470 $.extend(IPython, widget);
471
472 return widget;
466 });
473 });
@@ -3,7 +3,9 b''
3
3
4 define([
4 define([
5 "widgets/js/widget",
5 "widgets/js/widget",
6 ], function(widget){
6 "jquery",
7 "components/bootstrap/js/bootstrap.min",
8 ], function(widget, $){
7
9
8 var CheckboxView = widget.DOMWidgetView.extend({
10 var CheckboxView = widget.DOMWidgetView.extend({
9 render : function(){
11 render : function(){
@@ -3,7 +3,9 b''
3
3
4 define([
4 define([
5 "widgets/js/widget",
5 "widgets/js/widget",
6 ], function(widget){
6 "jquery",
7 "components/bootstrap/js/bootstrap.min",
8 ], function(widget, $){
7
9
8 var ButtonView = widget.DOMWidgetView.extend({
10 var ButtonView = widget.DOMWidgetView.extend({
9 render : function(){
11 render : function(){
@@ -3,7 +3,8 b''
3
3
4 define([
4 define([
5 "widgets/js/widget",
5 "widgets/js/widget",
6 "jqueryui"
6 "jqueryui",
7 "components/bootstrap/js/bootstrap.min",
7 ], function(widget, $){
8 ], function(widget, $){
8
9
9 var ContainerView = widget.DOMWidgetView.extend({
10 var ContainerView = widget.DOMWidgetView.extend({
@@ -3,7 +3,8 b''
3
3
4 define([
4 define([
5 "widgets/js/widget",
5 "widgets/js/widget",
6 ], function(widget){
6 "jquery",
7 ], function(widget, $){
7
8
8 var ImageView = widget.DOMWidgetView.extend({
9 var ImageView = widget.DOMWidgetView.extend({
9 render : function(){
10 render : function(){
@@ -3,7 +3,9 b''
3
3
4 define([
4 define([
5 "widgets/js/widget",
5 "widgets/js/widget",
6 ], function(widget){
6 "jqueryui",
7 "components/bootstrap/js/bootstrap.min",
8 ], function(widget, $){
7
9
8 var IntSliderView = widget.DOMWidgetView.extend({
10 var IntSliderView = widget.DOMWidgetView.extend({
9 render : function(){
11 render : function(){
@@ -4,7 +4,9 b''
4 define([
4 define([
5 "widgets/js/widget",
5 "widgets/js/widget",
6 "base/js/utils",
6 "base/js/utils",
7 ], function(widget, utils){
7 "jquery",
8 "components/bootstrap/js/bootstrap.min",
9 ], function(widget, utils, $){
8
10
9 var DropdownView = widget.DOMWidgetView.extend({
11 var DropdownView = widget.DOMWidgetView.extend({
10 render : function(){
12 render : function(){
@@ -4,7 +4,9 b''
4 define([
4 define([
5 "widgets/js/widget",
5 "widgets/js/widget",
6 "base/js/utils",
6 "base/js/utils",
7 ], function(widget, utils){
7 "jquery",
8 "components/bootstrap/js/bootstrap.min",
9 ], function(widget, utils, $){
8
10
9 var AccordionView = widget.DOMWidgetView.extend({
11 var AccordionView = widget.DOMWidgetView.extend({
10 render: function(){
12 render: function(){
@@ -3,7 +3,9 b''
3
3
4 define([
4 define([
5 "widgets/js/widget",
5 "widgets/js/widget",
6 ], function(widget){
6 "jquery",
7 "components/bootstrap/js/bootstrap.min",
8 ], function(widget, $){
7
9
8 var HTMLView = widget.DOMWidgetView.extend({
10 var HTMLView = widget.DOMWidgetView.extend({
9 render : function(){
11 render : function(){
General Comments 0
You need to be logged in to leave comments. Login now