浏览代码

ign4

master
jfinn 4 年前
父节点
当前提交
fa9501355f
共有 11 个文件被更改,包括 516 次插入8 次删除
  1. 3
    1
      i4/lobby.js
  2. 43
    1
      rf/filmstrip_mod/m.js
  3. 1
    0
      rf/i4n/m.html
  4. 77
    0
      rf/m/m_api_v2.js
  5. 14
    1
      rf/m/m_req.js
  6. 12
    0
      rf/m/m_utils.js
  7. 2
    0
      rf/svg_dev/m.js
  8. 51
    1
      rf/ui_msg/r.css
  9. 43
    0
      rf/ui_msg/r.html
  10. 234
    4
      rf/ui_msg/r.js
  11. 36
    0
      rf/ui_msg/r1.js

+ 3
- 1
i4/lobby.js 查看文件

@@ -116,7 +116,9 @@ var mtx_2 ={
116 116
 	// js:["ign/m/timer/m.js","ign/m/timer/m0.js"],
117 117
 	js:[
118 118
 	// `${mod_path}m0.js`,
119
-	`${mod_path}${n}.js`,],
119
+	`${mod_path}${n}.js`,
120
+	`${mod_path}${n}1.js`,
121
+	],
120 122
 	css:[`${mod_path}${n}.css`],
121 123
 	html:[
122 124
 	{url:`${mod_path}${n}.html`,diffH:get_cui_html,success:html_rld_cb4,success_js:"html_js_handler_ui_msg"},

+ 43
- 1
rf/filmstrip_mod/m.js 查看文件

@@ -454,4 +454,46 @@ if (window.refresh_fs_proc){
454 454
 
455 455
 }
456 456
 
457
-// clog("zzzz")
457
+// clog("zzzz")
458
+
459
+
460
+
461
+
462
+
463
+
464
+
465
+
466
+
467
+
468
+
469
+
470
+
471
+
472
+
473
+
474
+
475
+
476
+
477
+
478
+
479
+
480
+
481
+
482
+
483
+
484
+
485
+
486
+
487
+
488
+
489
+
490
+
491
+
492
+
493
+
494
+
495
+
496
+
497
+
498
+
499
+

+ 1
- 0
rf/i4n/m.html 查看文件

@@ -5,6 +5,7 @@
5 5
 <span class="plugin_top_v2 popup_root">
6 6
 	
7 7
 <div class="popup_body">
8
+	
8 9
 <div class="popup_txt">
9 10
 	POPUP TEXT
10 11
 	

+ 77
- 0
rf/m/m_api_v2.js 查看文件

@@ -285,6 +285,83 @@ function add_node(n,rn,i) {
285 285
 	$(rn)[i](n)
286 286
 }
287 287
 
288
+
289
+
290
+
291
+
292
+
293
+
294
+
295
+
296
+
297
+
298
+
299
+
300
+
301
+function unload_css(css) {
302
+	var k,v
303
+	for (k of css){
304
+		remove_css(k)
305
+	}
306
+	// body...
307
+}
308
+
309
+function remove_jscss(file_url){
310
+	$(`link.rld[href^="`+file_url+`"]`).remove()
311
+	$(`script.rld[src^="`+file_url+`"]`).remove()
312
+}
313
+function unload_module_css(name) {
314
+	var k,v
315
+
316
+	for ([k,v] of Object.entries(rldi.files)){
317
+		if (k.endsWith(".css") && v.m && v.m.mod==name){
318
+		// if (v.m && v.m.mod==name){
319
+			remove_jscss(k)
320
+			delete rldi.files[k]
321
+
322
+		// remove_css(k)
323
+		clog("~",k,v)
324
+		}
325
+		// clog("~",k,v)
326
+	}
327
+	// body...
328
+}
329
+
330
+function unload_module(name) {
331
+	var k,v
332
+
333
+	for ([k,v] of Object.entries(rldi.files)){
334
+		// if (k.endsWith(".css") && v.m && v.m.mod==name){
335
+		if (v.m && v.m.mod==name){
336
+			remove_jscss(k)
337
+			delete rldi.files[k]
338
+
339
+		// remove_css(k)
340
+		clog("~",k,v)
341
+		}
342
+		// clog("~",k,v)
343
+	}
344
+	// body...
345
+}
346
+
347
+
348
+
349
+
350
+
351
+
352
+
353
+
354
+
355
+
356
+
357
+
358
+
359
+
360
+
361
+
362
+
363
+
364
+
288 365
 mod_path ="ign/rf/filmstrip_mod/"
289 366
 
290 367
 mtx ={	

+ 14
- 1
rf/m/m_req.js 查看文件

@@ -161,6 +161,15 @@ qxi_skip = [
161 161
 "SET_TOOLBOX_VISIBLE",
162 162
 
163 163
 ]
164
+function run_qxi_cbs(key,o){
165
+	var k,v
166
+		// clog("RUN_HOOK_CB??",key,glob_mx.hook_cb[key])
167
+
168
+	for ([k,v] of Object.entries(glob_mx.qxi_cb[key]|| {}) ) {
169
+		// clog("RUN_HOOK_CB:",k)
170
+		v(o)
171
+	}
172
+}
164 173
 
165 174
 function qxi2(o){
166 175
 	if (qxi_skip.includes(o.action.type)){
@@ -172,10 +181,14 @@ function qxi2(o){
172 181
 
173 182
 function qxi_event(o){
174 183
 	var cb
184
+	run_qxi_cbs(o.action.type,o)
185
+	/*
175 186
 	cb = glob_mx.qxi_test[o.action.type]
176 187
 	if (cb){
177 188
 		cb(o)
189
+		// SET_OVERFLOW_MENU_VISIBLE
178 190
 	}
191
+	*/
179 192
 	// glob_mx.qxi_test
180 193
 
181 194
 }
@@ -192,7 +205,7 @@ function dev_middleware_listner(o) {
192 205
 	//			/*
193 206
 	if (o.action.type != "ENDPOINT_MESSAGE_RECEIVED"){
194 207
 		// CONFERENCE_JOINED
195
-		// qxi2(o)
208
+		qxi2(o)
196 209
 		qxi_event(o)
197 210
 		// if (o.action.type.startsWith("SET_TOOLBOX_" || o.action.type == "TOGGLE_TOOLBOX_VISIBLE")){
198 211
 			// SET_TOOLBOX_info(o,this)

+ 12
- 0
rf/m/m_utils.js 查看文件

@@ -28,7 +28,10 @@ glob_mx.event_handlers = {}
28 28
 glob_mx.cb = {
29 29
 	init_db:{}
30 30
 }
31
+glob_mx.hook_cb = {
31 32
 
33
+}
34
+glob_mx.qxi_cb = {}
32 35
 glob_mx.qxi_test = {
33 36
 
34 37
 }
@@ -134,6 +137,15 @@ function run_cbs(key){
134 137
 	}
135 138
 }
136 139
 
140
+function run_hook_cbs(key,o){
141
+	var k,v
142
+		// clog("RUN_HOOK_CB??",key,glob_mx.hook_cb[key])
143
+
144
+	for ([k,v] of Object.entries(glob_mx.hook_cb[key]|| {}) ) {
145
+		// clog("RUN_HOOK_CB:",k)
146
+		v(o)
147
+	}
148
+}
137 149
 
138 150
 
139 151
 

+ 2
- 0
rf/svg_dev/m.js 查看文件

@@ -46,6 +46,8 @@ function svg_icon_handler2(rsp) {
46 46
 	clog("mod_templates_svg_icon")
47 47
 	init_svg_icon()
48 48
 
49
+
50
+
49 51
 	// plugin_icon_template
50 52
 	// mod_templates_svg_icon
51 53
 

+ 51
- 1
rf/ui_msg/r.css 查看文件

@@ -1 +1,51 @@
1
- 
1
+ /**/
2
+
3
+
4
+.close_button {
5
+	/*background-color: #fff;*/
6
+	/*color: #fff;*/
7
+	fill: #fff7;
8
+	/*stroke: #fff7;*/
9
+	/*stroke: #777;*/
10
+	fill: #777;
11
+	/*padding: 10px;*/
12
+	margin: 10px;
13
+	right: 0px;
14
+	position: absolute;
15
+}
16
+
17
+
18
+.close_button:hover {
19
+	fill: #bbb;
20
+	stroke: #bbb;
21
+
22
+}
23
+
24
+.popup_icons .settings-button-container {
25
+	display: inline-block;
26
+	padding: 10px;
27
+	margin: 10px;
28
+}
29
+
30
+
31
+
32
+.ieven {
33
+	/*display: inline-block;*/
34
+	/*padding: 10px;*/
35
+	/*margin: 10px;*/
36
+
37
+	/*background: red;*/
38
+}
39
+
40
+.ieven .toolbox-icon{
41
+	background: #fff !important;
42
+
43
+}
44
+
45
+
46
+.ieven svg{
47
+		/*toolbox-icon*/
48
+	    fill: #5e6d7a !important;
49
+	    /*background-color*/
50
+}
51
+

+ 43
- 0
rf/ui_msg/r.html 查看文件

@@ -1,3 +1,46 @@
1 1
  
2 2
 
3
+<span id="tmplt">abc</span>
3 4
 
5
+
6
+<div aria-label="Toggle tile view" class="plugin_top_cls plugin_icon_template_v2 toolbox-button tb otb"><div><div class="toolbox-icon  "><div class="jitsi-icon ">
7
+</div></div></div></div>
8
+
9
+
10
+<span class="settings-button-container"><div aria-label="Toggle mute video" class="toolbox-button tb otb"><div><div class="toolbox-icon toggled "><div class="jitsi-icon ">
11
+<!-- 
12
+	<svg height="24" width="24" viewBox="0 0 32 32"><path d="M4.375 2.688L28 26.313l-1.688 1.688-4.25-4.25c-.188.125-.5.25-.75.25h-16c-.75 0-1.313-.563-1.313-1.313V9.313c0-.75.563-1.313 1.313-1.313h1L2.687 4.375zm23.625 6v14.25L13.062 8h8.25c.75 0 1.375.563 1.375 1.313v4.688z"></path></svg></div></div></div></div><div><div class="jitsi-icon settings-button-small-icon">
13
+
14
+ -->
15
+
16
+
17
+		<!-- <svg fill="none" height="9" width="9" viewBox="0 0 10 6"><path fill-rule="evenodd" clip-rule="evenodd" d="M8.07.248a.75.75 0 111.115 1.004L5.656 5.193a.75.75 0 01-1.115 0L1.068 1.252A.75.75 0 012.182.248L5.1 3.571 8.07.248z" fill="#5E6D7A"></path></svg> -->
18
+
19
+
20
+<!-- </div> -->
21
+
22
+<!-- </div> -->
23
+
24
+</div>
25
+</div>
26
+</div>
27
+</div>
28
+</span>
29
+
30
+
31
+
32
+
33
+<span class="plugin_top_v3 popup_root">
34
+	
35
+<div class="popup_body">
36
+	
37
+<div class="popup_txt">
38
+	POPUP TEXT2
39
+	
40
+</div>
41
+<div class="popup_icons"></div>
42
+
43
+</div>
44
+
45
+
46
+</span>

+ 234
- 4
rf/ui_msg/r.js 查看文件

@@ -3,19 +3,249 @@ mod_templates_ui_msg = window.mod_templates_ui_msg || $("")
3 3
 // html_js_handler_ui_msg 
4 4
 function html_js_handler_ui_msg(rsp) {
5 5
 	clog("html_js_handler_ui_msg",[...arguments])
6
-	mod_templates_ui_msg = $(`<span>${rsp}</span>`)
7
-	// clog("html_js_handler_lobby2")
6
+	mod_templates_ui_msg = $(`<span>${rsp}</span>`)[0].outerHTML
7
+	clog("html_js_handler_lobby2")
8 8
 	// init_lobby()
9
+	init_ui_msg()
9 10
 	// clog("html_js_handler_lobby3")
10 11
 	// init_api6()
11 12
 }
12 13
 glob_mx.svg = window.glob_mx.svg || {}
13 14
 
14
-function load_svg(url,name){
15
+// function load_svg(url,name){
16
+
17
+
18
+// plugin_top_v3
19
+// plugin_top_v3 popup_root
20
+// plugin_top_cls plugin_icon_template_v2
21
+function init_ui_msg(url,name){
22
+	// if (!glob_mx.svg["close.svg"] || !(mod_templates_ui_msg.find("#tmplt").length) ){
23
+	if (!glob_mx.svg["close.svg"] || !(mod_templates_ui_msg.length) ){
24
+		return
25
+	}
26
+	var n,svg,icon_template
27
+
28
+
29
+	saftly_remove(".plugin_top_v3.popup_root")
30
+	saftly_remove(".plugin_icon_template_v2")
31
+	saftly_remove(".plugin_icon_template_v3")
32
+	return
33
+
34
+	// svg = $(glob_mx.svg["close.svg"]).find("svg")
35
+	svg = $(`<span>${glob_mx.svg["close.svg"]}</span>`).find("svg")
36
+	svg.addClass("close_button")
37
+	// svg = $(`<span>$(glob_mx.svg["close.svg"])</span>`).filter("svg")
38
+
39
+	var jmod_templates_ui_msg = $(mod_templates_ui_msg)
40
+	n = jmod_templates_ui_msg.find(".plugin_top_v3.popup_root")
41
+	n.find(".popup_body").prepend(svg)
42
+	// n.find(".popup_icons").append(svg)
43
+
44
+	svg = $(`<span>${glob_mx.svg["camera.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
45
+	icon_template = $(jmod_templates_ui_msg.find(".settings-button-container")[0].outerHTML)
46
+	icon_template.find(".jitsi-icon").append(svg)
47
+	n.find(".popup_icons").append(icon_template)
48
+
49
+	svg = $(`<span>${glob_mx.svg["microphone.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
50
+	icon_template = $(jmod_templates_ui_msg.find(".settings-button-container")[0].outerHTML)
51
+	icon_template.find(".jitsi-icon").append(svg)
52
+	n.find(".popup_icons").append(icon_template)
53
+
54
+	svg = $(`<span>${glob_mx.svg["camera-disabled.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
55
+	icon_template = $(jmod_templates_ui_msg.find(".settings-button-container")[0].outerHTML)
56
+	icon_template.find(".jitsi-icon").append(svg)
57
+	n.find(".popup_icons").append(icon_template)
58
+
59
+	svg = $(`<span>${glob_mx.svg["mic-disabled.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
60
+	icon_template = $(jmod_templates_ui_msg.find(".settings-button-container")[0].outerHTML)
61
+	icon_template.find(".jitsi-icon").append(svg)
62
+	n.find(".popup_icons").append(icon_template)
63
+
64
+
65
+	svg = $(`<span>${glob_mx.svg["mic-camera-combined.svg"]}</span>`).find("svg").addClass("icon_svg")                                  
66
+	icon_template = $(jmod_templates_ui_msg.find(".settings-button-container")[0].outerHTML)
67
+	icon_template.find(".jitsi-icon").append(svg)
68
+	n.find(".popup_icons").append(icon_template)
69
+	n.find(".popup_icons .settings-button-container:even").addClass("ieven")
70
+
71
+	// mic-camera-combined
72
+
73
+	// add_node(svg,n.find(".popup_body"),"append")
74
+	clog("**",icon_template)
75
+	window.nq_test = n
76
+	add_node(n,".dev_hook.vspace","append")
77
+	clog("::",svg,n,n.find(".popup_body"))
78
+
79
+	// n = jmod_templates_ui_msg.find(".plugin_icon_template_v2")
80
+
81
+
82
+	
83
+
15 84
 
16 85
 }
17 86
 
18 87
 
19 88
 function load_svg_handler(url,name){
20 89
 
21
-}
90
+}
91
+function add_svg_mod(){
92
+var mod_path ="ign/rf/ui_msg/"
93
+
94
+var mtx ={	
95
+	// js:["ign/m/timer/m.js","ign/m/timer/m0.js"],
96
+	// js:[`${mod_path}m0.js`,`${mod_path}m.js`,],
97
+	// css:[`${mod_path}m.css`],
98
+	html:[
99
+	{
100
+		url:`/react/features/base/icons/svg/close.svg`,diffH:get_cui_html,success:svg_rld_cb,success_js:"html_js_handler","name":"close.svg"},
101
+		// url:`${mod_path}m.html`,diffH:get_cui_html,success:svg_rld_cb,success_js:"html_js_handler"}]
102
+		{url:`/react/features/base/icons/svg/camera-disabled.svg`,diffH:get_cui_html,success:svg_rld_cb,success_js:"html_js_handler"},
103
+		{url:`/react/features/base/icons/svg/camera.svg`,diffH:get_cui_html,success:svg_rld_cb,success_js:"html_js_handler"},
104
+		{url:`/react/features/base/icons/svg/mic-disabled.svg`,diffH:get_cui_html,success:svg_rld_cb,success_js:"html_js_handler"},
105
+		{url:`/react/features/base/icons/svg/microphone.svg`,diffH:get_cui_html,success:svg_rld_cb,success_js:"html_js_handler"},
106
+		{url:`/react/features/base/icons/svg/mic-camera-combined.svg`,diffH:get_cui_html,success:svg_rld_cb,success_js:"html_js_handler"},
107
+		]
108
+		// url:`/react/features/base/icons/svg/close.svg`,diffH:get_cui_html,success:svg_rld_cb,success_js:"html_js_handler","name":"close.svg"}]
109
+		// url:`${mod_path}r.html`,diffH:get_cui_html,success:svg_rld_cb,success_js:"html_js_handler"}]
110
+		// mod_path
111
+	}
112
+	add_module(mtx )
113
+
114
+}
115
+
116
+function svg_rld_cb(rsp,status,xhr){
117
+	// clog("svg_rld_cb!",this,[...arguments])
118
+	clog("svg_rld_cb!",{that:this,rsp,status,xhr})
119
+	glob_mx.svg.test = {that:this,rsp,status,xhr}
120
+	// glob_mx.svg[this.name] = {that:this,rsp,status,xhr}
121
+	// glob_mx.svg[xhr.file.name] = {that:this,rsp,status,xhr}
122
+		// react/features/base/icons/svg/camera-disabled.svg
123
+	if (!xhr.file.name){
124
+
125
+
126
+	glob_mx.svg[xhr.file.url.split("/").pop()] = rsp
127
+	} else {
128
+	glob_mx.svg[xhr.file.name] = rsp
129
+	}
130
+	init_ui_msg()
131
+	// window[this.success_js](rsp,status,xhr)
132
+	// window[xhr.file.success_js](rsp,status,xhr)
133
+}
134
+
135
+add_svg_mod()
136
+
137
+
138
+
139
+
140
+
141
+
142
+
143
+
144
+
145
+function vid_toggle(){
146
+	var v
147
+	var v2
148
+	if (navigator.platform != "Win32"){
149
+			return
150
+		}
151
+	// for (v of $(".remote-video-menu-trigger")){
152
+		// onmouseenter
153
+		// var e = new MouseEvent("onmouseenter",{bubbles: true})
154
+		// var e = new MouseEvent("onmouseover",{bubbles: true})
155
+
156
+
157
+
158
+		//	/*
159
+		v=$(`[aria-label="Toggle mute video"] .toolbox-icon:not(.toggled) .jitsi-icon `)[0]
160
+		// v2=$(`[aria-label="Toggle mute audio"] .toolbox-icon:not(.toggled) .jitsi-icon `)[0]
161
+		//	*/
162
+
163
+		//		/*
164
+// v=$(`[aria-label="Toggle mute video"] .toolbox-icon.toggled .jitsi-icon `)[0]
165
+
166
+
167
+// v2=$(`[aria-label="Toggle mute audio"] .toolbox-icon.toggled .jitsi-icon `)[0]
168
+		//		*/
169
+
170
+		// v=$(`[aria-label="Toggle mute video"] .toolbox-icon.toggled .jitsi-icon `)[0]
171
+		// v=$(`[aria-label="Toggle mute video"] .toolbox-icon .jitsi-icon `)[0]
172
+
173
+
174
+
175
+
176
+
177
+		var e = new MouseEvent("click",{bubbles: true})
178
+		v.dispatchEvent(e)
179
+
180
+
181
+
182
+		// v=$(`[aria-label="Toggle mute video"] .toolbox-icon.toggled .jitsi-icon `)[0]
183
+		// v=$(`[aria-label="Toggle mute video"] .toolbox-icon .jitsi-icon `)[0]
184
+		if (!v2 ){
185
+			return
186
+		}
187
+		var e2 = new MouseEvent("click",{bubbles: true})
188
+		v2.dispatchEvent(e2)
189
+}
190
+
191
+
192
+
193
+
194
+function set_vid_on(){
195
+	var v
196
+	v = $(`.toolbox-content [aria-label="Toggle mute video"] .toolbox-icon.toggled .jitsi-icon `)[0]
197
+	clog("...v",v)
198
+	if (v) {
199
+		v.dispatchEvent(new MouseEvent("click",{bubbles: true}))
200
+	}
201
+}
202
+function set_vid_off(){
203
+	var v
204
+	v = $(`.toolbox-content [aria-label="Toggle mute video"] .toolbox-icon:not(.toggled) .jitsi-icon `)[0]
205
+	clog("...v",v)
206
+	if (v) {
207
+		v.dispatchEvent(new MouseEvent("click",{bubbles: true}))
208
+	}
209
+	
210
+}
211
+function set_mic_off(){
212
+	var v
213
+	v = $(`.toolbox-content [aria-label="Toggle mute audio"] .toolbox-icon:not(.toggled) .jitsi-icon `)[0]
214
+	clog("...v",v)
215
+	if (v) {
216
+		v.dispatchEvent(new MouseEvent("click",{bubbles: true}))
217
+	}
218
+	
219
+}
220
+
221
+function set_mic_on(){
222
+	var v
223
+	v = $(`.toolbox-content [aria-label="Toggle mute audio"] .toolbox-icon.toggled .jitsi-icon `)[0]
224
+	clog("...v",v)
225
+	if (v) {
226
+		v.dispatchEvent(new MouseEvent("click",{bubbles: true}))
227
+	}
228
+	
229
+}
230
+function toggle_mic(){
231
+	var v
232
+	v = $(`.toolbox-content [aria-label="Toggle mute audio"] .toolbox-icon .jitsi-icon `)[0]
233
+	clog("...v",v)
234
+	if (v) {
235
+		v.dispatchEvent(new MouseEvent("click",{bubbles: true}))
236
+	}
237
+	
238
+}
239
+
240
+function toggle_vid(){
241
+	var v
242
+	v = $(`.toolbox-content [aria-label="Toggle mute video"] .toolbox-icon .jitsi-icon `)[0]
243
+	clog("...v",v)
244
+	if (v) {
245
+		v.dispatchEvent(new MouseEvent("click",{bubbles: true}))
246
+	}
247
+	
248
+}
249
+
250
+
251
+// plugin_top_cls plugin_icon_template_v2

+ 36
- 0
rf/ui_msg/r1.js 查看文件

@@ -0,0 +1,36 @@
1
+
2
+
3
+glob_mx.hook_cb.RemoteVideoMenu = glob_mx.hook_cb.RemoteVideoMenu || {}
4
+glob_mx.qxi_cb.SET_OVERFLOW_MENU_VISIBLE = glob_mx.qxi_cb.SET_OVERFLOW_MENU_VISIBLE || {}
5
+
6
+function rvm_to(a){
7
+	clog("rvm_to RemoteVideoMenu...",a, $(".popover"))
8
+
9
+}
10
+
11
+glob_mx.hook_cb.RemoteVideoMenu.fn = function(o,a2){
12
+	if ($(".popover").length){
13
+		return
14
+	}
15
+	clog("RemoteVideoMenu...", $(".popover"),o,a2)
16
+	setTimeout(rvm_to,0,"A")
17
+	// setTimeout(rvm_to,100,"B")
18
+}
19
+// RemoteVideoMenu
20
+// glob_mx.qxi_test
21
+
22
+// qxi_cb
23
+
24
+
25
+glob_mx.qxi_cb["SET_OVERFLOW_MENU_VISIBLE"].fn = function (o,a2){
26
+	clog("SET_OVERFLOW_MENU_VISIBLE.",o,$(".overflow-menu"))
27
+}
28
+
29
+// qxi_cb
30
+
31
+
32
+clog("R1")
33
+// $(".popover")
34
+dispatch_evnt()
35
+
36
+

正在加载...
取消
保存