Browse Source

config update

master
jfinn 4 years ago
parent
commit
577af681ce
6 changed files with 90 additions and 14 deletions
  1. 4
    4
      rf/i4m/m3.css
  2. 39
    1
      rf/m2/m2.css
  3. 7
    1
      rf/m2/m2.js
  4. 8
    0
      rf/u/universals.js
  5. 7
    4
      rf/ui_msg/r2.css
  6. 25
    4
      rf/ytsv/y.js

+ 4
- 4
rf/i4m/m3.css View File

@@ -416,7 +416,7 @@
416 416
 
417 417
 /*.room_span_container {*/
418 418
 .rxt {
419
-
419
+perspective: 1000px;
420 420
 }
421 421
 .rxi {
422 422
   background-color: transparent;
@@ -427,7 +427,7 @@
427 427
   /*perspective: 500px;*/
428 428
 }
429 429
 .rxi .room_span_container{
430
-  transform: rotateY(180deg);
430
+  transform: rotateY(-180deg);
431 431
 }
432 432
 .room_span_container {
433 433
 	  transition: transform .7s;
@@ -447,10 +447,10 @@
447 447
 
448 448
 /*.rxt:hover > .room_span_container {*/
449 449
 .rxt.flip > .room_span_container {
450
-  transform: rotateY(180deg);
450
+  transform: rotateY(-180deg);
451 451
 }
452 452
 .rxt.flip > .rxi .room_span_container {
453
-  transform: rotateY(360deg);
453
+  transform: rotateY(-360deg);
454 454
 }
455 455
 /*
456 456
 .rxt:hover > .room_span_container {

+ 39
- 1
rf/m2/m2.css View File

@@ -155,6 +155,7 @@
155 155
 	/*padding-left: 20px;*/
156 156
 	padding: 20px 0px 40px;
157 157
 	padding: 10px 20px 10px;
158
+	padding: 5px 10px 10px;
158 159
 
159 160
 	/*height: 50px;*/
160 161
 	/*border-radius: 5px;*/
@@ -255,7 +256,7 @@
255 256
 background-color: #0000 !important;
256 257
 
257 258
 }
258
-.theater_mode .jitsi-icon {
259
+.theater_mode .jitsi-icon.z {
259 260
 	position: relative;
260 261
 	height: 20px;
261 262
 	outline: 3px solid #fff;
@@ -265,8 +266,39 @@ background-color: #0000 !important;
265 266
 	/*margin-top: 4px;*/
266 267
 	/*bottom: -10px;*/
267 268
 }
269
+.theater_mode .jitsi-icon:after {
270
+	position: relative;
271
+	position: absolute;
272
+	content: "";
273
+	height: 20px;
274
+	height: 14px;
275
+	/*height: 15px;*/
276
+	width: 32px;
277
+	width: 26px;
278
+	/*box-sizing: border-box;*/
279
+	/*background-color: red;*/
280
+	/*height: 16px;*/
281
+	
282
+
283
+	/*outline: 2px solid #fff;*/
284
+	border:  3px solid #fff;
285
+
286
+
287
+	outline-offset: -4px;
288
+	top: 50%;
289
+	left: 50%;
290
+	transform: translate(-50%,-50%);
291
+	/*margin-top: 4px;*/
292
+	/*bottom: -10px;*/
293
+}
294
+.theater_mode .jitsi-icon svg {
295
+
296
+}
297
+
268 298
 .theater_mode .toolbox-icon{
269 299
 	/*top:4px;*/
300
+	/*padding: 3px;*/
301
+
270 302
 	width: 32px;
271 303
 	height: 32px;
272 304
 	position: relative;
@@ -275,6 +307,12 @@ background-color: #0000 !important;
275 307
 
276 308
 
277 309
 .theater_mode .jitsi-icon > svg{
310
+	/*zoom:1.5;*/
311
+	/*top: -4px;*/
312
+	/*width: 24px;*/
313
+	/*height: 24px;*/
314
+	/*position: relative;*/
315
+	/*position: absolute;*/
278 316
 	/*display: none !important;*/
279 317
 	opacity: 0;
280 318
 }

+ 7
- 1
rf/m2/m2.js View File

@@ -75,8 +75,14 @@ function refresh_toolbar_config(){
75 75
 	if (isMod || xtra_permission){
76 76
 
77 77
 	} else {
78
+		if (window.dev_flag){
79
+
80
+		} else {
81
+			
82
+		arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"sharedvideo")
83
+		}
78 84
 		arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"desktop")
79
-		// arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"sharedvideo")
85
+
80 86
 		
81 87
 		// arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"")
82 88
 	}

+ 8
- 0
rf/u/universals.js View File

@@ -2,7 +2,15 @@
2 2
 
3 3
 clog = console.log
4 4
 function nop(){}
5
+window.dev_flag = 0
6
+// window.dev_flag = 1
7
+
8
+if (window.dev_flag){
9
+
10
+} else {
5 11
 clog = nop
12
+	
13
+}
6 14
 // clog = nop
7 15
 
8 16
 

+ 7
- 4
rf/ui_msg/r2.css View File

@@ -320,6 +320,9 @@ div.subject.visible .participants-count{
320 320
 	--vnob:calc(var(--vheight) - (var(--vpad) * 2) );
321 321
 	/*--vnob:calc(var(--vwidth) - (var(--vpad) * 2) );*/
322 322
 	--vnob2:calc(var(--vwidth) - (var(--vnob) + (var(--vpad) * 2)  ) );
323
+
324
+	--atime: .2s;
325
+	/*--atime: 2.2s;*/
323 326
 	/*--vnob: 26px;*/
324 327
 	/*--vnob: .8em;*/
325 328
 }
@@ -358,8 +361,8 @@ div.subject.visible .participants-count{
358 361
   background-color: #555;
359 362
   /*background-color: #800;*/
360 363
   /*background-color: #f00;*/
361
-  -webkit-transition: .4s;
362
-  transition: .4s;
364
+  -webkit-transition: var(--atime,.4s);
365
+  transition: var(--atime,.4s);
363 366
 }
364 367
 
365 368
 .slider:before {
@@ -375,8 +378,8 @@ div.subject.visible .participants-count{
375 378
   bottom: var(--vpad);
376 379
   background-color: white;
377 380
   /*background-color: #000;*/
378
-  -webkit-transition: .4s;
379
-  transition: .4s;
381
+  -webkit-transition: var(--atime,.4s);
382
+  transition: var(--atime,.4s);
380 383
 }
381 384
 
382 385
 input:checked + .slider {

+ 25
- 4
rf/ytsv/y.js View File

@@ -179,6 +179,9 @@ function init_db_yt(){
179 179
 }
180 180
 
181 181
 glob_mx.cb.init_db.fn = init_db_yt
182
+if (glob_mx.flags.init_db && !msto.my_data.yt_dbg){
183
+	init_db_yt()
184
+}
182 185
 
183 186
 
184 187
 
@@ -199,7 +202,9 @@ what_is_loaded()
199 202
 function yt_left(o){
200 203
 	try {
201 204
 
202
-
205
+		// clog("yt_dbg yt_left",{init_db:glob_mx.flags.init_db,o})
206
+		clog("yt_dbg yt_left",glob_mx.flags.init_db ? 1 : 0,o)
207
+		return
203 208
 	// clog("yt_dbg yt_left0")
204 209
 	clog("yt_dbg yt_left",{that:this,args:[...arguments]})
205 210
 			msto.my_data.yt_dbg.yt_all_evnt.push(`L ${o.action.participant.id}`)
@@ -211,10 +216,19 @@ function yt_left(o){
211 216
 }
212 217
 function yt_join(o){
213 218
 	try {
219
+
220
+		// glob_mx.flags.init_db ? 1 : 0
221
+		clog("yt_dbg yt_join",glob_mx.flags.init_db ? 1 : 0,o)
222
+		// clog("yt_dbg yt_join",{init_db:glob_mx.flags.init_db,o})
223
+		return
214 224
 		var local = get_local() 
215 225
 		clog("yt_dbg J",o.action.participant,jc(o.action.participant))
216 226
 		if (o.action.participant.isFakeParticipant && o.action.participant.name == "YouTube"){
217
-			msto.my_data.yt_dbg.yt_evnt.push([`J ${o.action.participant.id}`],glob_dbg.svm.from)
227
+			msto.my_data.yt_dbg.yt_evnt.push([`J ${o.action.participant.id}`,glob_dbg.svm.from])
228
+			if (glob_dbg.svm.from == local.id){
229
+
230
+			}
231
+
218 232
 			clog("yt_dbg_ytv",o,glob_dbg.svm.from,local.id)
219 233
 		}
220 234
 
@@ -230,6 +244,11 @@ function yt_join(o){
230 244
 
231 245
 }
232 246
 
247
+
248
+
249
+
250
+
251
+
233 252
 function mute_audio_helper(){
234 253
 	try {
235 254
 	// setAudioMuted
@@ -240,11 +259,13 @@ function mute_audio_helper(){
240 259
 	}
241 260
 }
242 261
 
262
+if (window.dev_flag){
243 263
 
244 264
 
245
-// glob_mx.qxi_cb.PARTICIPANT_LEFT.yt_left = yt_left
265
+glob_mx.qxi_cb.PARTICIPANT_LEFT.yt_left = yt_left
246 266
 
247
-// glob_mx.qxi_cb.PARTICIPANT_JOINED.yt_join = yt_join
267
+glob_mx.qxi_cb.PARTICIPANT_JOINED.yt_join = yt_join
248 268
 
269
+} else {}
249 270
 
250 271
 mvyt_helper()

Loading…
Cancel
Save