All: Remove the deprecated `ui/core.js` file

Also, fix checkboxradio visual tests.

Ref gh-2249

diff --git a/Gruntfile.js b/Gruntfile.js
index 69b313ed955739f0d5ca470d4200fa416e23bf26..b4933c766e193e3d6bde595c57678ff7be9276ec 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,7 +4,6 @@ module.exports = function( grunt ) {
 
 // files
 const coreFiles = [
-       "core.js",
        "widget.js",
        "widgets/mouse.js",
        "widgets/draggable.js",
@@ -167,7 +166,7 @@ grunt.initConfig( {
                                findNestedDependencies: true,
                                skipModuleInsertion: true,
                                exclude: [ "jquery" ],
-                               include: expandFiles( [ "ui/**/*.js", "!ui/core.js", "!ui/i18n/*" ] ),
+                               include: expandFiles( [ "ui/**/*.js", "!ui/i18n/*" ] ),
                                out: "dist/jquery-ui.js",
                                wrap: {
                                        start: createBanner( uiFiles )

diff --git a/demos/slider/multiple-vertical.html b/demos/slider/multiple-vertical.html
index 0af65f86bd49744db5a674cc859410c80e0a390f..71f7076133c89fdc6c5fb7f6919c70b4cd79e74d 100644 (file)
--- a/demos/slider/multiple-vertical.html
+++ b/demos/slider/multiple-vertical.html
@@ -5,11 +5,6 @@
        <meta name="viewport" content="width=device-width, initial-scale=1">
        <title>jQuery UI Slider - Multiple sliders</title>
        <link rel="stylesheet" href="../../themes/base/all.css">
-       <script src="../../external/jquery/jquery.js"></script>
-       <script src="../../ui/core.js"></script>
-       <script src="../../ui/widget.js"></script>
-       <script src="../../ui/mouse.js"></script>
-       <script src="../../ui/slider.js"></script>
        <link rel="stylesheet" href="../demos.css">
        <style>
        #eq > span {

diff --git a/tests/visual/checkboxradio/checkboxradio.html b/tests/visual/checkboxradio/checkboxradio.html
index 8d26daeff17ffe33118dfd32754f724c13d51eef..17a71ce7ecd90354cdd4115e0dc5565a558bcfcd 100644 (file)
--- a/tests/visual/checkboxradio/checkboxradio.html
+++ b/tests/visual/checkboxradio/checkboxradio.html
@@ -4,13 +4,8 @@
        <meta charset="utf-8">
        <title>jQuery UI - Checkboxes</title>
        <link rel="stylesheet" href="../../../themes/base/all.css">
-       <script src="../../../external/jquery/jquery.js"></script>
-       <script src="../../../ui/core.js"></script>
-       <script src="../../../ui/widget.js"></script>
-       <script src="../../../ui/button.js"></script>
-       <script src="../../../ui/checkboxradio.js"></script>
-       <script>
-       $(function() {
+       <script src="../../../external/requirejs/require.js"></script>
+       <script src="../../../demos/bootstrap.js">
                var checkboxes = $( "form input" ).checkboxradio();
 
                $( ".controls input, .controls select" ).on( "change keyup", function() {
@@ -23,15 +18,14 @@
                        if ( option != "label" || value !== "" ) {
                                checkboxes.checkboxradio( "option", option, value );
                        }
-               });
+               } );
                $( ".controls > button" ).on( "click", function() {
                        if ( this.id !== "create" ) {
                                checkboxes.checkboxradio( this.id );
                        } else {
                                checkboxes.checkboxradio();
                        }
-               });
-       });
+               } );
        </script>
        <style>
        #format { margin-top: 2em; }

diff --git a/ui/core.js b/ui/core.js
deleted file mode 100644 (file)
index d4651c6..0000000
--- a/ui/core.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// This file is deprecated in 1.12.0 to be removed in 1.14
-( function() {
-"use strict";
-
-define( [
-       "jquery",
-       "./data",
-       "./disable-selection",
-       "./focusable",
-       "./keycode",
-       "./labels",
-       "./plugin",
-       "./scroll-parent",
-       "./tabbable",
-       "./unique-id",
-       "./version"
-] );
-} )();