From f32651e202e9cbc74a18f9e40c7ab1e243026435 Mon Sep 17 00:00:00 2001
From: Sylvain Corlay <sylvain.corlay@gmail.com>
Date: Fri, 27 Nov 2015 18:38:17 -0500
Subject: [PATCH] Use jquery-ui instead of jqueryui

---
 notebook/static/notebook/js/outputarea.js | 2 +-
 notebook/static/notebook/js/pager.js      | 2 +-
 notebook/static/tree/js/main.js           | 2 +-
 notebook/templates/page.html              | 9 +++++++--
 tools/build-main.js                       | 9 +++++++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/notebook/static/notebook/js/outputarea.js b/notebook/static/notebook/js/outputarea.js
index 5a5e25d1b..600484ba3 100644
--- a/notebook/static/notebook/js/outputarea.js
+++ b/notebook/static/notebook/js/outputarea.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    'jqueryui',
+    'jquery-ui',
     'base/js/utils',
     'base/js/security',
     'base/js/keyboard',
diff --git a/notebook/static/notebook/js/pager.js b/notebook/static/notebook/js/pager.js
index 0b423758b..260f7b471 100644
--- a/notebook/static/notebook/js/pager.js
+++ b/notebook/static/notebook/js/pager.js
@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 define([
-    'jqueryui',
+    'jquery-ui',
     'base/js/utils',
 ], function($, utils) {
     "use strict";
diff --git a/notebook/static/tree/js/main.js b/notebook/static/tree/js/main.js
index 1cf61e248..fd12a4ae8 100644
--- a/notebook/static/tree/js/main.js
+++ b/notebook/static/tree/js/main.js
@@ -17,7 +17,7 @@ require([
     'tree/js/newnotebook',
     'auth/js/loginwidget',
     // only loaded, not used:
-    'jqueryui',
+    'jquery-ui',
     'bootstrap',
     'custom/custom',
 ], function(
diff --git a/notebook/templates/page.html b/notebook/templates/page.html
index 13402b92c..f9cd56a97 100644
--- a/notebook/templates/page.html
+++ b/notebook/templates/page.html
@@ -34,12 +34,17 @@
             jquery: 'components/jquery/jquery.min',
             bootstrap: 'components/bootstrap/js/bootstrap.min',
             bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min',
-            jqueryui: 'components/jquery-ui/ui/minified/jquery-ui.min',
+            'jquery-ui': 'components/jquery-ui/ui/minified/jquery-ui.min',
             moment: 'components/moment/moment',
             codemirror: 'components/codemirror',
             termjs: 'components/term.js/src/term',
             typeahead: 'components/jquery-typeahead/dist/jquery.typeahead'
           },
+	  map: { // for backward compatibility
+	    "*": {
+		"jqueryui": "jquery-ui",
+	    }
+	  },
           shim: {
             typeahead: {
               deps: ["jquery"],
@@ -60,7 +65,7 @@
               deps: ["bootstrap"],
               exports: "Tour"
             },
-            jqueryui: {
+            "jquery-ui": {
               deps: ["jquery"],
               exports: "$"
             }
diff --git a/tools/build-main.js b/tools/build-main.js
index 00763b9b8..1ae0a64a1 100644
--- a/tools/build-main.js
+++ b/tools/build-main.js
@@ -18,13 +18,18 @@ var rjs_config = {
     jquery: 'components/jquery/jquery.min',
     bootstrap: 'components/bootstrap/js/bootstrap.min',
     bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min',
-    jqueryui: 'components/jquery-ui/ui/minified/jquery-ui.min',
+    "jquery-ui": 'components/jquery-ui/ui/minified/jquery-ui.min',
     moment: 'components/moment/moment',
     codemirror: 'components/codemirror',
     termjs: 'components/term.js/src/term',
     typeahead: 'components/jquery-typeahead/dist/jquery.typeahead',
     contents: 'empty:'
   },
+  map: { // for backward compatibility
+    "*": {
+        "jqueryui": "jquery-ui",
+    }
+  },
   shim: {
     typeahead: {
             deps: ["jquery"],
@@ -45,7 +50,7 @@ var rjs_config = {
       deps: ["bootstrap"],
       exports: "Tour"
     },
-    jqueryui: {
+    "jquery-ui": {
       deps: ["jquery"],
       exports: "$"
     }