Skip to content

Commit

Permalink
注释掉gitignore的dist文件夹
Browse files Browse the repository at this point in the history
  • Loading branch information
clock committed Jul 28, 2017
1 parent fadba65 commit 03cf1c1
Show file tree
Hide file tree
Showing 13 changed files with 12,108 additions and 16,746 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ web-im
web-im-*.zip
image/docker/webim/webim
coverage/*
demo/javascript/dist/demo-*.js
sdk/dist/websdk-*.js
sdk/dist/websdk-*.js.map
webrtc/dist/webrtc-*.js
#demo/javascript/dist/demo-*.js
#sdk/dist/websdk-*.js
#sdk/dist/websdk-*.js.map
#webrtc/dist/webrtc-*.js
6 changes: 3 additions & 3 deletions build/webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ var webpack = require('webpack');

module.exports = {
entry: {
'./sdk/dist/websdk-1.4.11': ['./sdk/index'],
'./demo/javascript/dist/demo-1.4.11': ['./demo/javascript/src/entry'],
'./webrtc/dist/webrtc-1.4.11': ['./webrtc/src/entry']
'./sdk/dist/websdk-1.4.12': ['./sdk/index'],
'./demo/javascript/dist/demo-1.4.12': ['./demo/javascript/src/entry'],
'./webrtc/dist/webrtc-1.4.12': ['./webrtc/src/entry']
},
output: {
path: './',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22119,6 +22119,7 @@
},
onOnline: function onOnline() {
// log(WebIM.utils.ts(), 'online');
console.log('onOnline');
},
onOffline: function onOffline() {
if (WebIM.config.isWindowSDK) {
Expand Down Expand Up @@ -22513,7 +22514,10 @@
Demo.api.NotifySuccess('Fail to Join the group');
break;
case 'memberJoinPublicGroupSuccess':
Demo.api.NotifySuccess(msg.mid + '已成功加入' + msg.from);
Demo.api.NotifySuccess(msg.mid + '已成功加入群组' + msg.from);
break;
case 'memberJoinChatRoomSuccess':
Demo.api.NotifySuccess(msg.mid + '已成功加入聊天室' + msg.from);
break;
case 'joinPublicGroupDeclined':
Demo.api.NotifyError(msg.owner + '拒绝了您加入' + msg.gid + '的请求');
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
}
</script>
<!--sdk-->
<script src='./sdk/dist/websdk-1.4.11.js'></script>
<script src='./sdk/dist/websdk-1.4.12.js'></script>
<!--webrtc-->
<script>
if (WebIM.config.isWebRTC) {
document.write("<script src='./webrtc/dist/adapter.js'><\/script>");
document.write("<script src='./webrtc/dist/webrtc-1.4.11.js'><\/script>");
document.write("<script src='./webrtc/dist/webrtc-1.4.12.js'><\/script>");
}
</script>
<!--[if lte IE 9]>
<script src="./demo/javascript/dist/swfupload/swfupload.min.js"></script>
<![endif]-->
<!--demo javascript-->
<script src="./demo/javascript/dist/demo-1.4.11.js"></script>
<script src="./demo/javascript/dist/demo-1.4.12.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "webim",
"version": "1.4.11",
"version": "1.4.12",
"description": "",
"main": "index.js",
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion sdk/dist/websdk-1.4.11.min.js.map

This file was deleted.

Loading

0 comments on commit 03cf1c1

Please sign in to comment.