Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
52e466d4
Commit
52e466d4
authored
Jul 19, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed for collaboration
parent
a6846c4b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
14 deletions
+18
-14
public_new/footer_collabo.html
+1
-1
public_new/js/Models/coview-userinfo.js
+2
-2
public_new/js/Models/deviceinfo.js
+3
-0
public_new/js/common/native-bridge-delegate.js
+11
-5
public_new/js/views/collaboration/collaboration.js
+0
-2
public_new/js/views/collaboration/share-event-listener.js
+0
-0
public_new/js/views/collaboration/share.js
+1
-4
No files found.
public_new/footer_collabo.html
View file @
52e466d4
...
...
@@ -59,7 +59,7 @@
</a>
</div>
<div
class=
"footer_item mx-md-3"
>
<a
href=
"javascript:CoviewBridge.exitCollaboration(
isDocument
);"
>
<a
href=
"javascript:CoviewBridge.exitCollaboration();"
>
<div
class=
"img_wrap bg_red mx-1"
>
<img
src=
"icon/icon_close_white.png"
alt=
"閉じる"
>
</div>
...
...
public_new/js/Models/coview-userinfo.js
View file @
52e466d4
...
...
@@ -38,9 +38,9 @@ var CoviewUserInfo = class {
case
COLLABORATION_TYPE
.
VIDEO
:
return
COLLABORATION_TYPE
.
VIDEO
;
case
COLLABORATION_TYPE
.
DOCUMENT
:
return
COLLABORATION_TYPE
.
DOCUMENT
;
return
COLLABORATION_TYPE
.
AUDIO
;
case
COLLABORATION_TYPE
.
BOARD
:
return
COLLABORATION_TYPE
.
BOARD
;
return
COLLABORATION_TYPE
.
AUDIO
;
}
}
...
...
public_new/js/Models/deviceinfo.js
View file @
52e466d4
...
...
@@ -33,3 +33,6 @@ var DeviceInfo = class {
};
var
deviceInfo
=
new
DeviceInfo
(
NativeBridgeDataSource
.
getDeviceInfo
());
// WARN:: this variable is only for use in coview. and should request not to use this.
var
isIos
=
deviceInfo
.
isiOS
();
public_new/js/common/native-bridge-delegate.js
View file @
52e466d4
...
...
@@ -212,10 +212,11 @@ NativeBridgeDelegate.changeRoomName = function (newRoomName) {
};
NativeBridgeDelegate
.
startCollaboration
=
function
(
type
)
{
const
collaborationNumber
=
CHAT_UTIL
.
getCollaborationTypeNumber
(
type
);
if
(
deviceInfo
.
isiOS
())
{
webkit
.
messageHandlers
.
startCollaboration
.
postMessage
(
type
);
webkit
.
messageHandlers
.
startCollaboration
.
postMessage
(
collaborationNumber
);
}
else
if
(
deviceInfo
.
isAndroid
())
{
android
.
startCollaboration
(
type
);
android
.
startCollaboration
(
collaborationNumber
);
}
};
...
...
@@ -347,14 +348,19 @@ NativeBridgeDelegate.startContentView = function () {
}
};
NativeBridgeDelegate
.
changeCollaboration
=
function
(
type
,
meetingID
)
{
NativeBridgeDelegate
.
changeCollaboration
=
function
(
collaborationType
,
meetingID
)
{
const
collaborationNumber
=
CHAT_UTIL
.
getCollaborationTypeNumber
(
collaborationType
);
if
(
deviceInfo
.
isiOS
())
{
webkit
.
messageHandlers
.
changeCollaboration
.
postMessage
({
changeCollaborationType
:
type
,
changeCollaborationType
:
collaborationNumber
,
meetingId
:
meetingID
,
});
}
else
if
(
deviceInfo
.
isAndroid
())
{
android
.
changeCollaboration
(
type
,
meetingID
);
android
.
changeCollaboration
(
collaborationNumber
,
meetingID
);
}
};
...
...
public_new/js/views/collaboration/collaboration.js
View file @
52e466d4
...
...
@@ -29,8 +29,6 @@ document.addEventListener("DOMContentLoaded", function () {
********************************/
CollaborationUI
.
bindMenuButton
=
function
()
{
$
(
".menu_btn"
).
click
(
function
()
{
var
w
=
$
(
this
).
width
();
$
(
this
).
toggleClass
(
"hide"
);
$
(
"#overlay_menu .item"
).
toggleClass
(
"hide"
);
});
...
...
public_new/js/views/collaboration/share-event-listener.js
View file @
52e466d4
This diff is collapsed.
Click to expand it.
public_new/js/views/collaboration/share.js
View file @
52e466d4
...
...
@@ -2,11 +2,9 @@
/* Functions */
/* --------------------------------------------------- */
let
coview_api
=
new
CoviewApi
();
var
isDocument
=
false
;
var
isBoard
=
false
;
let
timeInterval
=
null
;
var
backgroundFileName
;
var
isIos
;
document
.
addEventListener
(
"DOMContentLoaded"
,
function
()
{
coview_api
.
Init
({
...
...
@@ -153,8 +151,7 @@ function screenLock() {
element
.
style
.
zIndex
=
"9999"
;
element
.
style
.
opacity
=
"0"
;
const
objBody
=
document
.
getElementsByTagName
(
"body"
).
item
(
0
);
objBody
.
appendChild
(
element
);
document
.
getElementsByTagName
(
"body"
).
item
(
0
).
appendChild
(
element
);
}
async
function
waitMillisecond
(
millesecond
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment