jfinn před 4 roky
rodič
revize
7bfadebf5e
11 změnil soubory, kde provedl 757 přidání a 49 odebrání
  1. 1
    1
      i4/lobby.js
  2. 55
    32
      rf/i4m/m.css
  3. 28
    4
      rf/i4m/m.js
  4. 1
    1
      rf/i4n/m.js
  5. 2
    2
      rf/m/m_req.js
  6. 9
    2
      rf/m2/m2.js
  7. 7
    0
      rf/ovf_vid/n.js
  8. 127
    1
      rf/ui_msg/r.css
  9. 146
    1
      rf/ui_msg/r.html
  10. 210
    4
      rf/ui_msg/r.js
  11. 171
    1
      rf/ui_msg/r1.js

+ 1
- 1
i4/lobby.js Zobrazit soubor

@@ -166,10 +166,10 @@ var mtx_2 ={
166 166
 
167 167
 if (location.pathname.endsWith("/")){
168 168
 insert_lobby()
169
-ovf_vid()
170 169
 } else {
171 170
 not_lobby()
172 171
 ui_msg()
172
+ovf_vid()
173 173
 }
174 174
 svg_dev()
175 175
 

+ 55
- 32
rf/i4m/m.css Zobrazit soubor

@@ -99,12 +99,13 @@ html {
99 99
 .rooms_dir {
100 100
 	/*padding-top: auto;*/
101 101
 	/*top: 50%;*/
102
-	top: 50%;
103 102
 	vertical-align: middle;
104 103
 	/*display: inline-block;*/
105 104
 	/*transform: translate(0,-50%);*/
106 105
 	width: calc(100% - 150px);
106
+	/*top: 50px;*/
107 107
 	height: 400px;
108
+	/*bottom: 10px;*/
108 109
 	position: relative;
109 110
 	/*outline: 6px solid green;*/
110 111
 	margin: auto;
@@ -112,6 +113,9 @@ html {
112 113
 
113 114
 }
114 115
 
116
+
117
+/*.roo*/
118
+
115 119
 .rooms_dir_full{
116 120
 	/*position: relative;*/
117 121
 	/*display: inline;*/
@@ -139,37 +143,6 @@ html {
139 143
 	/*outline-offset: 0px;*/
140 144
 }
141 145
 
142
-.room_span_container {
143
-	/*top: 0;*/
144
-	/*bottom: 0;*/
145
-	/*scroll-margin: 20px;*/
146
-	height: 200px;
147
-	height: calc(200px * (256/159));
148
-	/*width: 20%;*/
149
-	background-size: cover;
150
-	/*margin: 20em;*/
151
-	margin: 15px;
152
-	/*border: 20px solid blue;*/
153
-	/*padding: 20px;*/
154
-	border-radius: 20px; 
155
-
156
-
157
-
158
-	width: 200px;
159
-
160
-	/*outline: 2px solid #ff0;*/
161
-	position: relative;
162
-	display: flex;
163
-	display: inline;
164
-	display: inline-block;
165
-	overflow: hidden;
166
-	/*scrol*/
167
-	/*style="--vurl:/ign/rf/artists/fisher.png; --vtitle:"Fisher";"*/
168
-	/*background-image: url(--vurlx);*/
169
-	background-image: var(--vurl);
170
-	/*background-image: url("/ign/rf/artists/fisher.png");*/
171
-	/*display: inline-flex;*/
172
-}
173 146
 
174 147
 .tile_title{
175 148
 	/*margin: auto 30px;*/
@@ -262,3 +235,53 @@ content:var(--vtitle);
262 235
 	transform: rotate(135deg);
263 236
 	/*transform: rotate(45);*/
264 237
 }
238
+
239
+.room_span_container {
240
+	/*top: 0;*/
241
+	/*bottom: 0;*/
242
+	/*scroll-margin: 20px;*/
243
+	height: 200px;
244
+	height: calc(200px * (256/159));
245
+	width: 200px;
246
+	/*width: 20%;*/
247
+	background-size: cover;
248
+	/*margin: 20em;*/
249
+	margin: 15px;
250
+	/*border: 20px solid blue;*/
251
+	/*padding: 20px;*/
252
+	border-radius: 20px; 
253
+
254
+
255
+
256
+
257
+	/*outline: 2px solid #ff0;*/
258
+	position: relative;
259
+	display: flex;
260
+	display: inline;
261
+	display: inline-block;
262
+	overflow: hidden;
263
+	/*scrol*/
264
+	/*style="--vurl:/ign/rf/artists/fisher.png; --vtitle:"Fisher";"*/
265
+	/*background-image: url(--vurlx);*/
266
+	background-image: var(--vurl);
267
+	/*background-image: url("/ign/rf/artists/fisher.png");*/
268
+	/*display: inline-flex;*/
269
+}
270
+.room_span_container {
271
+	/*height: calc(var(--innerHeight) - 40px);*/
272
+	/*height: calc(var(--innerHeight) - 240px);*/
273
+	/*width: calc((var(--innerHeight) - 240px) * (159/256));*/
274
+	/*width: calc((var(--innerHeight) - 40px) * (159/256));*/
275
+	height: calc(var(--vheight) - 40px);
276
+	width: calc((var(--vheight) - 40px) * (159/256));
277
+
278
+}
279
+
280
+
281
+.rooms_dir {
282
+	/*background-color: #fff8;*/
283
+	/*height: calc(var(--innerHeight) - 200px);*/
284
+	/*height: calc(var(--innerHeight) );*/
285
+	height: calc(var(--vheight) );
286
+
287
+}

+ 28
- 4
rf/i4m/m.js Zobrazit soubor

@@ -16,11 +16,13 @@ function html_js_handler_lobby(rsp) {
16 16
 function init_lobby(){
17 17
 	saftly_remove(".plugin_top.lobby_root")
18 18
 	var lroot = mod_templates_4.find(".lobby_root")
19
-	lr = lroot[0].outerHTML
19
+	lr = $(lroot[0].outerHTML)
20 20
 	clog("...",lr)
21 21
 	// welcome_page
22 22
 	// add_node
23 23
 	// add_node(n,`.vid_toptoolbar_hook`,"append")
24
+	// rooms_dir
25
+	// lr.find(".rooms_dir")[0].style.height = "600px"
24 26
 	add_node(lr,"#welcome_page","append")
25 27
 	add_tiles()
26 28
 	$(".arrow").click(arrow_click_cb)
@@ -220,7 +222,9 @@ function add_tiles(){
220 222
 		i+=1
221 223
 		clog("//",i)
222 224
 	}
223
-	set_width()
225
+	resize_tiles()
226
+	// set_width()
227
+
224 228
 }
225 229
 
226 230
 
@@ -246,7 +250,27 @@ function px_int(s){
246 250
 	ret = ret ? ret : 0
247 251
 	return ret
248 252
 }
253
+// CLIENT_RESIZED
254
+function resize_tiles(){
255
+	try {
256
+
257
+	var Height= window.innerHeight
258
+	var Width= window.innerWidth
259
+	var vheight0 = window.innerHeight - 230
260
+	var vheight = window.innerHeight - 230
261
+	vheight = Math.max(vheight,350)
262
+	vheight = Math.min(Height,vheight)
263
+
264
+	// if
265
+	$(".rooms_dir").css({
266
+		"--innerHeight":`${window.innerHeight}px`,
267
+		"--vheight":`${vheight}px`,
268
+		"--innerWidth":`${window.innerWidth}px`,
269
+	})
270
+	set_width()
249 271
 
272
+	}catch(err){}
273
+}
250 274
 /*
251 275
 $(document).ready(function(){
252 276
   var totalWidth = 0;
@@ -257,9 +281,9 @@ $(document).ready(function(){
257 281
 });
258 282
 */
259 283
 
284
+glob_mx.qxi_cb["CLIENT_RESIZED"] = window.glob_mx.qxi_cb["CLIENT_RESIZED"] || {}
260 285
 
261
-
262
-
286
+glob_mx.qxi_cb["CLIENT_RESIZED"].fn = resize_tiles
263 287
 
264 288
 
265 289
 clog(".....2")

+ 1
- 1
rf/i4n/m.js Zobrazit soubor

@@ -181,7 +181,7 @@ function init_i4n(){
181 181
 	saftly_remove(".plugin_top_v2.shared_vid_overlay")
182 182
 	saftly_remove(".plugin_top_v2.popup_root")
183 183
 	add_vid_overlay()
184
-	build_popup()
184
+	// build_popup()
185 185
 
186 186
 	// build_popup_av()
187 187
 	// show_popup()

+ 2
- 2
rf/m/m_req.js Zobrazit soubor

@@ -166,14 +166,14 @@ function run_qxi_cbs(key,o){
166 166
 		// clog("RUN_HOOK_CB??",key,glob_mx.hook_cb[key])
167 167
 
168 168
 	for ([k,v] of Object.entries(glob_mx.qxi_cb[key]|| {}) ) {
169
-		// clog("RUN_HOOK_CB:",k)
169
+		clog("RUN_HOOK_CB:",k,v)
170 170
 		v(o)
171 171
 	}
172 172
 }
173 173
 
174 174
 function qxi2(o){
175 175
 	if (qxi_skip.includes(o.action.type)){
176
-		return
176
+		// return
177 177
 	}
178 178
 	clog("qxi2",o.action.type,o)
179 179
 }

+ 9
- 2
rf/m2/m2.js Zobrazit soubor

@@ -2,13 +2,20 @@
2 2
 
3 3
 
4 4
 
5
-function dispatch_evnt(){
5
+function dispatch_evnt(off=0){
6 6
 	var v
7 7
 	for (v of $(".remote-video-menu-trigger")){
8 8
 		// onmouseenter
9 9
 		// var e = new MouseEvent("onmouseenter",{bubbles: true})
10 10
 		// var e = new MouseEvent("onmouseover",{bubbles: true})
11
-		var e = new MouseEvent("mouseover",{bubbles: true})
11
+		var e
12
+		if (off){
13
+		e = new MouseEvent("mouseout",{bubbles: true})
14
+
15
+		}else{
16
+		e = new MouseEvent("mouseover",{bubbles: true})
17
+
18
+		}
12 19
 		v.dispatchEvent(e)
13 20
 		// onmouseover
14 21
 		// clog([v])

+ 7
- 0
rf/ovf_vid/n.js Zobrazit soubor

@@ -7,3 +7,10 @@ function html_js_handler_ovf_vid(rsp) {
7 7
 }
8 8
 
9 9
 
10
+function rotate_xyz(){
11
+	// sorted_tiles
12
+	var n
13
+	n = sorted_tiles.pop()
14
+	sorted_tiles.unshift(n)
15
+}
16
+

+ 127
- 1
rf/ui_msg/r.css Zobrazit soubor

@@ -23,10 +23,33 @@
23 23
 
24 24
 .popup_icons .settings-button-container {
25 25
 	display: inline-block;
26
-	padding: 10px;
26
+	/*padding: 10px;*/
27 27
 	margin: 10px;
28
+	margin-bottom: 0px;
29
+
30
+}
31
+.popup_icons {
32
+
33
+	align-items: center;
34
+	position: relative;
35
+	display: inline-block;
36
+	/*display: inline;*/
37
+	/*display: block;*/
38
+	/*position: absolute;*/
39
+	position: relative;
40
+	margin: auto;
41
+	/*display: flex;*/
28 42
 }
43
+.popup_icons_container {
44
+	text-align: center;
45
+
29 46
 
47
+	margin: auto;
48
+	align-items: center;
49
+	position: relative;
50
+	align-items: center;
51
+
52
+}
30 53
 
31 54
 
32 55
 .ieven {
@@ -49,3 +72,106 @@
49 72
 	    /*background-color*/
50 73
 }
51 74
 
75
+
76
+
77
+.popup_item {
78
+
79
+}
80
+
81
+.ovmu_item >div:hover {
82
+	/*background-color: #*/
83
+	    /*background-color:#313D52;*/
84
+	    background-color:#446;
85
+	    color:#eee;
86
+}
87
+
88
+.overflow-menu .overflow-menu-item.ovmu_item {
89
+	background-color: unset !important;
90
+	color: unset !important;
91
+}
92
+
93
+.ji_mic_on > svg:first-child{
94
+		/*fill:#444 !important; */
95
+		fill:#999 !important; 
96
+	/*stroke: #444 !important;*/
97
+}
98
+
99
+.x_svg{
100
+	left:10px;
101
+	top :-5px;
102
+	/*right:0;*/
103
+	fill:#fff !important; 
104
+	/*stroke: #f00 !important;*/
105
+	position: absolute;
106
+}
107
+
108
+.popup_item_req .popupmenu__link{
109
+	/*font-size: 3em !important;*/
110
+	font-size: 12pt !important;
111
+
112
+}
113
+
114
+.popup_item_req .popupmenu__text:hover{
115
+	/*font-size: 3em !important;*/
116
+	color: #fff;
117
+	/*font-size: 12pt !important;*/
118
+	
119
+}
120
+
121
+.popup_item_req .popupmenu__text{
122
+	/*font-size: 3em !important;*/
123
+	/*color: #fff;*/
124
+	pointer-events:unset !important;
125
+	z-index: 200 !important;
126
+	/*font-size: 12pt !important;*/
127
+	
128
+}
129
+.popup_item_req .popupmenu__link{
130
+	pointer-events:unset !important;
131
+}
132
+
133
+/*pointer-events:none*/
134
+.plugin_top_v3 > .popup_body{
135
+	width: 600px;
136
+
137
+}
138
+.plugin_top_v3 > .popup_body .popup_txt{
139
+	font-size: 14pt;
140
+}
141
+
142
+
143
+
144
+
145
+
146
+
147
+
148
+/*
149
+.display-name-on-black:not(:hover) video {
150
+    opacity: 1 !important;
151
+}
152
+.display-name-on-black video {
153
+    opacity: .2;
154
+    visibility: visible;
155
+*/
156
+
157
+/*
158
+.display-avatar-with-name video, .display-name-on-black .avatar-container {
159
+    visibility: hidden;
160
+}
161
+*/
162
+
163
+/*.display-name-on-black .avatar-container {*/
164
+	/*
165
+.display-avatar-only .avatar-container {
166
+    visibility: hidden !important;
167
+    background-color: red !important;
168
+}
169
+	*/
170
+/*.display-avatar-with-name video{*/
171
+/*
172
+.display-avatar-only video{
173
+    opacity: 1 !important;
174
+    z-index: 200;
175
+    visibility: visible !important;
176
+}
177
+*/

+ 146
- 1
rf/ui_msg/r.html Zobrazit soubor

@@ -38,9 +38,154 @@
38 38
 	POPUP TEXT2
39 39
 	
40 40
 </div>
41
-<div class="popup_icons"></div>
41
+<div class="popup_icons_container">
42
+	
43
+<span class="popup_icons"></span>
44
+</div>
45
+
46
+</div>
47
+</span>
48
+
49
+<li class="popupmenu__item popup_item popup_item_t"><a class="popupmenu__link mutelink disabled" id="mutelink_0f26870f"><span class="popupmenu__icon"><div class="jitsi-icon ">
50
+
51
+</div></span><span class="popupmenu__text">Muted</span></a></li>
52
+
53
+<li class="popupmenu__item popup_item popup_item_req2"><a class="popupmenu__link mutelink disabled" id="mutelink_0f26870f">
54
+
55
+	<span class="popupmenu__text">request on</span>
56
+	<span class="popupmenu__icon"><div class="jitsi-icon ji_mic_on"></div></span></a>
57
+	</li>
58
+
59
+
60
+
61
+
62
+
63
+
64
+
65
+
66
+
67
+
68
+<li class="popupmenu__item popup_item popup_item_req">
69
+	<!-- <a class="popupmenu__link mutelink disabled" id="mutelink_0f26870f"> -->
70
+request
71
+	<span class="popupmenu__text act_cls_vid_off av_io_single av_io av_io_vid av_io_on"> vid</span>
72
+	<span class="popupmenu__text act_cls_audio_off av_io_single av_io av_io_mic av_io_on"> audio</span>
73
+	<span class="popupmenu__text act_cls_av_off av_io_single av_io av_io_av av_io_on"> av</span>
74
+	on
75
+	<span class="popupmenu__icon"><div class="jitsi-icon ji_mic_on"></div></span>
76
+<!-- </a> -->
77
+	</li>
78
+<li class="popupmenu__item popup_item popup_item_req">
79
+	<!-- <a class="popupmenu__link mutelink disabled" id="mutelink_0f26870f"> -->
80
+mute 
81
+	<span class="popupmenu__text act_cls_vid_off av_io_single av_io av_io_vid av_io_off"> vid</span>
82
+	<span class="popupmenu__text act_cls_audio_off av_io_single av_io av_io_mic av_io_off"> audio</span>
83
+	<span class="popupmenu__text act_cls_av_off av_io_single av_io av_io_av av_io_off"> av</span>
84
+	<span class="popupmenu__icon"><div class="jitsi-icon ji_mic_on"></div></span>
85
+<!-- </a> -->
86
+	</li>
87
+
88
+
89
+<!-- av_io_on -->
90
+<!-- av_io_off -->
91
+<!-- av_io_mic -->
92
+<!-- av_io_vid -->
93
+<!-- av_io_av -->
94
+<!-- av_io_all -->
95
+<!-- av_io_single -->
96
+<!-- 
97
+av_io_on
98
+av_io_off
99
+av_io_mic
100
+av_io_vid
101
+av_io_av
102
+av_io_all
103
+av_io_single
104
+
105
+ -->
106
+
107
+
108
+
109
+
110
+
111
+
112
+
113
+
114
+
115
+<li aria-label="Edit your profile" class="overflow-menu-item "><span class="overflow-menu-item-icon"><div class="avatar   " style="background-color: rgba(234, 255, 128, 0.4); font-size: 12px; height: 24px; width: 24px;">
116
+
117
+
118
+</div></span><span class="profile-text">z2</span></li>
119
+
42 120
 
121
+
122
+
123
+
124
+
125
+<li aria-label="Toggle settings" class="overflow-menu-item ovmu otb ovmu_item">
126
+
127
+	<div class="av_io act_cls_mic_off_all av_io_all av_io_mic av_io_off">
128
+<span>Mute all<span class="ji2_mic_off"></span></span>
129
+		<span class="overflow-menu-item-icon  "><div class="jitsi-icon ji_mic_off"></div></span>
130
+</div>
131
+
132
+<div class="av_io act_cls_mic_off_all av_io_all av_io_vid av_io_off">
133
+<span>Mute all</span><span class="ji2_vid_off"></span>
134
+	<span class="overflow-menu-item-icon  "><div class="jitsi-icon ji_vid_off"></div></span>
135
+</div>
136
+
137
+</li>
138
+<li aria-label="Toggle settings" class="overflow-menu-item ovmu otb ovmu_item">
139
+
140
+	<div class="av_io act_cls_mic_on_all av_io_all av_io_mic av_io_on">
141
+<span>request on<span class="ji2_mic_off"></span></span>
142
+		<span class="overflow-menu-item-icon  "><div class="jitsi-icon ji_mic_on"></div></span>
143
+</div>
144
+
145
+<div class="av_io act_cls_vid_on_all av_io_all av_io_vid av_io_on">
146
+<span>request on</span><span class="ji2_vid_off"></span>
147
+	<span class="overflow-menu-item-icon  "><div class="jitsi-icon ji_vid_on"></div></span>
43 148
 </div>
44 149
 
150
+</li>
151
+
152
+
153
+<li aria-label="Toggle settings" class="overflow-menu-item ovmu otb ovmu_item2"><div><span class="overflow-menu-item-icon  "><div class="jitsi-icon ji_mic_off">
154
+</div></span><span>Mute all participants<span class="ji2_mic_off"></span></span></div><div><span class="overflow-menu-item-icon  "><div class="jitsi-icon ji_vid_off">
155
+</div></span><span>Mute all cameras</span><span class="ji2_vid_off"></span></div></li>
156
+
157
+
158
+
159
+<li aria-label="Toggle settings" class="overflow-menu-item ovmu otb ovmu_item2"><div><span class="overflow-menu-item-icon  "><div class="jitsi-icon ">
160
+</div></span><span>Mute all participants</span></div><div><span class="overflow-menu-item-icon  "><div class="jitsi-icon ">
161
+</div></span><span>Mute all cameras</span></div></li>
162
+
163
+
164
+
165
+
166
+<span>Settings2</span>
167
+
168
+
169
+
170
+
171
+<li aria-label="Toggle settings" class="overflow-menu-item ovmu otb"><div><span class="overflow-menu-item-icon  "><div class="jitsi-icon "><svg height="24" width="24" viewBox="0 0 32 32"><path d="M16 20.688c2.563 0 4.688-2.125 4.688-4.688S18.563 11.312 16 11.312 11.312 13.437 11.312 16s2.125 4.688 4.688 4.688zm9.938-3.375l2.813 2.188c.25.188.313.563.125.875l-2.688 4.625c-.188.313-.5.375-.813.25l-3.313-1.313c-.688.5-1.438 1-2.25 1.313l-.5 3.5c-.063.313-.313.563-.625.563h-5.375c-.313 0-.563-.25-.625-.563l-.5-3.5a8.148 8.148 0 01-2.25-1.313l-3.313 1.313c-.313.125-.625.063-.813-.25l-2.688-4.625c-.188-.313-.125-.688.125-.875l2.813-2.188c-.063-.438-.063-.875-.063-1.313s0-.875.063-1.313l-2.813-2.188c-.25-.188-.313-.563-.125-.875l2.688-4.625c.188-.313.5-.375.813-.25l3.313 1.313c.688-.5 1.438-1 2.25-1.313l.5-3.5c.063-.313.313-.563.625-.563h5.375c.313 0 .563.25.625.563l.5 3.5c.813.313 1.563.75 2.25 1.313l3.313-1.313c.313-.125.625-.063.813.25l2.688 4.625c.188.313.125.688-.125.875l-2.813 2.188c.063.438.063.875.063 1.313s0 .875-.063 1.313z"></path></svg></div></span><span>Settings</span></div></li>
172
+
173
+
174
+
175
+<li aria-label="Edit your profile" class="overflow-menu-item "><span class="overflow-menu-item-icon"><div class="avatar   " style="background-color: rgba(234, 255, 128, 0.4); font-size: 12px; height: 24px; width: 24px;"><svg class="avatar-svg" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><foreignObject height="100%" width="100%"><span class="avatar-foreign">Z2</span></foreignObject></svg></div></span><span class="profile-text">z2</span></li>
176
+
177
+
178
+<li class="popupmenu__item"><a class="popupmenu__link mutelink disabled" id="mutelink_0f26870f"><span class="popupmenu__icon"><div class="jitsi-icon ">
179
+	<svg height="24" width="24" viewBox="0 0 32 32"><path d="M5.688 4l22.313 22.313-1.688 1.688-5.563-5.563c-1 .625-2.25 1-3.438 1.188v4.375h-2.625v-4.375c-4.375-.625-8-4.375-8-8.938h2.25c0 4 3.375 6.75 7.063 6.75 1.063 0 2.125-.25 3.063-.688l-2.188-2.188c-.25.063-.563.125-.875.125-2.188 0-4-1.813-4-4v-1l-8-8zM20 14.875l-8-7.938v-.25c0-2.188 1.813-4 4-4s4 1.813 4 4v8.188zm5.313-.187a8.824 8.824 0 01-1.188 4.375L22.5 17.375c.375-.813.563-1.688.563-2.688h2.25z"></path></svg>
180
+</div></span><span class="popupmenu__text">Muted</span></a></li>
181
+
182
+
183
+
184
+<li class="popupmenu__item"><a class="popupmenu__link mutelink" id="mutelink_0f26870f"><span class="popupmenu__icon"><div class="jitsi-icon ">
185
+	<svg fill="none" height="24" width="24" viewBox="0 0 24 24"><g clip-path="url(#mute-everyone-else_svg__clip0)" fill-rule="evenodd" clip-rule="evenodd" fill="#fff"><path d="M6 13.078V15c0 1.4.959 2.576 2.256 2.907A.756.756 0 008.25 18v1.438A4.501 4.501 0 014.5 15 .75.75 0 003 15c0 3.06 2.29 5.584 5.25 5.954v.796a.75.75 0 001.5 0v-.796a5.97 5.97 0 002.92-1.207l2.529 2.53a.762.762 0 101.078-1.078l-2.53-2.53.009-.01-1.073-1.073-.008.011-1.084-1.084.007-.012-1.141-1.141-.004.015L7.5 12.422v-.019l-1.5-1.5v.019L2.801 7.723a.762.762 0 10-1.078 1.078L6 13.078zm1.5 1.5V15a1.5 1.5 0 001.875 1.453L7.5 14.578zm3.013 3.013a2.984 2.984 0 01-.769.316c.004.03.006.061.006.093v1.438a4.476 4.476 0 001.847-.763l-1.084-1.084zM12 14.747l-1.5-1.5V10.5a1.5 1.5 0 00-2.982-.235l-1.17-1.17A3 3 0 0112 10.5v4.247zm1.362 1.362l1.184 1.184A5.983 5.983 0 0015 15a.75.75 0 00-1.5 0c0 .383-.048.754-.138 1.11zM16 4.719V6a2 2 0 001.504 1.938A.508.508 0 0017.5 8v.959A3 3 0 0115 6a.5.5 0 00-1 0 4 4 0 003.5 3.969v.531a.5.5 0 001 0v-.531a3.98 3.98 0 001.946-.804l1.686 1.686a.508.508 0 00.72-.719l-1.687-1.686.006-.007-.716-.715-.005.007-.723-.722.005-.008-.76-.761-.004.01L17 4.28V4.27l-1-1v.012L13.868 1.15a.508.508 0 10-.72.719L16 4.718zm1 1V6a1 1 0 001.25.969L17 5.719zm2.009 2.008c-.159.093-.33.164-.513.211.003.02.004.041.004.062v.959a2.984 2.984 0 001.232-.509l-.723-.723zM20 5.831l-1-1V3a1 1 0 00-1.988-.157l-.78-.78A2 2 0 0120 3v2.831zm.908.908l.79.79A3.99 3.99 0 0022 6a.5.5 0 00-1 0c0 .255-.032.503-.092.74z"></path></g><defs><clipPath id="mute-everyone-else_svg__clip0"><path fill="#fff" d="M0 0h24v24H0z"></path></clipPath></defs></svg>
186
+</div></span><span class="popupmenu__text">Mute everyone else</span></a></li>
187
+
188
+
189
+
45 190
 
46 191
 </span>

+ 210
- 4
rf/ui_msg/r.js Zobrazit soubor

@@ -6,7 +6,10 @@ function html_js_handler_ui_msg(rsp) {
6 6
 	mod_templates_ui_msg = $(`<span>${rsp}</span>`)[0].outerHTML
7 7
 	clog("html_js_handler_lobby2")
8 8
 	// init_lobby()
9
-	init_ui_msg()
9
+	// init_ui_msg()
10
+	if (window.refresh_overflow_menu){
11
+		refresh_overflow_menu()
12
+	}
10 13
 	// clog("html_js_handler_lobby3")
11 14
 	// init_api6()
12 15
 }
@@ -18,7 +21,8 @@ glob_mx.svg = window.glob_mx.svg || {}
18 21
 // plugin_top_v3
19 22
 // plugin_top_v3 popup_root
20 23
 // plugin_top_cls plugin_icon_template_v2
21
-function init_ui_msg(url,name){
24
+function init_ui_msg(req_dev = "av_on"){
25
+	// </span>
22 26
 	// if (!glob_mx.svg["close.svg"] || !(mod_templates_ui_msg.find("#tmplt").length) ){
23 27
 	if (!glob_mx.svg["close.svg"] || !(mod_templates_ui_msg.length) ){
24 28
 		return
@@ -26,14 +30,38 @@ function init_ui_msg(url,name){
26 30
 	var n,svg,icon_template
27 31
 
28 32
 
33
+
29 34
 	saftly_remove(".plugin_top_v3.popup_root")
30 35
 	saftly_remove(".plugin_icon_template_v2")
31 36
 	saftly_remove(".plugin_icon_template_v3")
32
-	return
37
+	// return
38
+	var mic_status  = $(`.toolbox-content [aria-label="Toggle mute audio"] .toolbox-icon:not(.toggled) .jitsi-icon `).length
39
+	var vid_status = $(`.toolbox-content [aria-label="Toggle mute video"] .toolbox-icon:not(".toggled") .jitsi-icon `).length
40
+	var txt_msg
41
+	txt_msg = "DFLT"
42
+	clog("rjs zzz",!mic_status && !vid_status,mic_status,vid_status)
43
+	if (req_dev == "av_on"){
44
+		if (mic_status && vid_status){return}
45
+		mic_status ? req_dev="vid_on" : 0
46
+		vid_status ? req_dev="mic_on" : 0
47
+		txt_msg = "microphone and camera"
48
+
49
+
50
+	} 
51
+	if (req_dev == "mic_on"){
52
+		if (mic_status){return}
53
+		txt_msg = "microphone"
54
+	} 
55
+	if (req_dev == "vid_on"){
56
+		if (vid_status){return}
57
+		txt_msg = "camera"
33 58
 
59
+	}
34 60
 	// svg = $(glob_mx.svg["close.svg"]).find("svg")
35 61
 	svg = $(`<span>${glob_mx.svg["close.svg"]}</span>`).find("svg")
36 62
 	svg.addClass("close_button")
63
+	svg.click(close_popup)
64
+	// close_popup
37 65
 	// svg = $(`<span>$(glob_mx.svg["close.svg"])</span>`).filter("svg")
38 66
 
39 67
 	var jmod_templates_ui_msg = $(mod_templates_ui_msg)
@@ -41,6 +69,36 @@ function init_ui_msg(url,name){
41 69
 	n.find(".popup_body").prepend(svg)
42 70
 	// n.find(".popup_icons").append(svg)
43 71
 
72
+		if (req_dev == "av_on"){
73
+		svg = $(`<span>${glob_mx.svg["mic-camera-combined.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
74
+		icon_template = $(jmod_templates_ui_msg.find(".settings-button-container")[0].outerHTML)
75
+		icon_template.find(".jitsi-icon").append(svg)
76
+		n.find(".popup_icons").append(icon_template)
77
+		n.find(".popup_icons").append("<br>")
78
+		icon_template.click(set_av_on)
79
+		icon_template.addClass("av_on_btn av_btn")
80
+	}
81
+
82
+	if (req_dev == "mic_on" || req_dev == "av_on2"){
83
+		svg = $(`<span>${glob_mx.svg["mic-disabled.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
84
+		icon_template = $(jmod_templates_ui_msg.find(".settings-button-container")[0].outerHTML)
85
+		icon_template.find(".jitsi-icon").append(svg)
86
+		n.find(".popup_icons").append(icon_template)
87
+		icon_template.click(set_mic_on)
88
+		icon_template.addClass("mic_on_btn av_btn")
89
+	}
90
+	if (req_dev == "vid_on" || req_dev == "av_on2"){
91
+		svg = $(`<span>${glob_mx.svg["camera-disabled.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
92
+		icon_template = $(jmod_templates_ui_msg.find(".settings-button-container")[0].outerHTML)
93
+		icon_template.find(".jitsi-icon").append(svg)
94
+		n.find(".popup_icons").append(icon_template)
95
+		icon_template.click(set_vid_on)
96
+		icon_template.addClass("vid_on_btn av_btn")
97
+	}
98
+
99
+
100
+			/*
101
+
44 102
 	svg = $(`<span>${glob_mx.svg["camera.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
45 103
 	icon_template = $(jmod_templates_ui_msg.find(".settings-button-container")[0].outerHTML)
46 104
 	icon_template.find(".jitsi-icon").append(svg)
@@ -68,6 +126,13 @@ function init_ui_msg(url,name){
68 126
 	n.find(".popup_icons").append(icon_template)
69 127
 	n.find(".popup_icons .settings-button-container:even").addClass("ieven")
70 128
 
129
+	// */
130
+
131
+	// $(`.toolbox-content [aria-label="Toggle mute video"] .toolbox-icon:not(".toggled") .jitsi-icon `).length
132
+	// clog("RJS",n.find(".popup_txt").text("z"))
133
+	// clog("RJS",n.find(".popup_txt").text(txt_msg))
134
+	clog("RJS",n.find(".popup_txt").text(`moderator requests you turn your ${txt_msg} on.`))
135
+
71 136
 	// mic-camera-combined
72 137
 
73 138
 	// add_node(svg,n.find(".popup_body"),"append")
@@ -110,6 +175,7 @@ var mtx ={
110 175
 		// mod_path
111 176
 	}
112 177
 	add_module(mtx )
178
+	// init_ui_msg()
113 179
 
114 180
 }
115 181
 
@@ -127,7 +193,7 @@ function svg_rld_cb(rsp,status,xhr){
127 193
 	} else {
128 194
 	glob_mx.svg[xhr.file.name] = rsp
129 195
 	}
130
-	init_ui_msg()
196
+	// init_ui_msg()
131 197
 	// window[this.success_js](rsp,status,xhr)
132 198
 	// window[xhr.file.success_js](rsp,status,xhr)
133 199
 }
@@ -191,8 +257,45 @@ function vid_toggle(){
191 257
 
192 258
 
193 259
 
260
+function set_av_on(){
261
+	close_popup({that:this})
262
+	set_vid_on()
263
+	set_mic_on()
264
+
265
+}
266
+function set_av_off(){
267
+	set_vid_off()
268
+	set_mic_off()
269
+
270
+}
271
+
272
+function close_popup(e,o){
273
+	var that,j,z
274
+	z = "DFLT"
275
+	if (e.that){
276
+		that = e.that
277
+		z = "e.that"
278
+	} else {
279
+		z = "else"
280
+		that = this
281
+	}
282
+	 if (that == window || !that) {
283
+		z = "!win e.that"
284
+		return
285
+
286
+	}
287
+
288
+	j = $(that)
289
+	j.parents(".plugin_top_v3").remove()
290
+
291
+	clog("close_popup",z,"~~~~~~~",e,o,j)
292
+
293
+	// av_btn
294
+}
295
+
194 296
 function set_vid_on(){
195 297
 	var v
298
+	close_popup({that:this})
196 299
 	v = $(`.toolbox-content [aria-label="Toggle mute video"] .toolbox-icon.toggled .jitsi-icon `)[0]
197 300
 	clog("...v",v)
198 301
 	if (v) {
@@ -219,6 +322,7 @@ function set_mic_off(){
219 322
 }
220 323
 
221 324
 function set_mic_on(){
325
+	close_popup({that:this})
222 326
 	var v
223 327
 	v = $(`.toolbox-content [aria-label="Toggle mute audio"] .toolbox-icon.toggled .jitsi-icon `)[0]
224 328
 	clog("...v",v)
@@ -247,5 +351,107 @@ function toggle_vid(){
247 351
 	
248 352
 }
249 353
 
354
+function toggle_overflow_menu(){
355
+	var v
356
+
357
+	v =  $(".button-group-right > .toolbox-button-wth-dialog:last .toolbox-button")[0]
358
+	clog("...v",v)
359
+	if (v) {
360
+		v.dispatchEvent(new MouseEvent("click",{bubbles: true}))
361
+	}
362
+	
363
+}
364
+
365
+function is_msg_to_me(to){
366
+	var local = get_local()
367
+	if (to == "all" || local.id == to){
368
+		return true
369
+	}
370
+
371
+
372
+}
373
+function req_av_io(o){
374
+	var payload = o.parsed.payload
375
+	clog("....>",o)
376
+	if (payload && !is_msg_to_me(payload.to)){
377
+		// clog("Not for me")
378
+		return 
379
+	}
380
+
381
+	switch(payload.act){
382
+	// switch(payload.action){
383
+		case "force_vid_on":
384
+		set_vid_on()
385
+		break;
386
+		case "vid_on":
387
+		// set_vid_on()
388
+		init_ui_msg("vid_on")
389
+		clog("~~","vid_on",o)
390
+		break;
391
+		case "vid_off":
392
+		set_vid_off()
393
+		clog("~~","vid_off",o)
394
+		break;
395
+		case "force_mic_on":
396
+		set_mic_on()
397
+		break;
398
+
399
+		case "mic_on":
400
+		init_ui_msg("mic_on")
401
+		// set_mic_on()
402
+		clog("~~","mic_on",o)
403
+		break;
404
+		case "mic_off":
405
+		set_mic_off()
406
+		clog("~~","mic_off",o)
407
+		break;
408
+		case "force_av_on":
409
+		set_vid_on()
410
+		set_mic_on()
411
+		break;
412
+		case "av_on":
413
+		// set_vid_on()
414
+		// set_mic_on()
415
+		init_ui_msg("av_on")
416
+		clog("~~","av_on",o)
417
+		break;
418
+		case "av_off":
419
+		set_vid_off()
420
+		set_mic_off()
421
+		clog("~~","av_off",o)
422
+		break;
423
+		default:
424
+		clog("~~","DFLT",o)
425
+
426
+		// break;
427
+
428
+
429
+	}
430
+
431
+	clog("req_av_io",{that:this,args:[...arguments]})
432
+}
433
+
434
+
435
+
436
+
437
+
438
+
439
+function req_av_send(o){
440
+
441
+            tmsgx({
442
+                "type":"event",
443
+                "payload":o,
444
+                etype:"req_av_io"
445
+            },"code")
446
+}
447
+// req_av_send({act:"av_off","to":"all"})
448
+glob_mx.event_handlers.av2 = {
449
+    fn:req_av_io,
450
+    // fn:nop,
451
+    // m:{etype:"timer_start"},
452
+    m:{etype:"req_av_io"},
453
+}
454
+
455
+// $(".button-group-right > .toolbox-button-wth-dialog:last")
250 456
 
251 457
 // plugin_top_cls plugin_icon_template_v2

+ 171
- 1
rf/ui_msg/r1.js Zobrazit soubor

@@ -5,10 +5,44 @@ glob_mx.qxi_cb.SET_OVERFLOW_MENU_VISIBLE = glob_mx.qxi_cb.SET_OVERFLOW_MENU_VISI
5 5
 
6 6
 function rvm_to(a){
7 7
 	clog("rvm_to RemoteVideoMenu...",a, $(".popover"))
8
+	// popup_item
9
+	var n
10
+
11
+	var svg,icon_template
12
+
13
+	var jmod_templates_ui_msg = $(mod_templates_ui_msg)
14
+	// n = jmod_templates_ui_msg.find(".popup_item_t")
15
+	// n = jmod_templates_ui_msg.find(".popup_item")
16
+	n = jmod_templates_ui_msg.find(".popup_item_req")
17
+	// ji_mic_on
18
+	/*
19
+
20
+	// svg = $(`<span>${glob_mx.svg["mic-disabled.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
21
+	svg = $(`<span>${glob_mx.svg["mic-camera-combined.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
22
+	// svg[0].setAttribute("width",16)                           
23
+	// svg[0].setAttribute("height",16)  
24
+	n.find(".jitsi-icon").append(svg)
25
+
26
+	svg = $(`<span>${glob_mx.svg["close.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
27
+	svg[0].setAttribute("width",16)                           
28
+	svg[0].setAttribute("height",16) 
29
+	svg.addClass("x_svg") 
30
+	n.find(".jitsi-icon").append(svg)
31
+	*/
32
+
33
+	// ji_mic_on
34
+	// popup_item
35
+	// popupmenu
36
+	n.find(".av_io").click(evnt_av_io)
37
+	$(".popupmenu").prepend(n)
38
+
39
+
40
+
8 41
 
9 42
 }
10 43
 
11 44
 glob_mx.hook_cb.RemoteVideoMenu.fn = function(o,a2){
45
+	if (!window.iammod){return}
12 46
 	if ($(".popover").length){
13 47
 		return
14 48
 	}
@@ -21,16 +55,152 @@ glob_mx.hook_cb.RemoteVideoMenu.fn = function(o,a2){
21 55
 
22 56
 // qxi_cb
23 57
 
58
+function somv_to(a){
59
+	var n
60
+	// clog("rvm_to RemoteVideoMenu...",a, $(".popover"))
61
+	var svg,icon_template
62
+	var jmod_templates_ui_msg = $(mod_templates_ui_msg)
63
+	n = jmod_templates_ui_msg.find(".ovmu_item")
64
+	// n.find(".popup_body").prepend(svg)
65
+	// n.find(".popup_body").prepend(svg)
66
+	// ji_mic_off
67
+	// ji_vid_off
68
+
69
+	// icon_template = $(jmod_templates_ui_msg.find(".settings-button-container")[0].outerHTML)
70
+	// icon_template.find(".jitsi-icon").append(svg)
71
+	svg = $(`<span>${glob_mx.svg["camera-disabled.svg"]}</span>`).find("svg").addClass("icon_svg")   
72
+	clog("svg...",svg,svg[0].width)
73
+	// svg[0].width =24    
74
+	// svg[0].height =24
75
+	svg[0].setAttribute("width",20)                           
76
+	svg[0].setAttribute("height",20)                           
77
+	n.find(".jitsi-icon.ji_vid_off").append(svg)
78
+	// n.find(".ji2_vid_off").append(svg)
79
+	svg = $(`<span>${glob_mx.svg["mic-disabled.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
80
+	svg[0].setAttribute("width",20)                           
81
+	svg[0].setAttribute("height",20)  
82
+	n.find(".jitsi-icon.ji_mic_off").append(svg)
83
+
84
+
24 85
 
86
+	svg = $(`<span>${glob_mx.svg["microphone.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
87
+	svg[0].setAttribute("width",20)                           
88
+	svg[0].setAttribute("height",20)  
89
+	n.find(".jitsi-icon.ji_mic_on").append(svg)
90
+
91
+	svg = $(`<span>${glob_mx.svg["camera.svg"]}</span>`).find("svg").addClass("icon_svg")   
92
+	clog("svg...",svg,svg[0].width)
93
+	// svg[0].width =24    
94
+	// svg[0].height =24
95
+	svg[0].setAttribute("width",20)                           
96
+	svg[0].setAttribute("height",20)                           
97
+	n.find(".jitsi-icon.ji_vid_on").append(svg)
98
+	// n.find(".popup_icons").append(icon_template)
99
+
100
+
101
+
102
+	n.find(".av_io").click(evnt_av_io)
103
+	$(".overflow-menu").prepend(n)
104
+
105
+	disp(glob_react.toolbox.setToolbarHovered(!!1))
106
+
107
+	// $(".overflow-menu").append(n)
108
+
109
+
110
+}
25 111
 glob_mx.qxi_cb["SET_OVERFLOW_MENU_VISIBLE"].fn = function (o,a2){
112
+	if (!window.iammod){return}
113
+	// somv_to()
114
+	setTimeout(somv_to,0,"A")
26 115
 	clog("SET_OVERFLOW_MENU_VISIBLE.",o,$(".overflow-menu"))
116
+	/*
117
+	// ovmu_item
118
+	var jmod_templates_ui_msg = $(mod_templates_ui_msg)
119
+	n = jmod_templates_ui_msg.find(".ovmu_item")
120
+	// n.find(".popup_body").prepend(svg)
121
+	// n.find(".popup_body").prepend(svg)
122
+	$(".overflow-menu").append(n)
123
+	*/
124
+
125
+
27 126
 }
28 127
 
29 128
 // qxi_cb
30 129
 
130
+/*
131
+av_io_on
132
+av_io_off
133
+av_io_mic
134
+av_io_vid
135
+av_io_av
136
+av_io_all
137
+av_io_single
138
+
139
+*/
140
+
141
+function evnt_av_io(a,a2,a3){
142
+	var o = {
143
+		act:""
144
+	}
145
+	// if 
146
+	var n,j,i,k
147
+	var av_io_on,av_type,av_all_single,av_all
148
+	// var av_all,av_single
149
+
150
+	j = $(this)
151
+
152
+	av_io_on = j.hasClass("av_io_on")
153
+	av_all = j.hasClass("av_io_all")
154
+	if (j.hasClass("av_io_mic")){
155
+		av_type = "mic"
156
+		// av_type = "av"
157
+	} else if (j.hasClass("av_io_vid")){
158
+		av_type = "vid"
159
+
160
+	} else if (j.hasClass("av_io_av")){
161
+		av_type = "av"
162
+
163
+	}
164
+	o.act += av_type + "_"
165
+	if (av_io_on){
166
+		o.act += "on"
167
+	} else {
168
+		o.act += "off"
169
+
170
+	}
171
+	if (av_all){
172
+		o.to = "all"
173
+	} else {
174
+		// participant_07b5a03f
175
+		j.parents(".small_vid")[0]
176
+		// clog("ELS",j.parents(".small_vid")[0].id.split("_").pop())
177
+		// o.id = j.parents(".small_vid")[0].id.split("_").pop()
178
+		o.to = j.parents(".small_vid")[0].id.split("_").pop()
179
+		// o.to = "abc"
180
+	}
181
+	req_av_send(o)
182
+
183
+	clog("evnt_av_io,,,,",o,{av_io_on,av_type,av_all,vid:j.parents(".small_vid")})
184
+	clog("evnt_av_io",a,a2,a3,this)
185
+}
186
+
187
+function refresh_overflow_menu(){
188
+	toggle_overflow_menu()
189
+	setTimeout(toggle_overflow_menu,100)
190
+	dispatch_evnt(1)
191
+	setTimeout(dispatch_evnt(),50)
192
+
193
+}
194
+
195
+
31 196
 
32 197
 clog("R1")
33 198
 // $(".popover")
34
-dispatch_evnt()
199
+// dispatch_evnt()
200
+// refresh_overflow_menu()
201
+// toggle_overflow_menu()
202
+// toggle_overflow_menu()
203
+// toggle_overflow_menu()
204
+
35 205
 
36 206
 

Načítá se…
Zrušit
Uložit