diff --git a/demos/progress/index.html b/demos/progress/index.html
index 298632d52e..101d172ad5 100644
--- a/demos/progress/index.html
+++ b/demos/progress/index.html
@@ -49,7 +49,7 @@ Zip Grocery Delivery
- Restart the Demo
+ Restart the Demo
diff --git a/demos/reorderer/gridReorderer/index.html b/demos/reorderer/gridReorderer/index.html
index 5907187915..64079d19f8 100644
--- a/demos/reorderer/gridReorderer/index.html
+++ b/demos/reorderer/gridReorderer/index.html
@@ -15,9 +15,7 @@
-
-
-
+
diff --git a/demos/reorderer/imageReorderer/index.html b/demos/reorderer/imageReorderer/index.html
index 5be92f4f4e..9d79f17624 100644
--- a/demos/reorderer/imageReorderer/index.html
+++ b/demos/reorderer/imageReorderer/index.html
@@ -20,8 +20,6 @@
-
-
@@ -29,7 +27,7 @@
-
+
diff --git a/demos/reorderer/layoutReorderer/index.html b/demos/reorderer/layoutReorderer/index.html
index e83cb42b65..ac1f0e7f6e 100644
--- a/demos/reorderer/layoutReorderer/index.html
+++ b/demos/reorderer/layoutReorderer/index.html
@@ -16,8 +16,6 @@
-
-
diff --git a/demos/reorderer/listReorderer/index.html b/demos/reorderer/listReorderer/index.html
index c2398d5d93..e76259cd01 100644
--- a/demos/reorderer/listReorderer/index.html
+++ b/demos/reorderer/listReorderer/index.html
@@ -18,8 +18,6 @@
-
-
@@ -27,7 +25,7 @@
-
+
diff --git a/examples/components/reorderer/tableRow/index.html b/examples/components/reorderer/tableRow/index.html
index 1874574cb5..1c20c90d81 100644
--- a/examples/components/reorderer/tableRow/index.html
+++ b/examples/components/reorderer/tableRow/index.html
@@ -12,8 +12,6 @@
-
-
diff --git a/package.json b/package.json
index c4cd69b324..6923511eaf 100755
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
"deps:code:hypher:patterns": "cpy node_modules/@fluid-project/hyphenation-patterns/dist/browser/* src/lib/hypher/patterns/",
"deps:code:jquery": "cpy node_modules/jquery/dist/jquery.js src/lib/jquery/core/js/",
"deps:code:jquery:scrollTo": "cpy node_modules/jquery.scrollto/jquery.scrollTo.js src/lib/jquery/plugins/scrollTo/js/",
- "deps:code:jquery:ui": "cpy \"node_modules/jquery-ui/ui/@(version|widget|plugin|safe-active-element|safe-blur|position|data|keycode|scroll-parent|unique-id).js\" src/lib/jquery/ui/js/",
+ "deps:code:jquery:ui": "cpy \"node_modules/jquery-ui/ui/@(version|widget|plugin|position|data|keycode|scroll-parent|unique-id).js\" src/lib/jquery/ui/js/",
"deps:code:jquery:ui:themes:images": "cpy node_modules/jquery-ui/themes/base/images/*.png src/lib/jquery/ui/css/default-theme/images",
"deps:code:jquery:ui:themes:styles": "cpy \"node_modules/jquery-ui/themes/base/@(core|theme|tooltip).css\" src/lib/jquery/ui/css/default-theme/",
"deps:code:jquery:ui:widgets": "cpy \"node_modules/jquery-ui/ui/widgets/@(mouse|draggable|tooltip).js\" src/lib/jquery/ui/js/",
@@ -109,9 +109,9 @@
"fluid-lint-all": "1.2.3",
"fluid-testem": "2.1.15",
"hypher": "0.2.5",
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"jquery-simulate": "1.0.2",
- "jquery-ui": "1.13.0",
+ "jquery-ui": "1.14.1",
"jquery-ui-touch-punch": "0.2.3",
"jquery.scrollto": "2.1.3",
"minimist": "1.2.6",
diff --git a/src/components/inlineEdit/package.json b/src/components/inlineEdit/package.json
index 8024aded47..e63866e08f 100644
--- a/src/components/inlineEdit/package.json
+++ b/src/components/inlineEdit/package.json
@@ -13,8 +13,8 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
- "jquery-ui": "1.12.1",
+ "jquery": "3.7.1",
+ "jquery-ui": "1.14.1",
"fluid-framework": "^4.0.0",
"fluid-undo": "4.0.0",
"fluid-tooltip": "4.0.0"
diff --git a/src/components/orator/package.json b/src/components/orator/package.json
index e8e73fc418..1096922204 100644
--- a/src/components/orator/package.json
+++ b/src/components/orator/package.json
@@ -12,7 +12,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0",
"fluid-text-to-speech": "4.0.0"
}
diff --git a/src/components/overviewPanel/package.json b/src/components/overviewPanel/package.json
index c565e38c3c..3f68962fdb 100644
--- a/src/components/overviewPanel/package.json
+++ b/src/components/overviewPanel/package.json
@@ -12,7 +12,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"opensans": "5.0.29",
"roboto-slab": "5.0.20",
"fluid-framework": "^4.0.0",
diff --git a/src/components/pager/package.json b/src/components/pager/package.json
index 006df43892..4c987af439 100644
--- a/src/components/pager/package.json
+++ b/src/components/pager/package.json
@@ -14,7 +14,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0",
"fluid-renderer": "4.0.0",
"fluid-tooltip": "4.0.0"
diff --git a/src/components/progress/package.json b/src/components/progress/package.json
index 867f4b2e7f..9cfcf4675a 100644
--- a/src/components/progress/package.json
+++ b/src/components/progress/package.json
@@ -12,7 +12,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
diff --git a/src/components/reorderer/package.json b/src/components/reorderer/package.json
index 7b0a0d88fd..2aeb6bfae7 100644
--- a/src/components/reorderer/package.json
+++ b/src/components/reorderer/package.json
@@ -18,8 +18,8 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
- "jquery-ui": "1.12.1",
+ "jquery": "3.7.1",
+ "jquery-ui": "1.14.1",
"jquery-ui-touch-punch": "0.2.3",
"fluid-framework": "^4.0.0"
}
diff --git a/src/components/slidingPanel/package.json b/src/components/slidingPanel/package.json
index ac056e2ccd..d037c59001 100644
--- a/src/components/slidingPanel/package.json
+++ b/src/components/slidingPanel/package.json
@@ -9,8 +9,8 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
- "jquery-ui": "1.12.1",
+ "jquery": "3.7.1",
+ "jquery-ui": "1.14.1",
"fluid-framework": "^4.0.0"
}
}
diff --git a/src/components/switch/package.json b/src/components/switch/package.json
index 085fdf8d08..2611b4943d 100644
--- a/src/components/switch/package.json
+++ b/src/components/switch/package.json
@@ -12,7 +12,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
diff --git a/src/components/tableOfContents/package.json b/src/components/tableOfContents/package.json
index 2e6b5730cb..30e5ccb243 100644
--- a/src/components/tableOfContents/package.json
+++ b/src/components/tableOfContents/package.json
@@ -12,7 +12,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0",
"fluid-renderer": "4.0.0"
}
diff --git a/src/components/textToSpeech/package.json b/src/components/textToSpeech/package.json
index 9e79b396d6..87327ddeba 100644
--- a/src/components/textToSpeech/package.json
+++ b/src/components/textToSpeech/package.json
@@ -9,7 +9,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
diff --git a/src/components/textfieldControl/package.json b/src/components/textfieldControl/package.json
index 30a17a1aa3..78890ce857 100644
--- a/src/components/textfieldControl/package.json
+++ b/src/components/textfieldControl/package.json
@@ -15,7 +15,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
diff --git a/src/components/tooltip/js/Tooltip.js b/src/components/tooltip/js/Tooltip.js
index 78cb3aaaa0..89c61a9d6f 100644
--- a/src/components/tooltip/js/Tooltip.js
+++ b/src/components/tooltip/js/Tooltip.js
@@ -137,6 +137,10 @@ fluid.defaults("fluid.tooltip", {
gradeNames: ["fluid.viewComponent"],
widgetOptions: {
tooltipClass: "{that}.options.styles.tooltip",
+ classes: {
+ "ui-tooltip": "{that}.options.styles.tooltip",
+ "ui-tooltip-content": "{that}.options.styles.tooltipContent"
+ },
position: "{that}.options.position",
items: "{that}.options.items",
show: {
diff --git a/src/components/tooltip/package.json b/src/components/tooltip/package.json
index a0513e6cd4..5dc638eb7d 100644
--- a/src/components/tooltip/package.json
+++ b/src/components/tooltip/package.json
@@ -9,8 +9,8 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
- "jquery-ui": "1.12.1",
+ "jquery": "3.7.1",
+ "jquery-ui": "1.14.1",
"fluid-framework": "^4.0.0"
}
}
diff --git a/src/components/uiOptions/package.json b/src/components/uiOptions/package.json
index b40b8716f7..f25c3bb4dc 100644
--- a/src/components/uiOptions/package.json
+++ b/src/components/uiOptions/package.json
@@ -9,7 +9,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0",
"fluid-preferences": "4.0.0"
}
diff --git a/src/components/undo/package.json b/src/components/undo/package.json
index 830cbb6eae..a26e5e77e0 100644
--- a/src/components/undo/package.json
+++ b/src/components/undo/package.json
@@ -9,7 +9,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
diff --git a/src/components/uploader/package.json b/src/components/uploader/package.json
index 4130e412df..b7d6ab7e6a 100644
--- a/src/components/uploader/package.json
+++ b/src/components/uploader/package.json
@@ -18,8 +18,8 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
- "jquery-ui": "1.12.1",
+ "jquery": "3.7.1",
+ "jquery-ui": "1.14.1",
"jquery.scrollto": "2.1.2",
"fluid-framework": "^4.0.0",
"fluid-progress": "4.0.0",
diff --git a/src/framework/core/package.json b/src/framework/core/package.json
index 7d38a6d580..1ad8b5e7f7 100644
--- a/src/framework/core/package.json
+++ b/src/framework/core/package.json
@@ -33,7 +33,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
- "jquery-ui": "1.12.1"
+ "jquery": "3.7.1",
+ "jquery-ui": "1.14.1"
}
}
diff --git a/src/framework/enhancement/package.json b/src/framework/enhancement/package.json
index 27efad86c1..3afe85f083 100644
--- a/src/framework/enhancement/package.json
+++ b/src/framework/enhancement/package.json
@@ -13,7 +13,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
diff --git a/src/framework/preferences/package.json b/src/framework/preferences/package.json
index 1c8a10a9f7..2bb20b1e36 100644
--- a/src/framework/preferences/package.json
+++ b/src/framework/preferences/package.json
@@ -45,8 +45,8 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
- "jquery-ui": "1.12.1",
+ "jquery": "3.7.1",
+ "jquery-ui": "1.14.1",
"hypher": "0.2.5",
"opensans": "5.0.29",
"opendyslexic": "5.0.11",
diff --git a/src/framework/renderer/package.json b/src/framework/renderer/package.json
index 7b239236b8..a1405fd12a 100644
--- a/src/framework/renderer/package.json
+++ b/src/framework/renderer/package.json
@@ -11,7 +11,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
+ "jquery": "3.7.1",
"fluid-framework": "^4.0.0",
"fast-xml-pull": "4.0.0"
}
diff --git a/src/lib/package.json b/src/lib/package.json
index f701127e1e..6d77f87ff8 100644
--- a/src/lib/package.json
+++ b/src/lib/package.json
@@ -18,7 +18,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0"
+ "jquery": "3.7.1"
}
}, {
"name": "jquery",
@@ -39,7 +39,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0"
+ "jquery": "3.7.1"
}
}, {
"name": "jquery-ui",
@@ -50,8 +50,6 @@
"./js/version.js",
"./js/widget.js",
"./js/plugin.js",
- "./js/safe-active-element.js",
- "./js/safe-blur.js",
"./js/scroll-parent.js",
"./js/position.js",
"./js/data.js",
@@ -63,7 +61,7 @@
]
},
"dependencies": {
- "jquery": "3.6.0"
+ "jquery": "3.7.1"
}
}, {
"name": "jquery-ui-touch-punch",
@@ -75,8 +73,8 @@
]
},
"dependencies": {
- "jquery": "3.6.0",
- "jquery-ui": "1.12.1"
+ "jquery": "3.7.1",
+ "jquery-ui": "1.14.1"
}
}, {
"name": "atkinson-hyperlegible",
diff --git a/tests/component-tests/reorderer/html/AriaLabeller-test.html b/tests/component-tests/reorderer/html/AriaLabeller-test.html
index 4859bf242b..e48d620928 100644
--- a/tests/component-tests/reorderer/html/AriaLabeller-test.html
+++ b/tests/component-tests/reorderer/html/AriaLabeller-test.html
@@ -12,8 +12,6 @@
-
-
diff --git a/tests/component-tests/reorderer/html/ImageReorderer-test.html b/tests/component-tests/reorderer/html/ImageReorderer-test.html
index 485ecadcf6..8d01617a68 100644
--- a/tests/component-tests/reorderer/html/ImageReorderer-test.html
+++ b/tests/component-tests/reorderer/html/ImageReorderer-test.html
@@ -18,9 +18,7 @@
-
-
-
+
diff --git a/tests/component-tests/reorderer/html/LayoutReorderer-test.html b/tests/component-tests/reorderer/html/LayoutReorderer-test.html
index 1ced7ae63d..0d3b7b6b64 100644
--- a/tests/component-tests/reorderer/html/LayoutReorderer-test.html
+++ b/tests/component-tests/reorderer/html/LayoutReorderer-test.html
@@ -10,8 +10,6 @@
-
-
diff --git a/tests/component-tests/reorderer/html/NestedReorderer-test.html b/tests/component-tests/reorderer/html/NestedReorderer-test.html
index a527dbae36..bec8c302b6 100644
--- a/tests/component-tests/reorderer/html/NestedReorderer-test.html
+++ b/tests/component-tests/reorderer/html/NestedReorderer-test.html
@@ -12,8 +12,6 @@
-
-
diff --git a/tests/component-tests/reorderer/html/ReorderList-test.html b/tests/component-tests/reorderer/html/ReorderList-test.html
index 6e697efd8b..33f5c30686 100644
--- a/tests/component-tests/reorderer/html/ReorderList-test.html
+++ b/tests/component-tests/reorderer/html/ReorderList-test.html
@@ -12,8 +12,6 @@
-
-
diff --git a/tests/component-tests/reorderer/html/Scheduler-test.html b/tests/component-tests/reorderer/html/Scheduler-test.html
index beca8f8045..43fd7f3fd6 100644
--- a/tests/component-tests/reorderer/html/Scheduler-test.html
+++ b/tests/component-tests/reorderer/html/Scheduler-test.html
@@ -10,15 +10,13 @@
-
-
-
+
diff --git a/tests/component-tests/tooltip/js/TooltipTests.js b/tests/component-tests/tooltip/js/TooltipTests.js
index bdbf287fd2..7fcc101c2f 100644
--- a/tests/component-tests/tooltip/js/TooltipTests.js
+++ b/tests/component-tests/tooltip/js/TooltipTests.js
@@ -356,16 +356,19 @@ fluid.tests.tooltip.runTests = function () {
jqUnit.test("Styling added", function () {
var style = "styleClass";
+ var styleContent = "styleContentClass";
var tt = fluid.tooltip(".testTooltip", {
content: "Tooltip",
styles: {
- tooltip: style
+ tooltip: style,
+ tooltipContent: styleContent
}
});
tt.open();
var tooltip = $(".ui-tooltip");
jqUnit.assertTrue("The css class is applied to the tooltip element", tooltip.hasClass(style));
+ jqUnit.assertTrue("The css class is applied to the tooltip content element", $(".ui-tooltip-content", tooltip).hasClass(styleContent));
tt.destroy();
});
diff --git a/tests/manual-tests/components/reorderer/dynamic/index.html b/tests/manual-tests/components/reorderer/dynamic/index.html
index c38a46ef5f..8158987da4 100644
--- a/tests/manual-tests/components/reorderer/dynamic/index.html
+++ b/tests/manual-tests/components/reorderer/dynamic/index.html
@@ -13,8 +13,6 @@
-
-