From 03cf1c16c00082fcf33a142619e0f0d91842f52b Mon Sep 17 00:00:00 2001
From: clock <18209263592@163.com>
Date: Fri, 28 Jul 2017 12:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89gitignore=E7=9A=84di?=
=?UTF-8?q?st=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 8 +-
build/webpack.prod.js | 6 +-
.../dist/{demo-1.4.11.js => demo-1.4.12.js} | 6 +-
index.html | 6 +-
package.json | 2 +-
sdk/dist/websdk-1.4.11.min.js.map | 1 -
.../{websdk-1.4.11.js => websdk-1.4.12.js} | 24300 ++++++++--------
...sdk-1.4.11.min.js => websdk-1.4.12.min.js} | 4 +-
sdk/dist/websdk-1.4.12.min.js.map | 1 +
sdk/dist/websdk-1.4.8.js | 4512 ---
sdk/package.json | 2 +-
webpack.config.js | 6 +-
.../{webrtc-1.4.11.js => webrtc-1.4.12.js} | 0
13 files changed, 12108 insertions(+), 16746 deletions(-)
rename demo/javascript/dist/{demo-1.4.11.js => demo-1.4.12.js} (99%)
delete mode 100644 sdk/dist/websdk-1.4.11.min.js.map
rename sdk/dist/{websdk-1.4.11.js => websdk-1.4.12.js} (90%)
rename sdk/dist/{websdk-1.4.11.min.js => websdk-1.4.12.min.js} (99%)
create mode 100644 sdk/dist/websdk-1.4.12.min.js.map
delete mode 100644 sdk/dist/websdk-1.4.8.js
rename webrtc/dist/{webrtc-1.4.11.js => webrtc-1.4.12.js} (100%)
diff --git a/.gitignore b/.gitignore
index b2cdc610..0ce2cf01 100755
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/build/webpack.prod.js b/build/webpack.prod.js
index 3097bcd2..c9f50404 100755
--- a/build/webpack.prod.js
+++ b/build/webpack.prod.js
@@ -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: './',
diff --git a/demo/javascript/dist/demo-1.4.11.js b/demo/javascript/dist/demo-1.4.12.js
similarity index 99%
rename from demo/javascript/dist/demo-1.4.11.js
rename to demo/javascript/dist/demo-1.4.12.js
index 7457642c..debc4675 100644
--- a/demo/javascript/dist/demo-1.4.11.js
+++ b/demo/javascript/dist/demo-1.4.12.js
@@ -22119,6 +22119,7 @@
},
onOnline: function onOnline() {
// log(WebIM.utils.ts(), 'online');
+ console.log('onOnline');
},
onOffline: function onOffline() {
if (WebIM.config.isWindowSDK) {
@@ -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 + '的请求');
diff --git a/index.html b/index.html
index c1cadd6a..b625ffe0 100755
--- a/index.html
+++ b/index.html
@@ -28,18 +28,18 @@
}
-
+
-
+