|
@@ -1126,24 +1126,6 @@ function getCameraVideoSize(videoWidth,
|
1126
|
1126
|
$(document).ready(function () {
|
1127
|
1127
|
document.title = brand.appName;
|
1128
|
1128
|
|
1129
|
|
- if (interfaceConfig.SHOW_JITSI_WATERMARK) {
|
1130
|
|
- $("#leftwatermark").css({display: 'block'});
|
1131
|
|
- $("#leftwatermark").parent().get(0).href
|
1132
|
|
- = interfaceConfig.JITSI_WATERMARK_LINK;
|
1133
|
|
- }
|
1134
|
|
-
|
1135
|
|
- if (interfaceConfig.SHOW_BRAND_WATERMARK) {
|
1136
|
|
- $("#rightwatermark").css({display: 'block'});
|
1137
|
|
- $("#rightwatermark").parent().get(0).href
|
1138
|
|
- = interfaceConfig.BRAND_WATERMARK_LINK;
|
1139
|
|
- $("#rightwatermark").get(0).style.backgroundImage
|
1140
|
|
- = "url(../images/rightwatermark.png)";
|
1141
|
|
- }
|
1142
|
|
-
|
1143
|
|
- if (interfaceConfig.SHOW_POWERED_BY) {
|
1144
|
|
- $("#poweredby").css({display: 'block'});
|
1145
|
|
- }
|
1146
|
|
-
|
1147
|
1129
|
if(config.enableWelcomePage && window.location.pathname == "/" &&
|
1148
|
1130
|
(!window.localStorage.welcomePageDisabled
|
1149
|
1131
|
|| window.localStorage.welcomePageDisabled == "false"))
|
|
@@ -1153,6 +1135,31 @@ $(document).ready(function () {
|
1153
|
1135
|
window.location.protocol + "//" + window.location.host + "/");
|
1154
|
1136
|
$("span[name='appName']").text(brand.appName);
|
1155
|
1137
|
|
|
1138
|
+ if (interfaceConfig.SHOW_JITSI_WATERMARK) {
|
|
1139
|
+ var leftWatermarkDiv
|
|
1140
|
+ = $("#welcome_page_header div[class='watermark leftwatermark']");
|
|
1141
|
+
|
|
1142
|
+ leftWatermarkDiv.css({display: 'block'});
|
|
1143
|
+ leftWatermarkDiv.parent().get(0).href
|
|
1144
|
+ = interfaceConfig.JITSI_WATERMARK_LINK;
|
|
1145
|
+ }
|
|
1146
|
+
|
|
1147
|
+ if (interfaceConfig.SHOW_BRAND_WATERMARK) {
|
|
1148
|
+ var rightWatermarkDiv
|
|
1149
|
+ = $("#welcome_page_header div[class='watermark rightwatermark']");
|
|
1150
|
+
|
|
1151
|
+ rightWatermarkDiv.css({display: 'block'});
|
|
1152
|
+ rightWatermarkDiv.parent().get(0).href
|
|
1153
|
+ = interfaceConfig.BRAND_WATERMARK_LINK;
|
|
1154
|
+ rightWatermarkDiv.get(0).style.backgroundImage
|
|
1155
|
+ = "url(../images/rightwatermark.png)";
|
|
1156
|
+ }
|
|
1157
|
+
|
|
1158
|
+ if (interfaceConfig.SHOW_POWERED_BY) {
|
|
1159
|
+ $("#welcome_page_header>a[class='poweredby']")
|
|
1160
|
+ .css({display: 'block'});
|
|
1161
|
+ }
|
|
1162
|
+
|
1156
|
1163
|
function enter_room()
|
1157
|
1164
|
{
|
1158
|
1165
|
var val = $("#enter_room_field").val();
|
|
@@ -1187,7 +1194,6 @@ $(document).ready(function () {
|
1187
|
1194
|
}, 70);
|
1188
|
1195
|
}
|
1189
|
1196
|
|
1190
|
|
-
|
1191
|
1197
|
function update_roomname()
|
1192
|
1198
|
{
|
1193
|
1199
|
var word = RoomNameGenerator.generateRoomWithoutSeparator();
|
|
@@ -1200,12 +1206,37 @@ $(document).ready(function () {
|
1200
|
1206
|
update_roomname();
|
1201
|
1207
|
|
1202
|
1208
|
$("#disable_welcome").click(function () {
|
1203
|
|
- window.localStorage.welcomePageDisabled = $("#disable_welcome").is(":checked");
|
|
1209
|
+ window.localStorage.welcomePageDisabled
|
|
1210
|
+ = $("#disable_welcome").is(":checked");
|
1204
|
1211
|
});
|
1205
|
1212
|
|
1206
|
1213
|
return;
|
1207
|
1214
|
}
|
1208
|
1215
|
|
|
1216
|
+ if (interfaceConfig.SHOW_JITSI_WATERMARK) {
|
|
1217
|
+ var leftWatermarkDiv
|
|
1218
|
+ = $("#largeVideoContainer div[class='watermark leftwatermark']");
|
|
1219
|
+
|
|
1220
|
+ leftWatermarkDiv.css({display: 'block'});
|
|
1221
|
+ leftWatermarkDiv.parent().get(0).href
|
|
1222
|
+ = interfaceConfig.JITSI_WATERMARK_LINK;
|
|
1223
|
+ }
|
|
1224
|
+
|
|
1225
|
+ if (interfaceConfig.SHOW_BRAND_WATERMARK) {
|
|
1226
|
+ var rightWatermarkDiv
|
|
1227
|
+ = $("#largeVideoContainer div[class='watermark rightwatermark']");
|
|
1228
|
+
|
|
1229
|
+ rightWatermarkDiv.css({display: 'block'});
|
|
1230
|
+ rightWatermarkDiv.parent().get(0).href
|
|
1231
|
+ = interfaceConfig.BRAND_WATERMARK_LINK;
|
|
1232
|
+ rightWatermarkDiv.get(0).style.backgroundImage
|
|
1233
|
+ = "url(../images/rightwatermark.png)";
|
|
1234
|
+ }
|
|
1235
|
+
|
|
1236
|
+ if (interfaceConfig.SHOW_POWERED_BY) {
|
|
1237
|
+ $("#largeVideoContainer>a[class='poweredby']").css({display: 'block'});
|
|
1238
|
+ }
|
|
1239
|
+
|
1209
|
1240
|
$("#welcome_page").hide();
|
1210
|
1241
|
Chat.init();
|
1211
|
1242
|
|
|
@@ -1265,7 +1296,10 @@ $(window).bind('beforeunload', function () {
|
1265
|
1296
|
async: false,
|
1266
|
1297
|
cache: false,
|
1267
|
1298
|
contentType: 'application/xml',
|
1268
|
|
- data: "<body rid='" + (connection.rid || connection._proto.rid) + "' xmlns='http://jabber.org/protocol/httpbind' sid='" + (connection.sid || connection._proto.sid) + "' type='terminate'><presence xmlns='jabber:client' type='unavailable'/></body>",
|
|
1299
|
+ data: "<body rid='" + (connection.rid || connection._proto.rid)
|
|
1300
|
+ + "' xmlns='http://jabber.org/protocol/httpbind' sid='"
|
|
1301
|
+ + (connection.sid || connection._proto.sid)
|
|
1302
|
+ + "' type='terminate'><presence xmlns='jabber:client' type='unavailable'/></body>",
|
1269
|
1303
|
success: function (data) {
|
1270
|
1304
|
console.log('signed out');
|
1271
|
1305
|
console.log(data);
|
|
@@ -1281,7 +1315,8 @@ $(window).bind('beforeunload', function () {
|
1281
|
1315
|
function disposeConference(onUnload) {
|
1282
|
1316
|
var handler = getConferenceHandler();
|
1283
|
1317
|
if (handler && handler.peerconnection) {
|
1284
|
|
- // FIXME: probably removing streams is not required and close() should be enough
|
|
1318
|
+ // FIXME: probably removing streams is not required and close() should
|
|
1319
|
+ // be enough
|
1285
|
1320
|
if (connection.jingle.localAudio) {
|
1286
|
1321
|
handler.peerconnection.removeStream(connection.jingle.localAudio);
|
1287
|
1322
|
}
|