##// END OF EJS Templates
Merge pull request #5173 from jdfreder/movewidgets...
Jonathan Frederic -
r15477:b80c5aed merge
parent child Browse files
Show More
@@ -14,7 +14,7 b''
14 // which make both this file fail at setting marked configuration, and textcell.js
14 // which make both this file fail at setting marked configuration, and textcell.js
15 // which search marked into global.
15 // which search marked into global.
16 require(['components/marked/lib/marked',
16 require(['components/marked/lib/marked',
17 'notebook/js/widgets/init'],
17 'widgets/js/init'],
18
18
19 function (marked) {
19 function (marked) {
20 "use strict";
20 "use strict";
@@ -10,13 +10,13 b''
10 //============================================================================
10 //============================================================================
11
11
12 define([
12 define([
13 "notebook/js/widgets/widget_bool",
13 "widgets/js/widget_bool",
14 "notebook/js/widgets/widget_button",
14 "widgets/js/widget_button",
15 "notebook/js/widgets/widget_container",
15 "widgets/js/widget_container",
16 "notebook/js/widgets/widget_float",
16 "widgets/js/widget_float",
17 "notebook/js/widgets/widget_image",
17 "widgets/js/widget_image",
18 "notebook/js/widgets/widget_int",
18 "widgets/js/widget_int",
19 "notebook/js/widgets/widget_selection",
19 "widgets/js/widget_selection",
20 "notebook/js/widgets/widget_selectioncontainer",
20 "widgets/js/widget_selectioncontainer",
21 "notebook/js/widgets/widget_string",
21 "widgets/js/widget_string",
22 ], function(){ return true; });
22 ], function(){ return true; });
1 NO CONTENT: file renamed from IPython/html/static/notebook/js/widgetmanager.js to IPython/html/static/widgets/js/manager.js
NO CONTENT: file renamed from IPython/html/static/notebook/js/widgetmanager.js to IPython/html/static/widgets/js/manager.js
@@ -14,7 +14,7 b''
14 * @namespace IPython
14 * @namespace IPython
15 **/
15 **/
16
16
17 define(["notebook/js/widgetmanager",
17 define(["widgets/js/manager",
18 "underscore",
18 "underscore",
19 "backbone"],
19 "backbone"],
20 function(WidgetManager, _, Backbone){
20 function(WidgetManager, _, Backbone){
@@ -14,7 +14,7 b''
14 * @namespace IPython
14 * @namespace IPython
15 **/
15 **/
16
16
17 define(["notebook/js/widgets/widget"], function(WidgetManager){
17 define(["widgets/js/widget"], function(WidgetManager){
18
18
19 var CheckboxView = IPython.DOMWidgetView.extend({
19 var CheckboxView = IPython.DOMWidgetView.extend({
20 render : function(){
20 render : function(){
@@ -14,7 +14,7 b''
14 * @namespace IPython
14 * @namespace IPython
15 **/
15 **/
16
16
17 define(["notebook/js/widgets/widget"], function(WidgetManager){
17 define(["widgets/js/widget"], function(WidgetManager){
18
18
19 var ButtonView = IPython.DOMWidgetView.extend({
19 var ButtonView = IPython.DOMWidgetView.extend({
20 render : function(){
20 render : function(){
@@ -14,7 +14,7 b''
14 * @namespace IPython
14 * @namespace IPython
15 **/
15 **/
16
16
17 define(["notebook/js/widgets/widget"], function(WidgetManager) {
17 define(["widgets/js/widget"], function(WidgetManager) {
18
18
19 var ContainerView = IPython.DOMWidgetView.extend({
19 var ContainerView = IPython.DOMWidgetView.extend({
20 render: function(){
20 render: function(){
@@ -14,8 +14,8 b''
14 * @namespace IPython
14 * @namespace IPython
15 **/
15 **/
16
16
17 define(["notebook/js/widgets/widget",
17 define(["widgets/js/widget",
18 "notebook/js/widgets/widget_int"],
18 "widgets/js/widget_int"],
19 function(WidgetManager, int_widgets){
19 function(WidgetManager, int_widgets){
20
20
21 var IntSliderView = int_widgets[0];
21 var IntSliderView = int_widgets[0];
@@ -14,7 +14,7 b''
14 * @namespace IPython
14 * @namespace IPython
15 **/
15 **/
16
16
17 define(["notebook/js/widgets/widget"], function(WidgetManager){
17 define(["widgets/js/widget"], function(WidgetManager){
18
18
19 var ImageView = IPython.DOMWidgetView.extend({
19 var ImageView = IPython.DOMWidgetView.extend({
20 render : function(){
20 render : function(){
@@ -14,7 +14,7 b''
14 * @namespace IPython
14 * @namespace IPython
15 **/
15 **/
16
16
17 define(["notebook/js/widgets/widget"], function(WidgetManager){
17 define(["widgets/js/widget"], function(WidgetManager){
18
18
19 var IntSliderView = IPython.DOMWidgetView.extend({
19 var IntSliderView = IPython.DOMWidgetView.extend({
20 render : function(){
20 render : function(){
@@ -14,7 +14,7 b''
14 * @namespace IPython
14 * @namespace IPython
15 **/
15 **/
16
16
17 define(["notebook/js/widgets/widget"], function(WidgetManager){
17 define(["widgets/js/widget"], function(WidgetManager){
18
18
19 var DropdownView = IPython.DOMWidgetView.extend({
19 var DropdownView = IPython.DOMWidgetView.extend({
20 render : function(){
20 render : function(){
@@ -14,7 +14,7 b''
14 * @namespace IPython
14 * @namespace IPython
15 **/
15 **/
16
16
17 define(["notebook/js/widgets/widget"], function(WidgetManager){
17 define(["widgets/js/widget"], function(WidgetManager){
18
18
19 var AccordionView = IPython.DOMWidgetView.extend({
19 var AccordionView = IPython.DOMWidgetView.extend({
20 render: function(){
20 render: function(){
@@ -14,7 +14,7 b''
14 * @namespace IPython
14 * @namespace IPython
15 **/
15 **/
16
16
17 define(["notebook/js/widgets/widget"], function(WidgetManager){
17 define(["widgets/js/widget"], function(WidgetManager){
18
18
19 var HTMLView = IPython.DOMWidgetView.extend({
19 var HTMLView = IPython.DOMWidgetView.extend({
20 render : function(){
20 render : function(){
1 NO CONTENT: file renamed from IPython/html/static/notebook/less/widgets.less to IPython/html/static/widgets/less/widgets.less
NO CONTENT: file renamed from IPython/html/static/notebook/less/widgets.less to IPython/html/static/widgets/less/widgets.less
General Comments 0
You need to be logged in to leave comments. Login now