Skip to content

Commit

Permalink
update 2.18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
endazoom committed Nov 6, 2023
1 parent 781ee27 commit d3a995f
Show file tree
Hide file tree
Showing 12 changed files with 40 additions and 36 deletions.
18 changes: 9 additions & 9 deletions CDN/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<head>
<title>Zoom WebSDK CDN</title>
<meta charset="utf-8" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/react-select.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/react-select.css" />
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

Expand Down Expand Up @@ -62,7 +62,7 @@
<div id="navbar" class="websdktest">
<form class="navbar-form navbar-right" id="meeting_form">
<div class="form-group">
<input type="text" name="display_name" id="display_name" value="2.17.0#CDN" maxLength="100"
<input type="text" name="display_name" id="display_name" value="2.18.0#CDN" maxLength="100"
placeholder="Name" class="form-control" required>
</div>
<div class="form-group">
Expand Down Expand Up @@ -138,12 +138,12 @@
})
</script>

<script src="https://source.zoom.us/2.17.0/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/2.17.0/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/2.17.0/lib/vendor/redux.min.js"></script>
<script src="https://source.zoom.us/2.17.0/lib/vendor/redux-thunk.min.js"></script>
<script src="https://source.zoom.us/2.17.0/lib/vendor/lodash.min.js"></script>
<script src="https://source.zoom.us/zoom-meeting-2.17.0.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/redux.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/redux-thunk.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/lodash.min.js"></script>
<script src="https://source.zoom.us/zoom-meeting-2.18.0.min.js"></script>
<script src="js/tool.js"></script>
<script src="js/vconsole.min.js"></script>
<script src="js/index.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions CDN/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ function websdkready() {
console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));

// it's option if you want to change the WebSDK dependency link resources. setZoomJSLib must be run at first
// if (!china) ZoomMtg.setZoomJSLib('https://source.zoom.us/2.17.0/lib', '/av'); // CDN version default
// else ZoomMtg.setZoomJSLib('https://jssdk.zoomus.cn/2.17.0/lib', '/av'); // china cdn option
// if (!china) ZoomMtg.setZoomJSLib('https://source.zoom.us/2.18.0/lib', '/av'); // CDN version default
// else ZoomMtg.setZoomJSLib('https://jssdk.zoomus.cn/2.18.0/lib', '/av'); // china cdn option
// ZoomMtg.setZoomJSLib('http://localhost:9999/node_modules/@zoomus/websdk/dist/lib', '/av'); // Local version default, Angular Project change to use cdn version
ZoomMtg.preLoadWasm(); // pre download wasm file to save time.

Expand Down
4 changes: 2 additions & 2 deletions CDN/js/meeting.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ function websdkready() {
console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));

// it's option if you want to change the WebSDK dependency link resources. setZoomJSLib must be run at first
// ZoomMtg.setZoomJSLib("https://source.zoom.us/2.17.0/lib", "/av"); // CDN version defaul
// ZoomMtg.setZoomJSLib("https://source.zoom.us/2.18.0/lib", "/av"); // CDN version defaul
if (meetingConfig.china)
ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/2.17.0/lib", "/av"); // china cdn option
ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/2.18.0/lib", "/av"); // china cdn option
ZoomMtg.preLoadWasm();
ZoomMtg.prepareJssdk();
function beginJoin(signature) {
Expand Down
16 changes: 8 additions & 8 deletions CDN/meeting.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
<head>
<title>Zoom WebSDK CDN</title>
<meta charset="utf-8" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/react-select.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/react-select.css" />
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta http-equiv="origin-trial" content="">
</head>

<body>
<script src="https://source.zoom.us/2.17.0/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/2.17.0/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/2.17.0/lib/vendor/redux.min.js"></script>
<script src="https://source.zoom.us/2.17.0/lib/vendor/redux-thunk.min.js"></script>
<script src="https://source.zoom.us/2.17.0/lib/vendor/lodash.min.js"></script>
<script src="https://source.zoom.us/zoom-meeting-2.17.0.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/redux.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/redux-thunk.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/lodash.min.js"></script>
<script src="https://source.zoom.us/zoom-meeting-2.18.0.min.js"></script>
<script src="js/tool.js"></script>
<script src="js/vconsole.min.js"></script>
<script src="js/meeting.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion CDN/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "websdk-cdn",
"version": "2.17.0",
"version": "2.18.0",
"description": "Zoom sample app for web client WebSDK",
"main": "index.js",
"scripts": {
Expand Down
6 changes: 5 additions & 1 deletion Components/config-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ module.exports = {
{
from: path.resolve(__dirname, 'node_modules', '@zoomus', 'websdk', 'dist', 'lib', 'av'),
to: path.resolve(__dirname, 'public', 'lib')
}
},
{
from: path.resolve(__dirname, 'node_modules', '@zoomus', 'websdk', 'dist', 'lib', 'image'),
to: path.resolve(__dirname, 'public', 'image')
},
]
})
)
Expand Down
4 changes: 2 additions & 2 deletions Components/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "websdk-component-demo",
"version": "2.17.0",
"version": "2.18.0",
"private": true,
"dependencies": {
"@ant-design/icons": "^4.6.2",
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/react": "^11.2.5",
"@testing-library/user-event": "^12.8.3",
"@zoomus/websdk": "2.17.0",
"@zoomus/websdk": "2.18.0",
"antd": "^4.14.1",
"classnames": "^2.2.6",
"crypto-js": "^4.0.0",
Expand Down
6 changes: 3 additions & 3 deletions Components/public/cdn.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<meta charset="UTF-8">
<title>WebSDK Embedded CDN demo</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="https://source.zoom.us/2.17.0/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/2.17.0/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/2.17.0/zoom-meeting-embedded-2.17.0.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/2.18.0/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/2.18.0/zoom-meeting-embedded-2.18.0.min.js"></script>
<script src="./tools/tool.js"></script>
<script src="./tools/vconsole.min.js"></script>
<script src="./tools/token-tool.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions Components/public/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<head>
<title>Zoom WebSDK Embedded Demo Nav</title>
<meta charset="utf-8" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.17.0/css/react-select.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.18.0/css/react-select.css" />
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<script src="./tools/jsrsasign-all-min.js"></script>
Expand Down Expand Up @@ -66,7 +66,7 @@
<div id="navbar" class="websdktest">
<form class="navbar-form navbar-right" id="meeting_form">
<div class="form-group">
<input type="text" name="display_name" id="display_name" value="2.17.0#CDN" maxLength="100"
<input type="text" name="display_name" id="display_name" value="2.18.0#CDN" maxLength="100"
placeholder="Name" class="form-control" required>
</div>
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion Local/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<div id="navbar" class="websdktest">
<form class="navbar-form navbar-right" id="meeting_form">
<div class="form-group">
<input type="text" name="display_name" id="display_name" value="2.17.0#Local" maxLength="100"
<input type="text" name="display_name" id="display_name" value="2.18.0#Local" maxLength="100"
placeholder="Name" class="form-control" required>
</div>
<div class="form-group">
Expand Down
4 changes: 2 additions & 2 deletions Local/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ console.log("checkSystemRequirements");
console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));

// it's option if you want to change the WebSDK dependency link resources. setZoomJSLib must be run at first
// if (!china) ZoomMtg.setZoomJSLib('https://source.zoom.us/2.17.0/lib', '/av'); // CDN version default
// else ZoomMtg.setZoomJSLib('https://jssdk.zoomus.cn/2.17.0/lib', '/av'); // china cdn option
// if (!china) ZoomMtg.setZoomJSLib('https://source.zoom.us/2.18.0/lib', '/av'); // CDN version default
// else ZoomMtg.setZoomJSLib('https://jssdk.zoomus.cn/2.18.0/lib', '/av'); // china cdn option
// ZoomMtg.setZoomJSLib('http://localhost:9999/node_modules/@zoomus/websdk/dist/lib', '/av'); // Local version default, Angular Project change to use cdn version
ZoomMtg.preLoadWasm();
ZoomMtg.prepareWebSDK();
Expand Down
4 changes: 2 additions & 2 deletions Local/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "http://json.schemastore.org/coffeelint",
"name": "websdk-local",
"version": "2.17.0",
"version": "2.18.0",
"description": "Zoom sample app for web client WebSDK",
"main": "index.js",
"scripts": {
Expand All @@ -19,7 +19,7 @@
"author": "Zoom Video Communications, Inc.",
"license": "SEE LICENSE IN LICENSE.md",
"dependencies": {
"@zoomus/websdk": "2.17.0",
"@zoomus/websdk": "2.18.0",
"lodash": "^4.17.21",
"react": "16.14.0",
"react-dom": "16.14.0",
Expand Down

0 comments on commit d3a995f

Please sign in to comment.