Skip to content

Commit

Permalink
Merge pull request #1114 from jobara/FLUID-6784
Browse files Browse the repository at this point in the history 
FLUID-6784: Update jQuery and jQuery UI
  • Loading branch information
@jobara
jobara authored Dec 9, 2024
2 parents 823df48 + 83da5be commit ff1c537
Show file tree
Hide file tree
Showing 36 changed files with 48 additions and 67 deletions.
2 changes: 1 addition & 1 deletion demos/progress/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h1>Zip Grocery Delivery</h1>
<!-- status text for progress -->
<p class='demoSelector-progress-status-text demo-progress-status-text'></p>
<!-- links to the demo page -->
<a class='demoSelector-progress-restart demo-progress-restart' href="index.html">Restart the Demo</a>
<a class='demoSelector-progress-restart demo-progress-restart' href=".">Restart the Demo</a>
</div>

<!-- progress simulation -->
Expand Down
4 changes: 1 addition & 3 deletions demos/reorderer/gridReorderer/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
<script src="../../../src/lib/jquery/core/js/jquery.js"></script>
<script src="../../../src/lib/jquery/ui/js/version.js"></script>
<script src="../../../src/lib/jquery/ui/js/widget.js"></script>
<script src="../../../src/lib/jquery/ui/js/plugin.js"></script>
<script src="../../../src/lib/jquery/ui/js/safe-active-element.js"></script>
<script src="../../../src/lib/jquery/ui/js/safe-blur.js"></script>
<script src="../../../src/lib/jquery/ui/js/plugin.js"></script
<script src="../../../src/lib/jquery/ui/js/scroll-parent.js"></script>
<script src="../../../src/lib/jquery/ui/js/position.js"></script>
<script src="../../../src/lib/jquery/ui/js/keycode.js"></script>
Expand Down
4 changes: 1 addition & 3 deletions demos/reorderer/imageReorderer/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,14 @@
<script src="../../../src/lib/jquery/ui/js/version.js"></script>
<script src="../../../src/lib/jquery/ui/js/widget.js"></script>
<script src="../../../src/lib/jquery/ui/js/plugin.js"></script>
<script src="../../../src/lib/jquery/ui/js/safe-active-element.js"></script>
<script src="../../../src/lib/jquery/ui/js/safe-blur.js"></script>
<script src="../../../src/lib/jquery/ui/js/scroll-parent.js"></script>
<script src="../../../src/lib/jquery/ui/js/position.js"></script>
<script src="../../../src/lib/jquery/ui/js/keycode.js"></script>
<script src="../../../src/lib/jquery/ui/js/unique-id.js"></script>
<script src="../../../src/lib/jquery/ui/js/mouse.js"></script>
<script src="../../../src/lib/jquery/ui/js/draggable.js"></script>
<script src="../../../src/lib/jquery/plugins/touchPunch/js/jquery.ui.touch-punch.js"></script>

<script src="../../../src/framework/core/js/FluidDocument.js"></script>
<script src="../../../src/framework/core/js/jquery.keyboard-a11y.js"></script>
<script src="../../../src/framework/core/js/Fluid.js"></script>
Expand Down
2 changes: 0 additions & 2 deletions demos/reorderer/layoutReorderer/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
<script src="../../../src/lib/jquery/ui/js/version.js"></script>
<script src="../../../src/lib/jquery/ui/js/widget.js"></script>
<script src="../../../src/lib/jquery/ui/js/plugin.js"></script>
<script src="../../../src/lib/jquery/ui/js/safe-active-element.js"></script>
<script src="../../../src/lib/jquery/ui/js/safe-blur.js"></script>
<script src="../../../src/lib/jquery/ui/js/scroll-parent.js"></script>
<script src="../../../src/lib/jquery/ui/js/position.js"></script>
<script src="../../../src/lib/jquery/ui/js/keycode.js"></script>
Expand Down
4 changes: 1 addition & 3 deletions demos/reorderer/listReorderer/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@
<script src="../../../src/lib/jquery/ui/js/version.js"></script>
<script src="../../../src/lib/jquery/ui/js/widget.js"></script>
<script src="../../../src/lib/jquery/ui/js/plugin.js"></script>
<script src="../../../src/lib/jquery/ui/js/safe-active-element.js"></script>
<script src="../../../src/lib/jquery/ui/js/safe-blur.js"></script>
<script src="../../../src/lib/jquery/ui/js/scroll-parent.js"></script>
<script src="../../../src/lib/jquery/ui/js/position.js"></script>
<script src="../../../src/lib/jquery/ui/js/keycode.js"></script>
<script src="../../../src/lib/jquery/ui/js/unique-id.js"></script>
<script src="../../../src/lib/jquery/ui/js/mouse.js"></script>
<script src="../../../src/lib/jquery/ui/js/draggable.js"></script>
<script src="../../../src/lib/jquery/plugins/touchPunch/js/jquery.ui.touch-punch.js"></script>

<script src="../../../src/framework/core/js/FluidDocument.js"></script>
<script src="../../../src/framework/core/js/jquery.keyboard-a11y.js"></script>
<script src="../../../src/framework/core/js/Fluid.js"></script>
Expand Down
2 changes: 0 additions & 2 deletions examples/components/reorderer/tableRow/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<script src="../../../../src/lib/jquery/ui/js/version.js"></script>
<script src="../../../../src/lib/jquery/ui/js/widget.js"></script>
<script src="../../../../src/lib/jquery/ui/js/plugin.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-active-element.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-blur.js"></script>
<script src="../../../../src/lib/jquery/ui/js/scroll-parent.js"></script>
<script src="../../../../src/lib/jquery/ui/js/position.js"></script>
<script src="../../../../src/lib/jquery/ui/js/keycode.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/components/inlineEdit/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/components/orator/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/overviewPanel/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/components/pager/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/components/progress/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
]
},
"dependencies": {
"jquery": "3.6.0",
"jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
4 changes: 2 additions & 2 deletions src/components/reorderer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/slidingPanel/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion src/components/switch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
]
},
"dependencies": {
"jquery": "3.6.0",
"jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
2 changes: 1 addition & 1 deletion src/components/tableOfContents/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
]
},
"dependencies": {
"jquery": "3.6.0",
"jquery": "3.7.1",
"fluid-framework": "^4.0.0",
"fluid-renderer": "4.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/textToSpeech/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"dependencies": {
"jquery": "3.6.0",
"jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
2 changes: 1 addition & 1 deletion src/components/textfieldControl/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"dependencies": {
"jquery": "3.6.0",
"jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
4 changes: 4 additions & 0 deletions src/components/tooltip/js/Tooltip.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
4 changes: 2 additions & 2 deletions src/components/tooltip/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion src/components/uiOptions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"dependencies": {
"jquery": "3.6.0",
"jquery": "3.7.1",
"fluid-framework": "^4.0.0",
"fluid-preferences": "4.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/undo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"dependencies": {
"jquery": "3.6.0",
"jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
4 changes: 2 additions & 2 deletions src/components/uploader/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/framework/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
]
},
"dependencies": {
"jquery": "3.6.0",
"jquery-ui": "1.12.1"
"jquery": "3.7.1",
"jquery-ui": "1.14.1"
}
}
2 changes: 1 addition & 1 deletion src/framework/enhancement/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
},
"dependencies": {
"jquery": "3.6.0",
"jquery": "3.7.1",
"fluid-framework": "^4.0.0"
}
}
4 changes: 2 additions & 2 deletions src/framework/preferences/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/framework/renderer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
]
},
"dependencies": {
"jquery": "3.6.0",
"jquery": "3.7.1",
"fluid-framework": "^4.0.0",
"fast-xml-pull": "4.0.0"
}
Expand Down
12 changes: 5 additions & 7 deletions src/lib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
]
},
"dependencies": {
"jquery": "3.6.0"
"jquery": "3.7.1"
}
}, {
"name": "jquery",
Expand All @@ -39,7 +39,7 @@
]
},
"dependencies": {
"jquery": "3.6.0"
"jquery": "3.7.1"
}
}, {
"name": "jquery-ui",
Expand All @@ -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",
Expand All @@ -63,7 +61,7 @@
]
},
"dependencies": {
"jquery": "3.6.0"
"jquery": "3.7.1"
}
}, {
"name": "jquery-ui-touch-punch",
Expand All @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions tests/component-tests/reorderer/html/AriaLabeller-test.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<script src="../../../../src/lib/jquery/ui/js/version.js"></script>
<script src="../../../../src/lib/jquery/ui/js/widget.js"></script>
<script src="../../../../src/lib/jquery/ui/js/plugin.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-active-element.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-blur.js"></script>
<script src="../../../../src/lib/jquery/ui/js/scroll-parent.js"></script>
<script src="../../../../src/lib/jquery/ui/js/position.js"></script>
<script src="../../../../src/lib/jquery/ui/js/keycode.js"></script>
Expand Down
4 changes: 1 addition & 3 deletions tests/component-tests/reorderer/html/ImageReorderer-test.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
<script src="../../../../src/lib/jquery/core/js/jquery.js"></script>
<script src="../../../../src/lib/jquery/ui/js/version.js"></script>
<script src="../../../../src/lib/jquery/ui/js/widget.js"></script>
<script src="../../../../src/lib/jquery/ui/js/plugin.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-active-element.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-blur.js"></script>
<script src="../../../../src/lib/jquery/ui/js/plugin.js"></script
<script src="../../../../src/lib/jquery/ui/js/scroll-parent.js"></script>
<script src="../../../../src/lib/jquery/ui/js/position.js"></script>
<script src="../../../../src/lib/jquery/ui/js/keycode.js"></script>
Expand Down
2 changes: 0 additions & 2 deletions tests/component-tests/reorderer/html/LayoutReorderer-test.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
<script src="../../../../src/lib/jquery/ui/js/version.js"></script>
<script src="../../../../src/lib/jquery/ui/js/widget.js"></script>
<script src="../../../../src/lib/jquery/ui/js/plugin.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-active-element.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-blur.js"></script>
<script src="../../../../src/lib/jquery/ui/js/scroll-parent.js"></script>
<script src="../../../../src/lib/jquery/ui/js/position.js"></script>
<script src="../../../../src/lib/jquery/ui/js/keycode.js"></script>
Expand Down
2 changes: 0 additions & 2 deletions tests/component-tests/reorderer/html/NestedReorderer-test.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<script src="../../../../src/lib/jquery/ui/js/version.js"></script>
<script src="../../../../src/lib/jquery/ui/js/widget.js"></script>
<script src="../../../../src/lib/jquery/ui/js/plugin.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-active-element.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-blur.js"></script>
<script src="../../../../src/lib/jquery/ui/js/scroll-parent.js"></script>
<script src="../../../../src/lib/jquery/ui/js/position.js"></script>
<script src="../../../../src/lib/jquery/ui/js/keycode.js"></script>
Expand Down
2 changes: 0 additions & 2 deletions tests/component-tests/reorderer/html/ReorderList-test.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<script src="../../../../src/lib/jquery/ui/js/version.js"></script>
<script src="../../../../src/lib/jquery/ui/js/widget.js"></script>
<script src="../../../../src/lib/jquery/ui/js/plugin.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-active-element.js"></script>
<script src="../../../../src/lib/jquery/ui/js/safe-blur.js"></script>
<script src="../../../../src/lib/jquery/ui/js/scroll-parent.js"></script>
<script src="../../../../src/lib/jquery/ui/js/position.js"></script>
<script src="../../../../src/lib/jquery/ui/js/keycode.js"></script>
Expand Down
Loading

0 comments on commit ff1c537

Please sign in to comment.