aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/lib/bootstrap.js20
-rw-r--r--tests/unit/button/button.html2
-rw-r--r--tests/unit/dialog/dialog.html2
-rw-r--r--tests/unit/droppable/droppable.html3
-rw-r--r--tests/unit/tabs/core.js6
-rw-r--r--tests/unit/tooltip/tooltip.html2
-rw-r--r--ui/effect.js4
-rw-r--r--ui/effects/effect-transfer.js2
-rw-r--r--ui/widgets/button.js2
-rw-r--r--ui/widgets/dialog.js2
-rw-r--r--ui/widgets/droppable.js2
-rw-r--r--ui/widgets/resizable.js2
-rw-r--r--ui/widgets/spinner.js2
-rw-r--r--ui/widgets/tabs.js2
-rw-r--r--ui/widgets/tooltip.js2
15 files changed, 28 insertions, 27 deletions
diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js
index fd9b1eb65..e0df9ebf5 100644
--- a/tests/lib/bootstrap.js
+++ b/tests/lib/bootstrap.js
@@ -25,9 +25,9 @@ requirejs.config( {
}
} );
-// Create a module that disables back compat for UI modules
-define( "jquery-no-back-compat", [ "jquery" ], function( $ ) {
- $.uiBackCompat = false;
+// Create a module that enables back compat for UI modules
+define( "jquery-back-compat", [ "jquery" ], function( $ ) {
+ $.uiBackCompat = true;
return $;
} );
@@ -53,10 +53,12 @@ function requireModules( dependencies, callback, modules ) {
}
// Load a set of test file along with the required test infrastructure
-function requireTests( dependencies, noBackCompat ) {
- var preDependencies = [
+function requireTests( dependencies, options ) {
+
+ var backCompat = !!( options && options.backCompat ),
+ preDependencies = [
"lib/qunit",
- noBackCompat ? "jquery-no-back-compat" : "jquery",
+ backCompat ? "jquery-back-compat" : "jquery",
"jquery-simulate"
];
@@ -136,7 +138,7 @@ function migrateUrl() {
// - data-widget: A widget to load test modules for
// - Automatically loads common, core, events, methods, and options
// - data-deprecated: Loads the deprecated test modules for a widget
-// - data-no-back-compat: Set $.uiBackCompat to false
+// - data-back-compat: Set $.uiBackCompat to `true`
( function() {
// Find the script element
@@ -154,7 +156,7 @@ function migrateUrl() {
}
var widget = script.getAttribute( "data-widget" );
var deprecated = !!script.getAttribute( "data-deprecated" );
- var noBackCompat = !!script.getAttribute( "data-no-back-compat" );
+ var backCompat = !!script.getAttribute( "data-back-compat" );
if ( widget ) {
modules = modules.concat( [
@@ -177,7 +179,7 @@ function migrateUrl() {
modules.unshift( "ui/jquery-patch" );
}
- requireTests( modules, noBackCompat );
+ requireTests( modules, { backCompat: backCompat } );
} )();
} )();
diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
index 6cf27fb33..1c3d10199 100644
--- a/tests/unit/button/button.html
+++ b/tests/unit/button/button.html
@@ -6,7 +6,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core button"></script>
- <script src="../../lib/bootstrap.js" data-widget="button" data-no-back-compat="true"></script>
+ <script src="../../lib/bootstrap.js" data-widget="button"></script>
</head>
<body>
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index bdba5e11c..30f22c60e 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -6,7 +6,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core button dialog"></script>
- <script src="../../lib/bootstrap.js" data-widget="dialog" data-no-back-compat="true"></script>
+ <script src="../../lib/bootstrap.js" data-widget="dialog"></script>
</head>
<body>
diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html
index 5c3ec3dd9..e507bb561 100644
--- a/tests/unit/droppable/droppable.html
+++ b/tests/unit/droppable/droppable.html
@@ -6,8 +6,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core"></script>
- <script src="../../lib/bootstrap.js" data-widget="droppable"
- data-no-back-compat="true"></script>
+ <script src="../../lib/bootstrap.js" data-widget="droppable"></script>
</head>
<body>
diff --git a/tests/unit/tabs/core.js b/tests/unit/tabs/core.js
index 7637cfb1f..0f9e7acbb 100644
--- a/tests/unit/tabs/core.js
+++ b/tests/unit/tabs/core.js
@@ -29,9 +29,9 @@ QUnit.test( "markup structure", function( assert ) {
assert.hasClasses( tabs[ 2 ], "ui-tabs-tab" );
// DEPRECATED
- assert.hasClasses( tabs[ 0 ], "ui-tab" );
- assert.hasClasses( tabs[ 1 ], "ui-tab" );
- assert.hasClasses( tabs[ 2 ], "ui-tab" );
+ assert.lacksClasses( tabs[ 0 ], "ui-tab" );
+ assert.lacksClasses( tabs[ 1 ], "ui-tab" );
+ assert.lacksClasses( tabs[ 2 ], "ui-tab" );
assert.equal( tabs.length, 3, "There are exactly three tabs" );
assert.hasClasses( anchors[ 0 ], "ui-tabs-anchor" );
diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index b5561d926..8c6dec70d 100644
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -6,7 +6,7 @@
<script src="../../../external/requirejs/require.js"></script>
<script src="../../lib/css.js" data-modules="core tooltip"></script>
- <script src="../../lib/bootstrap.js" data-widget="tooltip" data-no-back-compat="true"></script>
+ <script src="../../lib/bootstrap.js" data-widget="tooltip"></script>
</head>
<body>
diff --git a/ui/effect.js b/ui/effect.js
index 10cf8ed60..2232e041d 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -273,7 +273,7 @@ if ( $.expr && $.expr.pseudos && $.expr.pseudos.animated ) {
} )( $.expr.pseudos.animated );
}
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
$.extend( $.effects, {
// Saves a set of properties in a data storage
@@ -759,7 +759,7 @@ $.fn.extend( {
// as toggle can be either show or hide depending on element state
args.mode = modes.shift();
- if ( $.uiBackCompat !== false && !defaultMode ) {
+ if ( $.uiBackCompat === true && !defaultMode ) {
if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
// Call the core method to track "olddisplay" properly
diff --git a/ui/effects/effect-transfer.js b/ui/effects/effect-transfer.js
index 2014dba37..132ccc1c2 100644
--- a/ui/effects/effect-transfer.js
+++ b/ui/effects/effect-transfer.js
@@ -33,7 +33,7 @@
"use strict";
var effect;
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
effect = $.effects.define( "transfer", function( options, done ) {
$( this ).transfer( options, done );
} );
diff --git a/ui/widgets/button.js b/ui/widgets/button.js
index c127a6d00..02708d620 100644
--- a/ui/widgets/button.js
+++ b/ui/widgets/button.js
@@ -287,7 +287,7 @@ $.widget( "ui.button", {
} );
// DEPRECATED
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
// Text and Icons options
$.widget( "ui.button", $.ui.button, {
diff --git a/ui/widgets/dialog.js b/ui/widgets/dialog.js
index 02f63d728..e04598dcc 100644
--- a/ui/widgets/dialog.js
+++ b/ui/widgets/dialog.js
@@ -930,7 +930,7 @@ $.widget( "ui.dialog", {
// DEPRECATED
// TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
// Backcompat for dialogClass option
$.widget( "ui.dialog", $.ui.dialog, {
diff --git a/ui/widgets/droppable.js b/ui/widgets/droppable.js
index 45fca0560..1ff3833ba 100644
--- a/ui/widgets/droppable.js
+++ b/ui/widgets/droppable.js
@@ -463,7 +463,7 @@ $.ui.ddmanager = {
// DEPRECATED
// TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
// Backcompat for activeClass and hoverClass options
$.widget( "ui.droppable", $.ui.droppable, {
diff --git a/ui/widgets/resizable.js b/ui/widgets/resizable.js
index 7be097e73..e163b03fe 100644
--- a/ui/widgets/resizable.js
+++ b/ui/widgets/resizable.js
@@ -1113,7 +1113,7 @@ $.ui.plugin.add( "resizable", "ghost", {
// DEPRECATED
// TODO: remove after 1.12
- if ( $.uiBackCompat !== false && typeof that.options.ghost === "string" ) {
+ if ( $.uiBackCompat === true && typeof that.options.ghost === "string" ) {
// Ghost option
that.ghost.addClass( this.options.ghost );
diff --git a/ui/widgets/spinner.js b/ui/widgets/spinner.js
index c35929a01..b92b8ab52 100644
--- a/ui/widgets/spinner.js
+++ b/ui/widgets/spinner.js
@@ -554,7 +554,7 @@ $.widget( "ui.spinner", {
// DEPRECATED
// TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
// Backcompat for spinner html extension points
$.widget( "ui.spinner", $.ui.spinner, {
diff --git a/ui/widgets/tabs.js b/ui/widgets/tabs.js
index b8373c4e9..be4fe7e7a 100644
--- a/ui/widgets/tabs.js
+++ b/ui/widgets/tabs.js
@@ -909,7 +909,7 @@ $.widget( "ui.tabs", {
// DEPRECATED
// TODO: Switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
// Backcompat for ui-tab class (now ui-tabs-tab)
$.widget( "ui.tabs", $.ui.tabs, {
diff --git a/ui/widgets/tooltip.js b/ui/widgets/tooltip.js
index 083c0389e..b626c5d10 100644
--- a/ui/widgets/tooltip.js
+++ b/ui/widgets/tooltip.js
@@ -505,7 +505,7 @@ $.widget( "ui.tooltip", {
// DEPRECATED
// TODO: Switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
// Backcompat for tooltipClass option
$.widget( "ui.tooltip", $.ui.tooltip, {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 16:34:38 +0000