Skip to content

Commit

Permalink
Merge pull request #92 from zoom/3.6.0
Browse files Browse the repository at this point in the history
Update to 3.6.0
  • Loading branch information
PikaJoyce authored Apr 23, 2024
2 parents 146dbd5 + 718a298 commit 4984903
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 32 deletions.
16 changes: 8 additions & 8 deletions CDN/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="utf-8" />
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.5.2/css/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.6.0/css/bootstrap.css" />

</head>

Expand Down Expand Up @@ -61,7 +61,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="3.5.2#CDN" maxLength="100"
<input type="text" name="display_name" id="display_name" value="3.6.0#CDN" maxLength="100"
placeholder="Name" class="form-control" required>
</div>
<div class="form-group">
Expand Down Expand Up @@ -141,12 +141,12 @@
})
</script>

<script src="https://source.zoom.us/3.5.2/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/3.5.2/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/3.5.2/lib/vendor/redux.min.js"></script>
<script src="https://source.zoom.us/3.5.2/lib/vendor/redux-thunk.min.js"></script>
<script src="https://source.zoom.us/3.5.2/lib/vendor/lodash.min.js"></script>
<script src="https://source.zoom.us/3.5.2/zoom-meeting-3.5.2.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/redux.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/redux-thunk.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/lodash.min.js"></script>
<script src="https://source.zoom.us/3.6.0/zoom-meeting-3.6.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
2 changes: 1 addition & 1 deletion CDN/js/meeting.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function websdkready() {
// it's option if you want to change the MeetingSDK-Web dependency link resources. setZoomJSLib must be run at first
// ZoomMtg.setZoomJSLib("https://source.zoom.us/{VERSION}/lib", "/av"); // default, don't need call it
if (meetingConfig.china)
ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/3.5.2/lib", "/av"); // china cdn option
ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/3.6.0/lib", "/av"); // china cdn option

ZoomMtg.preLoadWasm();
ZoomMtg.prepareWebSDK();
Expand Down
12 changes: 6 additions & 6 deletions CDN/meeting.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
</head>

<body>
<script src="https://source.zoom.us/3.5.2/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/3.5.2/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/3.5.2/lib/vendor/redux.min.js"></script>
<script src="https://source.zoom.us/3.5.2/lib/vendor/redux-thunk.min.js"></script>
<script src="https://source.zoom.us/3.5.2/lib/vendor/lodash.min.js"></script>
<script src="https://source.zoom.us/3.5.2/zoom-meeting-3.5.2.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/redux.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/redux-thunk.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/lodash.min.js"></script>
<script src="https://source.zoom.us/3.6.0/zoom-meeting-3.6.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": "3.5.2",
"version": "3.6.0",
"description": "Zoom sample app for MeetingSDK-Web client view",
"main": "index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions Components/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "websdk-component-demo",
"version": "3.5.2",
"version": "3.6.0",
"private": true,
"dependencies": {
"@zoom/meetingsdk": "3.5.2",
"@zoom/meetingsdk": "3.6.0",
"jsrsasign": "11.1.0",
"react-scripts": "5.0.1",
"web-vitals": "3.5.2"
Expand Down
6 changes: 3 additions & 3 deletions Components/public/cdn.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,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/3.5.2/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/3.5.2/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/3.5.2/zoom-meeting-embedded-3.5.2.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/3.6.0/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/3.6.0/zoom-meeting-embedded-3.6.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/3.5.2/css/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.5.2/css/react-select.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.6.0/css/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/3.6.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="3.5.2#CDN" maxLength="100"
<input type="text" name="display_name" id="display_name" value="3.6.0#CDN" maxLength="100"
placeholder="Name" class="form-control" required>
</div>
<div class="form-group">
Expand Down
10 changes: 5 additions & 5 deletions Local/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
height: 34px;
border-radius: 4px;
}

.websdktest button {
float: right;
margin-left: 5px;
Expand All @@ -29,12 +29,12 @@
top: 100px;
left: 0;
display: block;
z-index: 99999;
z-index: 99999;
}
#display_name {
width: 250px;
}


#websdk-iframe {
width: 700px;
Expand All @@ -59,7 +59,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="3.5.2#Local" maxLength="100"
<input type="text" name="display_name" id="display_name" value="3.6.0#Local" maxLength="100"
placeholder="Name" class="form-control" required>
</div>
<div class="form-group">
Expand Down Expand Up @@ -109,7 +109,7 @@
<button type="submit" class="btn btn-primary" id="join_meeting">Join</button>
<button type="submit" class="btn btn-primary" id="clear_all">Clear</button>
<button type="button" link="" onclick="window.copyJoinLink('#copy_join_link')" class="btn btn-primary" id="copy_join_link">Copy Direct join link</button>


</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Local/js/meeting.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));
// it's option if you want to change the MeetingSDK-Web dependency link resources. setZoomJSLib must be run at first
// ZoomMtg.setZoomJSLib("https://source.zoom.us/{VERSION}/lib", "/av"); // default, don't need call it
if (meetingConfig.china)
ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/3.5.2/lib", "/av"); // china cdn option
ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/3.6.0/lib", "/av"); // china cdn option

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": "3.5.2",
"version": "3.6.0",
"description": "Zoom sample app for MeetingSDK-Web client view",
"main": "index.js",
"scripts": {
Expand All @@ -20,7 +20,7 @@
"author": "Zoom Video Communications, Inc.",
"license": "SEE LICENSE IN LICENSE.md",
"dependencies": {
"@zoom/meetingsdk": "3.5.2",
"@zoom/meetingsdk": "3.6.0",
"lodash": "^4.17.21",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down

0 comments on commit 4984903

Please sign in to comment.