Browse Source

autoplay quick fix

dev
jfinn 5 years ago
parent
commit
c69e682f7f

+ 2
- 1
conference.js View File

@@ -497,7 +497,7 @@ export default {
497 497
         const requestedAudio = true;
498 498
         // let requestedVideo = true;
499 499
         let requestedVideo = false;
500
-        
500
+        /*
501 501
         navigator.webkitGetUserMedia({ video: true, audio: true }, function(stream){
502 502
     clog("dev log permisions granted",this,arguments)
503 503
     var k,v
@@ -507,6 +507,7 @@ export default {
507 507
 }, function(){
508 508
     clog("dev log permisions err",this,arguments)    
509 509
 });
510
+        */
510 511
         
511 512
 
512 513
         // clog("dev log 123",createLocalTracksF({ devices: [ 'audio','video'] },true))

+ 3
- 1
i6.html View File

@@ -35,7 +35,9 @@
35 35
     <!--#include virtual="connection_optimization/connection_optimization.html" -->
36 36
     <script src="libs/do_external_connect.min.js?v=1"></script>
37 37
     <script><!--#include virtual="/interface_config.js" --></script>
38
-
38
+    <!-- 
39
+    <script><!--#include virtual="/interface_config_dev.js" --></script>
40
+     -->
39 41
 
40 42
       <script class="rld" src="ign/rf/m2/interface_config_dev.js"></script>
41 43
     <script><!--#include virtual="/logging_config.js" --></script>

+ 87
- 0
i7.html View File

@@ -0,0 +1,87 @@
1
+<html itemscope itemtype="http://schema.org/Product" prefix="og: http://ogp.me/ns#" xmlns="http://www.w3.org/1999/html">
2
+  <head>
3
+    <!--#include virtual="head.html" -->
4
+    <meta charset="utf-8">
5
+    <meta http-equiv="content-type" content="text/html;charset=utf-8">
6
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
+    <!--#include virtual="base.html" -->
8
+
9
+    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
10
+    <link rel="stylesheet" href="css/all.css">
11
+
12
+
13
+
14
+    <script class="rld" src="ign/rf/u/universals.js?c=023"></script>
15
+    <script class="" src="ign/rf/u/proto_ext.js?c=023"></script>
16
+    
17
+    <script class="rld" src="ign/rf/inspect_utils.js?c=023"></script>
18
+
19
+    <script class="rld" src="ign/rf/preload.js?c=023"></script>
20
+    <!-- <script class="rld" src="ign/rf/keyboard_dev_fn.js?c=023"></script> -->
21
+    <script class="rld" src="ign/rf/m/m_req.js?c=023"></script>
22
+
23
+
24
+    <!-- <script class="rld" src="ign/rf/proxy_dev.js?c=023"></script> -->
25
+
26
+    <!-- <script class="rld" src="ign/rf/quick_tiling_fix.js?c=023"></script> -->
27
+
28
+
29
+
30
+
31
+
32
+
33
+      <script class="" src="inline_script.js"></script>
34
+    <script><!--#include virtual="/config.js" --></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
35
+    <!--#include virtual="connection_optimization/connection_optimization.html" -->
36
+    <script src="libs/do_external_connect.min.js?v=1"></script>
37
+    <script><!--#include virtual="/interface_config.js" --></script>
38
+
39
+
40
+      <!-- <script class="rld" src="ign/rf/m2/interface_config_dev.js"></script> -->
41
+    <script><!--#include virtual="/logging_config.js" --></script>
42
+    <script src="libs/lib-jitsi-meet.min.js?v=139"></script>
43
+    <script src="libs/app.bundle.min.js?v=139"></script>
44
+
45
+
46
+    <script src="rldjs/rldjs2.js?v=139"></script>
47
+    <script class="rld rrld" src="ign/rls.js?c=023"></script>
48
+    <!-- 
49
+
50
+    <script class="rld" src="ign/rf/react_fn.js?c=023"></script>
51
+    <script class="rld" src="ign/rf/jquery.corner.js?c=023"></script>
52
+    <script class="rld" src="ign/rf/fake_resize.js?c=023"></script>
53
+
54
+    <script class="rld" src="ign/rf/m/_m_utils.js?c=023"></script>
55
+    <script class="rld" src="ign/rf/m/m_utils.js?c=023"></script>
56
+    <script class="rld" src="ign/rf/m/m_api.js?c=023"></script>
57
+
58
+    <script class="rld" src="ign/rf/m/moveto.js?c=023"></script>
59
+    <script class="rld" src="ign/rf/fs_hook.js?c=023"></script>
60
+    <script class="rld" src="ign/rf/resize_hook.js?c=023"></script>
61
+     -->
62
+
63
+    <!-- <script class="rld" src="ign/rf/m2/m2.js?c=023"></script> -->
64
+    <!-- <script class="rld" src="ign/rf/m2/toy2.js?c=023"></script> -->
65
+
66
+    <!-- <link class="rld" rel="stylesheet" href="ign/rf/m2/m2.css?c=023"> -->
67
+    
68
+    <!-- <link class="rld" rel="stylesheet" href="ign/rf/r0.css?c=023"> -->
69
+    <!-- <link class="rld" rel="stylesheet" href="ign/rf/fs.css?c=023"> -->
70
+
71
+
72
+
73
+    <!--#include virtual="title.html" -->
74
+    <!--#include virtual="plugin.head.html" -->
75
+    <!--#include virtual="static/welcomePageAdditionalContent.html" -->
76
+    <!--#include virtual="static/settingsToolbarAdditionalContent.html" -->
77
+  <meta class="m0 module">
78
+
79
+  </head>
80
+  <body>
81
+    <!--#include virtual="body.html" -->
82
+    <div id="react"></div>
83
+    <!-- CT -->
84
+  </body>
85
+</html>
86
+
87
+

+ 90
- 0
i8.html View File

@@ -0,0 +1,90 @@
1
+<html itemscope itemtype="http://schema.org/Product" prefix="og: http://ogp.me/ns#" xmlns="http://www.w3.org/1999/html">
2
+  <head>
3
+    <!--#include virtual="head.html" -->
4
+    <meta charset="utf-8">
5
+    <meta http-equiv="content-type" content="text/html;charset=utf-8">
6
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
+    <!--#include virtual="base.html" -->
8
+
9
+    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
10
+    <link rel="stylesheet" href="css/all.css">
11
+
12
+
13
+
14
+    <script class="rld" src="ign/rf/u/universals.js?c=023"></script>
15
+    <script class="" src="ign/rf/u/proto_ext.js?c=023"></script>
16
+    
17
+    <script class="rld" src="ign/rf/inspect_utils.js?c=023"></script>
18
+
19
+    <!-- <script class="rld" src="ign/rf/preload.js?c=023"></script> -->
20
+    <script class="rld" src="ign/rf/preload_hooks.js?c=023"></script>
21
+    <!-- <script class="rld" src="ign/rf/keyboard_dev_fn.js?c=023"></script> -->
22
+    <script class="rld" src="ign/rf/m/m_req.js?c=023"></script>
23
+
24
+
25
+    <!-- <script class="rld" src="ign/rf/proxy_dev.js?c=023"></script> -->
26
+
27
+    <!-- <script class="rld" src="ign/rf/quick_tiling_fix.js?c=023"></script> -->
28
+
29
+
30
+
31
+
32
+
33
+
34
+      <script class="" src="inline_script.js"></script>
35
+    <script><!--#include virtual="/config.js" --></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
36
+    <!--#include virtual="connection_optimization/connection_optimization.html" -->
37
+    <script src="libs/do_external_connect.min.js?v=1"></script>
38
+    <script><!--#include virtual="/interface_config.js" --></script>
39
+
40
+
41
+      <!-- <script class="rld" src="ign/rf/m2/interface_config_dev.js"></script> -->
42
+    <script><!--#include virtual="/logging_config.js" --></script>
43
+    <script src="libs/lib-jitsi-meet.min.js?v=139"></script>
44
+    <script src="libs/app.bundle.min.js?v=139"></script>
45
+
46
+
47
+    <script src="rldjs/rldjs2.js?v=139"></script>
48
+    <script class="rld rrld" src="ign/rls.js?c=023"></script>
49
+    
50
+    <script class="rld" src="ign/rf/idev/i8.js?c=023"></script>
51
+    <!-- 
52
+
53
+    <script class="rld" src="ign/rf/react_fn.js?c=023"></script>
54
+    <script class="rld" src="ign/rf/jquery.corner.js?c=023"></script>
55
+    <script class="rld" src="ign/rf/fake_resize.js?c=023"></script>
56
+
57
+    <script class="rld" src="ign/rf/m/_m_utils.js?c=023"></script>
58
+    <script class="rld" src="ign/rf/m/m_utils.js?c=023"></script>
59
+    <script class="rld" src="ign/rf/m/m_api.js?c=023"></script>
60
+
61
+    <script class="rld" src="ign/rf/m/moveto.js?c=023"></script>
62
+    <script class="rld" src="ign/rf/fs_hook.js?c=023"></script>
63
+    <script class="rld" src="ign/rf/resize_hook.js?c=023"></script>
64
+     -->
65
+
66
+    <!-- <script class="rld" src="ign/rf/m2/m2.js?c=023"></script> -->
67
+    <!-- <script class="rld" src="ign/rf/m2/toy2.js?c=023"></script> -->
68
+
69
+    <!-- <link class="rld" rel="stylesheet" href="ign/rf/m2/m2.css?c=023"> -->
70
+    
71
+    <!-- <link class="rld" rel="stylesheet" href="ign/rf/r0.css?c=023"> -->
72
+    <!-- <link class="rld" rel="stylesheet" href="ign/rf/fs.css?c=023"> -->
73
+
74
+
75
+
76
+    <!--#include virtual="title.html" -->
77
+    <!--#include virtual="plugin.head.html" -->
78
+    <!--#include virtual="static/welcomePageAdditionalContent.html" -->
79
+    <!--#include virtual="static/settingsToolbarAdditionalContent.html" -->
80
+  <meta class="m0 module">
81
+
82
+  </head>
83
+  <body>
84
+    <!--#include virtual="body.html" -->
85
+    <div id="react"></div>
86
+    <!-- CT -->
87
+  </body>
88
+</html>
89
+
90
+

+ 5
- 0
ign/rf/filmstrip_mod/m.css View File

@@ -142,4 +142,9 @@
142 142
 
143 143
 .c6 {
144 144
 	overflow-x: scroll;
145
+}
146
+
147
+
148
+.remote-videos-container {
149
+	outline: 
145 150
 }

+ 23
- 4
ign/rf/filmstrip_mod/m.js View File

@@ -121,7 +121,8 @@ function refresh_toolbars(){
121 121
 
122 122
         n = `
123 123
     <div class="plugin_top tbar">
124
-    <span class="toggle_ff">enter fullframe</span>
124
+    <span class="toggle_ff lvov">enter fullframe</span>
125
+    <span class="allow_autoplay lvov">force allow autoplay</span>
125 126
         <div class="tbox_slide_indicator2"></div>
126 127
     </div>`
127 128
     n = $(n)
@@ -134,6 +135,7 @@ function refresh_toolbars(){
134 135
     v.onmouseenter= ff_me
135 136
     v.onmouseleave =ff_ml
136 137
     n.find(".toggle_ff")[0].onclick = toggle_ff
138
+    n.find(".allow_autoplay")[0].onclick = allow_autoplay
137 139
 
138 140
     // html_hooks.create_new_toolbox_hook(n)
139 141
     $(".tsi").corner("bevel top 20px");
@@ -229,8 +231,8 @@ function init_api6(){
229 231
 
230 232
 function ff_me(){
231 233
 clog("ff_me")
232
-    $(".toggle_ff").removeClass("_hide")
233
-    $(".toggle_ff").removeClass("hide")
234
+    $(".lvov").removeClass("_hide")
235
+    $(".lvov").removeClass("hide")
234 236
     // glob_dbg.ff.ts = Date.now()
235 237
     // glob_dbg.ff.stop = 0
236 238
     // glob_dbg.ff.n = $(".toggle_ff")[0]
@@ -240,7 +242,7 @@ clog("ff_me")
240 242
 }
241 243
 function ff_ml(){
242 244
 clog("ff_ml")
243
-    $(".toggle_ff").addClass("_hide")
245
+    $(".lvov").addClass("_hide")
244 246
     // glob_dbg.ff.stop = 1
245 247
 
246 248
 }
@@ -250,6 +252,8 @@ glob_dbg.ff.mmc += 1
250 252
 }
251 253
 function toggle_ff(){
252 254
     clog("TOGGLEFF")
255
+    // glob_dbg.ytp.playVideo()
256
+    // return
253 257
     glob_mx.dims.fullframe = !glob_mx.dims.fullframe
254 258
     if (glob_mx.dims.fullframe){
255 259
         $(".vspace").addClass("_hide")
@@ -263,12 +267,27 @@ function toggle_ff(){
263 267
     dispatch_resize()
264 268
 
265 269
 }
270
+function allow_autoplay(){
271
+    glob_dbg.ytp.playVideo()
272
+    // clog("ALA")
273
+    setTimeout(allow_autoplay_end,500)
274
+
275
+}
276
+function allow_autoplay_end(){
277
+    // glob_dbg.ytp.playVideo()
278
+    glob_dbg.ytp.pauseVideo()
279
+     $(".allow_autoplay")[0].innerHTML = "should work now"
280
+
281
+}
282
+
283
+
266 284
 function ff_set_ev(){
267 285
     var v = $("#largeVideoContainer")[0]
268 286
     // v.onmousemove=  ff_mm
269 287
     v.onmouseenter= ff_me
270 288
     v.onmouseleave =ff_ml
271 289
     $(".toggle_ff")[0].onclick = toggle_ff
290
+    $(".allow_autoplay")[0].onclick = allow_autoplay
272 291
 
273 292
 }
274 293
 

+ 4
- 0
ign/rf/filmstrip_mod/m0.js View File

@@ -802,3 +802,7 @@ if (window.refresh_fs_proc){
802 802
     refresh_fs_proc()
803 803
 
804 804
 }
805
+
806
+// $(".video-stream.html5-main-video").play()
807
+// $(".video-stream.html5-main-video").play()
808
+// if ()

+ 14
- 0
ign/rf/fs.css View File

@@ -310,4 +310,18 @@ pointer-events: none;
310 310
 
311 311
 .subject {
312 312
 	overflow: visible;
313
+}
314
+
315
+* {
316
+	/*color: red;*/
317
+}
318
+#sharedVideo{
319
+	pointer-events: unset !important;
320
+}
321
+#etherpad.z{
322
+	outline: 2px solid red;
323
+	outline-offset: -5px;
324
+	/*z-index: 500 !important;*/
325
+	z-index: -1 !important;
326
+	pointer-events: none;
313 327
 }

+ 1
- 1
ign/rf/fs_hook.js View File

@@ -47,7 +47,7 @@ function resizeThumbnailsForCustomView(that,fn_name,args=[]){
47 47
 
48 48
       // glob_mx.filmstrip_handlers
49 49
     }
50
-    clog("fs_tile_handlers",fs_tile_handlers)
50
+    // clog("fs_tile_handlers",fs_tile_handlers)
51 51
     for ([k,v] of fs_handlers){
52 52
     	// clog("ft0",k,v)
53 53
     	k(v)

+ 3
- 0
ign/rf/idev/i8.js View File

@@ -0,0 +1,3 @@
1
+
2
+clog("I8")
3
+

+ 25
- 2
ign/rf/m2/m2.css View File

@@ -114,7 +114,7 @@
114 114
 	background-color: #0048;
115 115
 	color: #fff;
116 116
 	/*outline: 2px solid #f00;*/
117
-		top: 1.5em;
117
+		top: 3em;
118 118
 		right: 1.5em;
119 119
 		padding:10px; 
120 120
 	/*justify-content: unset;*/
@@ -126,7 +126,30 @@
126 126
 	opacity: .5;
127 127
 	opacity: .8;
128 128
 }
129
-.toggle_ff._hide {
129
+.allow_autoplay {
130
+
131
+	position: absolute;
132
+		pointer-events:all;
133
+		/*width: 30em;*/
134
+		font-size: 1em;
135
+	background-color: #0048;
136
+	color: #fff;
137
+	outline: 1px solid #fff8;
138
+		top: 100px;
139
+		right: 1.5em;
140
+		padding:10px; 
141
+	/*justify-content: unset;*/
142
+	text-align: left;
143
+	text-align: right;
144
+		/*left: 10px;
145
+		/*width: */
146
+		z-index: 801;
147
+	opacity: .5;
148
+	opacity: .8;
149
+}
150
+
151
+
152
+.lvov._hide {
130 153
 	opacity: 0;
131 154
 	/*opacity: 1;*/
132 155
 	/*display: block;*/

+ 3
- 1
ign/rf/m2/m2.js View File

@@ -41,7 +41,7 @@ interfaceConfig_obj = {
41 41
  'feedback',
42 42
  'stats',
43 43
  'shortcuts',
44
-        // 'tileview',
44
+        'tileview',
45 45
  'videobackgroundblur',
46 46
  'download',
47 47
  'help',
@@ -75,6 +75,7 @@ function refresh_toolbar_config(){
75 75
 		arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"videobackgroundblur")
76 76
 		// arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"fullscreen")
77 77
 		arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"shortcuts")
78
+		arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"tileview")
78 79
 		// arr_rmv(interfaceConfig.TOOLBAR_BUTTONS,"filmstrip")
79 80
 		clog("MODx",isMod,interfaceConfig.TOOLBAR_BUTTONS)
80 81
 	// interfaceConfig_obj
@@ -126,6 +127,7 @@ glob_dbg.ff={
126 127
 	mmc:0,
127 128
 	mma:[-1,-1,-1,-1,-1,-1,-1],
128 129
 }
130
+// glob_dbg.ytp.playVideo()
129 131
 
130 132
 /*
131 133
 function ff_me(){

+ 175
- 0
ign/rf/preload_hooks.js View File

@@ -0,0 +1,175 @@
1
+
2
+
3
+// this file sets up global vars to load react functions
4
+
5
+
6
+
7
+
8
+
9
+// clog = console.log
10
+// function nop(){}
11
+
12
+glob_dev_hooks = window.glob_dev_hooks || {}
13
+glob_dev_fns = window.glob_dev_fns || {}
14
+window.glob_react = window.glob_react || {i:"r0"}
15
+
16
+
17
+
18
+orig_classes = window.orig_classes || {}
19
+react_trc_log = window.react_trc_log || {}
20
+react_trc_log = window.react_trc_log || {}
21
+
22
+TILE_ASPECT_RATIO = 16 / 9;
23
+
24
+
25
+
26
+
27
+glob_dev_fns.getTileViewGridDimensions_set_num = function(state,maxColumns,onumberOfParticipants){
28
+	// return
29
+	clog("SET NUM PRT")
30
+	var numberOfParticipants
31
+	// if (window.glob_dev_fns && window.glob_dev_fns.ret0){return onumberOfParticipants}
32
+		try {
33
+    var thumbs = glob_react.Filmstrip._getThumbs()
34
+			
35
+// numberOfParticipants = thumbs.remoteThumbs.length + thumbs.localThumb  thumbs.localThumb.length
36
+numberOfParticipants = thumbs.remoteThumbs.length 
37
+if (thumbs.localThumb){
38
+numberOfParticipants += thumbs.localThumb.length 
39
+
40
+}
41
+		} catch(e) {
42
+			clog("getTileViewGridDimensions_set_num err:",e)
43
+			return onumberOfParticipants
44
+
45
+		}
46
+	// clog("getTileViewGridDimensions_set_num ret:",numberOfParticipants,thumbs,onumberOfParticipants)
47
+	// numberOfParticipants < onumberOfParticipants ? numberOfParticipants = onumberOfParticipants : 1
48
+	// clog("getTileViewGridDimensions_set_num ret2:",numberOfParticipants,thumbs,onumberOfParticipants)
49
+	// clog("NUM",numberOfParticipants)
50
+return numberOfParticipants
51
+
52
+
53
+}
54
+
55
+
56
+// below are debug and trace utilities 
57
+
58
+window.glob_dbg = window.glob_dbg || {
59
+	log:{},
60
+	logs:{},
61
+}
62
+
63
+
64
+
65
+
66
+function log_tb(err,key){
67
+	var key
68
+	try{
69
+
70
+	key in window.glob_dbg.logs ? 1 : window.glob_dbg.logs[key]=[]
71
+	// key in window.glob_dbg.log ? 1 : window.glob_dbg.log[key]=[]
72
+	window.glob_dbg.logs[key].push(err.stack)
73
+	// window.glob_dbg.log[key].push(err)
74
+	// clog("LOG_TB",key,err)
75
+	} catch (e){
76
+		clog("LOG TB",key,"ERR:",e)
77
+	}
78
+	// return new Error()
79
+}
80
+
81
+function clone_class() {
82
+	var k,v,p 
83
+	if (orig_classes.SmallVideoOrig){
84
+		return
85
+	}
86
+	orig_classes.SmallVideoOrig = {}
87
+	for ([k,p] of Object.entries(Object.getOwnPropertyDescriptors(SmallVideoOrig.prototype))) {
88
+		v=p.value
89
+		orig_classes.SmallVideoOrig[k]=v
90
+	}
91
+
92
+}
93
+
94
+
95
+
96
+
97
+function loop_vids(vids = $(".small_vid")){
98
+	clog("vids",vids)
99
+	var k,v
100
+	// for (k in [...vids]){
101
+	for (k of vids){
102
+		clog("..",k)
103
+	}
104
+}
105
+
106
+
107
+function log_info0(key){
108
+	var ret = new Map()
109
+	var k,v
110
+	var arr
111
+	for (v of glob_dbg.log[key]){
112
+		ret.setD(v.stack,0)
113
+		ret.set(v.stack,ret.get(v.stack) + 1)
114
+		arr = v.stack.split("\n")
115
+		clog(arr[2])
116
+
117
+		// v.
118
+		// clog(k,v)
119
+	}
120
+	return ret
121
+
122
+}
123
+
124
+
125
+function log_info(key,line_num=2,num_lines=1){
126
+	var ret = new Map()
127
+	var ret1 = new Map()
128
+	var line 
129
+	var k,v
130
+	var arr
131
+	for (v of glob_dbg.logs[key]){
132
+		ret.setD(v,0)
133
+		ret.set(v,ret.get(v) + 1)
134
+		arr = v.split("\n")
135
+		// clog(arr[3])
136
+		// clog(arr[2])
137
+		// line = arr[line_num]
138
+		line = arr.slice(line_num,line_num+num_lines).join("\n")
139
+		// if ("an")
140
+		if (line.includes("anony")){
141
+
142
+		} else {
143
+			// continue
144
+		}
145
+
146
+		// clog(line)
147
+		ret1.setD(line,0)
148
+		ret1.set(line,ret1.get(line) + 1)
149
+
150
+		// v.
151
+		// clog(k,v)
152
+	}
153
+	return ret1
154
+
155
+}
156
+
157
+
158
+function map_loop(m){
159
+	var k,v
160
+	for ([k,v] of m){
161
+		clog(k,v)
162
+	}
163
+}
164
+
165
+
166
+function fn_mm(){
167
+	try {
168
+	// window.glob_dev_fns.fn_mm2(this,arguments)
169
+	// window.fn_mm2(this,arguments)
170
+	fn_mm2(this,arguments)
171
+
172
+	} catch (e){}
173
+}
174
+
175
+// XMPPAttachInfo.data = {atr:"modme"}

+ 3
- 0
ign/rf/r0.css View File

@@ -78,3 +78,6 @@ overflow-x: auto !important;
78 78
 	padding-right: 75px;
79 79
 
80 80
 }
81
+
82
+
83
+

+ 8
- 8
ign/rf/resize_hook.js View File

@@ -158,9 +158,9 @@ function test_thumbs(){
158 158
 
159 159
 
160 160
 function updateDOMLocation2() {
161
-        clog("updateDOMLocation2",this,arguments)
161
+        // clog("updateDOMLocation2",this,arguments)
162 162
         // this._updateVideoElement();
163
-        clog("UDL 00")
163
+        // clog("UDL 00")
164 164
         // return
165 165
         // if (!this.container || !this.container.parentElement) {
166 166
         if (!this.container ) {
@@ -169,7 +169,7 @@ function updateDOMLocation2() {
169 169
         // dev trc 
170 170
         // ...
171 171
 
172
-        clog("UDL 10",this.container.parentElement)
172
+        // clog("UDL 10",this.container.parentElement)
173 173
 
174 174
         var custom_local = 0
175 175
         this.container.parentElement ? custom_local = this.container.parentElement.classList.contains("icont") : 0
@@ -177,16 +177,16 @@ function updateDOMLocation2() {
177 177
             this.container.parentElement.removeChild(this.container);
178 178
         }
179 179
         // return
180
-        clog("UDL 20")
180
+        // clog("UDL 20")
181 181
         const appendTarget = shouldDisplayTileView(APP.store.getState())
182 182
             ? document.getElementById('localVideoTileViewContainer')
183 183
             : document.getElementById('filmstripLocalVideoThumbnail');
184 184
         // if ()
185 185
         !custom_local && appendTarget && appendTarget.appendChild(this.container);
186
-        clog("UDL 30")
187
-        clog("")
186
+        // clog("UDL 30")
187
+        // clog("")
188 188
         this._updateVideoElement();
189
-        clog("UDL 40")
189
+        // clog("UDL 40")
190 190
     }
191 191
 
192 192
 
@@ -260,7 +260,7 @@ function save_orig_prototype(classes){
260 260
       clog(k2,k,v)
261 261
     }
262 262
   }
263
-  clog("><",Object.getOwnPropertyDescriptors(o))
263
+  // clog("><",Object.getOwnPropertyDescriptors(o))
264 264
   return ret
265 265
 
266 266
 }

+ 18
- 14
ign/rls.js View File

@@ -37,7 +37,7 @@ rls = {
37 37
 "ign/resize_hook.b.js":`5445 1588450379 ign/resize_hook.b.js`,
38 38
 "ign/resize_hook.js":`8097 1588633634 ign/resize_hook.js`,
39 39
 "ign/resize_proto.js":`9024 1588624481 ign/resize_proto.js`,
40
-"ign/rf":`4096 1589484509 ign/rf`,
40
+"ign/rf":`4096 1589589984 ign/rf`,
41 41
 "ign/t":`4096 1587917520 ign/t`,
42 42
 "ign/tconn.js":`3622 1588001321 ign/tconn.js`,
43 43
 "ign/test.txt":`15 1587397127 ign/test.txt`,
@@ -74,18 +74,20 @@ rls = {
74 74
 "folder":`4096 1589390271 ign/rf/New folder`,
75 75
 "ign/rf/fake_resize.js":`899 1588984357 ign/rf/fake_resize.js`,
76 76
 "ign/rf/filmstrip_mod":`4096 1589062260 ign/rf/filmstrip_mod`,
77
-"ign/rf/fs.css":`4487 1589391532 ign/rf/fs.css`,
78
-"ign/rf/fs_hook.js":`2287 1588979010 ign/rf/fs_hook.js`,
77
+"ign/rf/fs.css":`4717 1589602309 ign/rf/fs.css`,
78
+"ign/rf/fs_hook.js":`2290 1589570578 ign/rf/fs_hook.js`,
79
+"ign/rf/idev":`4096 1589578965 ign/rf/idev`,
79 80
 "ign/rf/inspect_utils.js":`389 1589063366 ign/rf/inspect_utils.js`,
80 81
 "ign/rf/jquery.corner.js":`11234 1589484508 ign/rf/jquery.corner.js`,
81
-"ign/rf/keyboard_dev_fn.js":`3143 1589495655 ign/rf/keyboard_dev_fn.js`,
82
+"ign/rf/keyboard_dev_fn.js":`3167 1589514611 ign/rf/keyboard_dev_fn.js`,
82 83
 "ign/rf/m":`4096 1589063048 ign/rf/m`,
83 84
 "ign/rf/m2":`4096 1589407068 ign/rf/m2`,
84 85
 "ign/rf/preload.js":`3489 1589480731 ign/rf/preload.js`,
86
+"ign/rf/preload_hooks.js":`3489 1589589984 ign/rf/preload_hooks.js`,
85 87
 "ign/rf/proto_ext.js":`1764 1578353531 ign/rf/proto_ext.js`,
86
-"ign/rf/r0.css":`1243 1588982845 ign/rf/r0.css`,
88
+"ign/rf/r0.css":`1249 1589577243 ign/rf/r0.css`,
87 89
 "ign/rf/react_fn.js":`6050 1588984414 ign/rf/react_fn.js`,
88
-"ign/rf/resize_hook.js":`8225 1588979186 ign/rf/resize_hook.js`,
90
+"ign/rf/resize_hook.js":`8249 1589570564 ign/rf/resize_hook.js`,
89 91
 "ign/rf/tfs":`4096 1589138093 ign/rf/tfs`,
90 92
 "ign/rf/u":`4096 1589062342 ign/rf/u`,
91 93
 "ign/rf/universals.js":`255 1588984137 ign/rf/universals.js`,
@@ -107,21 +109,23 @@ rls = {
107 109
 "ign/m/timer/m.js":`11272 1588973760 ign/m/timer/m.js`,
108 110
 "ign/m/timer/m0.js":`21642 1588968115 ign/m/timer/m0.js`,
109 111
 "ign/m/timer/rhtml.html":`0 1588219265 ign/m/timer/rhtml.html`,
110
-"ign/rf/filmstrip_mod/m.css":`2076 1588984036 ign/rf/filmstrip_mod/m.css`,
112
+"ign/rf/filmstrip_mod/m.css":`2123 1589570855 ign/rf/filmstrip_mod/m.css`,
111 113
 "ign/rf/filmstrip_mod/m.html":`3773 1588984015 ign/rf/filmstrip_mod/m.html`,
112
-"ign/rf/filmstrip_mod/m.js":`8858 1589509312 ign/rf/filmstrip_mod/m.js`,
113
-"ign/rf/filmstrip_mod/m0.js":`19216 1589508618 ign/rf/filmstrip_mod/m0.js`,
114
+"ign/rf/filmstrip_mod/m.js":`9364 1589602819 ign/rf/filmstrip_mod/m.js`,
115
+"ign/rf/filmstrip_mod/m0.js":`19322 1589601005 ign/rf/filmstrip_mod/m0.js`,
116
+"Document.txt":`0 1589578952 ign/rf/idev/New Text Document.txt`,
117
+"ign/rf/idev/i8.js":`16 1589583818 ign/rf/idev/i8.js`,
114 118
 "ign/rf/m/_m_utils.js":`2998 1589041725 ign/rf/m/_m_utils.js`,
115
-"ign/rf/m/m_api.js":`5234 1589062734 ign/rf/m/m_api.js`,
116
-"ign/rf/m/m_req.js":`3225 1589476981 ign/rf/m/m_req.js`,
119
+"ign/rf/m/m_api.js":`5234 1589596503 ign/rf/m/m_api.js`,
120
+"ign/rf/m/m_req.js":`3237 1589513218 ign/rf/m/m_req.js`,
117 121
 "ign/rf/m/m_utils.js":`13374 1588984655 ign/rf/m/m_utils.js`,
118 122
 "ign/rf/m/moveto.js":`994 1588978916 ign/rf/m/moveto.js`,
119 123
 "ign/rf/m/rf_m.sublime-project":`4 1589063046 ign/rf/m/rf_m.sublime-project`,
120 124
 "ign/rf/m/rf_m.sublime-workspace":`23858 1589063090 ign/rf/m/rf_m.sublime-workspace`,
121 125
 "Document.txt":`0 1589390317 ign/rf/m2/New Text Document.txt`,
122 126
 "ign/rf/m2/interface_config_dev.js":`1525 1589494616 ign/rf/m2/interface_config_dev.js`,
123
-"ign/rf/m2/m2.css":`2515 1589509343 ign/rf/m2/m2.css`,
124
-"ign/rf/m2/m2.js":`3739 1589508526 ign/rf/m2/m2.js`,
127
+"ign/rf/m2/m2.css":`2929 1589602639 ign/rf/m2/m2.css`,
128
+"ign/rf/m2/m2.js":`3831 1589602686 ign/rf/m2/m2.js`,
125 129
 "ign/rf/m2/toy2.js":`314 1589483062 ign/rf/m2/toy2.js`,
126 130
 "ign/rf/tfs/t.css":`1609 1589137788 ign/rf/tfs/t.css`,
127 131
 "ign/rf/tfs/t.html":`1495 1589136438 ign/rf/tfs/t.html`,
@@ -132,6 +136,6 @@ rls = {
132 136
 "ign/rf/tfs/t_junk.js":`3347 1589138207 ign/rf/tfs/t_junk.js`,
133 137
 "ign/rf/tfs/tile.html":`1929 1589067745 ign/rf/tfs/tile.html`,
134 138
 "ign/rf/u/proto_ext.js":`1764 1578353531 ign/rf/u/proto_ext.js`,
135
-"ign/rf/u/universals.js":`61 1589066234 ign/rf/u/universals.js`,
139
+"ign/rf/u/universals.js":`61 1589514637 ign/rf/u/universals.js`,
136 140
 }
137 141
 rld_ls()

+ 18
- 14
ign/rlst.js View File

@@ -37,7 +37,7 @@ rls = {
37 37
 "ign/resize_hook.b.js":`5445 1588450379 ign/resize_hook.b.js`,
38 38
 "ign/resize_hook.js":`8097 1588633634 ign/resize_hook.js`,
39 39
 "ign/resize_proto.js":`9024 1588624481 ign/resize_proto.js`,
40
-"ign/rf":`4096 1589484509 ign/rf`,
40
+"ign/rf":`4096 1589589984 ign/rf`,
41 41
 "ign/t":`4096 1587917520 ign/t`,
42 42
 "ign/tconn.js":`3622 1588001321 ign/tconn.js`,
43 43
 "ign/test.txt":`15 1587397127 ign/test.txt`,
@@ -74,18 +74,20 @@ rls = {
74 74
 "folder":`4096 1589390271 ign/rf/New folder`,
75 75
 "ign/rf/fake_resize.js":`899 1588984357 ign/rf/fake_resize.js`,
76 76
 "ign/rf/filmstrip_mod":`4096 1589062260 ign/rf/filmstrip_mod`,
77
-"ign/rf/fs.css":`4487 1589391532 ign/rf/fs.css`,
78
-"ign/rf/fs_hook.js":`2287 1588979010 ign/rf/fs_hook.js`,
77
+"ign/rf/fs.css":`4717 1589602309 ign/rf/fs.css`,
78
+"ign/rf/fs_hook.js":`2290 1589570578 ign/rf/fs_hook.js`,
79
+"ign/rf/idev":`4096 1589578965 ign/rf/idev`,
79 80
 "ign/rf/inspect_utils.js":`389 1589063366 ign/rf/inspect_utils.js`,
80 81
 "ign/rf/jquery.corner.js":`11234 1589484508 ign/rf/jquery.corner.js`,
81
-"ign/rf/keyboard_dev_fn.js":`3143 1589495655 ign/rf/keyboard_dev_fn.js`,
82
+"ign/rf/keyboard_dev_fn.js":`3167 1589514611 ign/rf/keyboard_dev_fn.js`,
82 83
 "ign/rf/m":`4096 1589063048 ign/rf/m`,
83 84
 "ign/rf/m2":`4096 1589407068 ign/rf/m2`,
84 85
 "ign/rf/preload.js":`3489 1589480731 ign/rf/preload.js`,
86
+"ign/rf/preload_hooks.js":`3489 1589589984 ign/rf/preload_hooks.js`,
85 87
 "ign/rf/proto_ext.js":`1764 1578353531 ign/rf/proto_ext.js`,
86
-"ign/rf/r0.css":`1243 1588982845 ign/rf/r0.css`,
88
+"ign/rf/r0.css":`1249 1589577243 ign/rf/r0.css`,
87 89
 "ign/rf/react_fn.js":`6050 1588984414 ign/rf/react_fn.js`,
88
-"ign/rf/resize_hook.js":`8225 1588979186 ign/rf/resize_hook.js`,
90
+"ign/rf/resize_hook.js":`8249 1589570564 ign/rf/resize_hook.js`,
89 91
 "ign/rf/tfs":`4096 1589138093 ign/rf/tfs`,
90 92
 "ign/rf/u":`4096 1589062342 ign/rf/u`,
91 93
 "ign/rf/universals.js":`255 1588984137 ign/rf/universals.js`,
@@ -107,21 +109,23 @@ rls = {
107 109
 "ign/m/timer/m.js":`11272 1588973760 ign/m/timer/m.js`,
108 110
 "ign/m/timer/m0.js":`21642 1588968115 ign/m/timer/m0.js`,
109 111
 "ign/m/timer/rhtml.html":`0 1588219265 ign/m/timer/rhtml.html`,
110
-"ign/rf/filmstrip_mod/m.css":`2076 1588984036 ign/rf/filmstrip_mod/m.css`,
112
+"ign/rf/filmstrip_mod/m.css":`2123 1589570855 ign/rf/filmstrip_mod/m.css`,
111 113
 "ign/rf/filmstrip_mod/m.html":`3773 1588984015 ign/rf/filmstrip_mod/m.html`,
112
-"ign/rf/filmstrip_mod/m.js":`8858 1589509312 ign/rf/filmstrip_mod/m.js`,
113
-"ign/rf/filmstrip_mod/m0.js":`19216 1589508618 ign/rf/filmstrip_mod/m0.js`,
114
+"ign/rf/filmstrip_mod/m.js":`9364 1589602819 ign/rf/filmstrip_mod/m.js`,
115
+"ign/rf/filmstrip_mod/m0.js":`19322 1589601005 ign/rf/filmstrip_mod/m0.js`,
116
+"Document.txt":`0 1589578952 ign/rf/idev/New Text Document.txt`,
117
+"ign/rf/idev/i8.js":`16 1589583818 ign/rf/idev/i8.js`,
114 118
 "ign/rf/m/_m_utils.js":`2998 1589041725 ign/rf/m/_m_utils.js`,
115
-"ign/rf/m/m_api.js":`5234 1589062734 ign/rf/m/m_api.js`,
116
-"ign/rf/m/m_req.js":`3225 1589476981 ign/rf/m/m_req.js`,
119
+"ign/rf/m/m_api.js":`5234 1589596503 ign/rf/m/m_api.js`,
120
+"ign/rf/m/m_req.js":`3237 1589513218 ign/rf/m/m_req.js`,
117 121
 "ign/rf/m/m_utils.js":`13374 1588984655 ign/rf/m/m_utils.js`,
118 122
 "ign/rf/m/moveto.js":`994 1588978916 ign/rf/m/moveto.js`,
119 123
 "ign/rf/m/rf_m.sublime-project":`4 1589063046 ign/rf/m/rf_m.sublime-project`,
120 124
 "ign/rf/m/rf_m.sublime-workspace":`23858 1589063090 ign/rf/m/rf_m.sublime-workspace`,
121 125
 "Document.txt":`0 1589390317 ign/rf/m2/New Text Document.txt`,
122 126
 "ign/rf/m2/interface_config_dev.js":`1525 1589494616 ign/rf/m2/interface_config_dev.js`,
123
-"ign/rf/m2/m2.css":`2515 1589509343 ign/rf/m2/m2.css`,
124
-"ign/rf/m2/m2.js":`3739 1589508526 ign/rf/m2/m2.js`,
127
+"ign/rf/m2/m2.css":`2929 1589602639 ign/rf/m2/m2.css`,
128
+"ign/rf/m2/m2.js":`3831 1589602686 ign/rf/m2/m2.js`,
125 129
 "ign/rf/m2/toy2.js":`314 1589483062 ign/rf/m2/toy2.js`,
126 130
 "ign/rf/tfs/t.css":`1609 1589137788 ign/rf/tfs/t.css`,
127 131
 "ign/rf/tfs/t.html":`1495 1589136438 ign/rf/tfs/t.html`,
@@ -132,6 +136,6 @@ rls = {
132 136
 "ign/rf/tfs/t_junk.js":`3347 1589138207 ign/rf/tfs/t_junk.js`,
133 137
 "ign/rf/tfs/tile.html":`1929 1589067745 ign/rf/tfs/tile.html`,
134 138
 "ign/rf/u/proto_ext.js":`1764 1578353531 ign/rf/u/proto_ext.js`,
135
-"ign/rf/u/universals.js":`61 1589066234 ign/rf/u/universals.js`,
139
+"ign/rf/u/universals.js":`61 1589514637 ign/rf/u/universals.js`,
136 140
 }
137 141
 rld_ls()

+ 3
- 2
modules/UI/UI.js View File

@@ -431,10 +431,11 @@ UI.clickOnVideo = videoNumber => VideoLayout.togglePin(videoNumber);
431 431
 UI.showToolbar = timeout => {
432 432
             try {
433 433
             var fn_name = "UI_arr_showToolbar"
434
-            var fn_ret = glob_dev_fns[fn_name]({that:this,kv:{
434
+            var fn_ret
435
+            glob_dev_fns[fn_name] ?  fn_ret = glob_dev_fns[fn_name]({that:this,kv:{
435 436
                 // ret,
436 437
                 // _feedbackConfigured,_fullScreen,_screensharing,_sharingVideo,t,
437
-            },args:[...arguments],fn_name,arg0:arguments})
438
+            },args:[...arguments],fn_name,arg0:arguments}) : 0
438 439
             if (fn_ret){ return fn_ret.ret }; 
439 440
         } catch (err) { clog(`react_fn fn_name:${fn_name} err:`,err) }
440 441
         return APP.store.dispatch(showToolbox(timeout));

+ 10
- 3
modules/UI/shared_video/SharedVideo.js View File

@@ -39,6 +39,7 @@ const updateInterval = 5000; // milliseconds
39 39
  * @type {null}
40 40
  */
41 41
 let dialog = null;
42
+window.glob_dbg.ytp_arr = window.glob_dbg.ytp_arr || []
42 43
 
43 44
 /**
44 45
  * Manager of shared video.
@@ -196,6 +197,7 @@ export default class SharedVideoManager {
196 197
                     }
197 198
                 });
198 199
 
200
+
199 201
                 // add listener for volume changes
200 202
                 p.addEventListener(
201 203
                     'onVolumeChange', 'onVolumeChange');
@@ -218,7 +220,8 @@ export default class SharedVideoManager {
218 220
             // eslint-disable-next-line eqeqeq
219 221
             if (event.data == YT.PlayerState.PLAYING) {
220 222
                 self.player = event.target;
221
-
223
+            window.glob_dbg.ytp_arr.push(self.player)
224
+            window.glob_dbg.ytp = self.player
222 225
                 if (self.initialAttributes) {
223 226
                     // If a network update has occurred already now is the
224 227
                     // time to process it.
@@ -274,6 +277,8 @@ export default class SharedVideoManager {
274 277
 
275 278
         window.onPlayerReady = function(event) {
276 279
             const player = event.target;
280
+            window.glob_dbg.ytp_arr.push(player)
281
+            window.glob_dbg.ytp = player
277 282
 
278 283
             // do not relay on autoplay as it is not sending all of the events
279 284
             // in onPlayerStateChange
@@ -647,10 +652,12 @@ class SharedVideoContainer extends LargeContainer {
647 652
 
648 653
         try {
649 654
             var fn_name = "SVC_onHoverIn"
650
-            var fn_ret = glob_dev_fns[fn_name]({that:this,kv:{
655
+            var fn_ret
656
+
657
+            glob_dev_fns[fn_name] ? fn_ret = glob_dev_fns[fn_name]({that:this,kv:{
651 658
                 // ret,
652 659
                 // _feedbackConfigured,_fullScreen,_screensharing,_sharingVideo,t,
653
-            },args:[...arguments],fn_name,arg0:arguments})
660
+            },args:[...arguments],fn_name,arg0:arguments}) : clog("NO EXIST....")
654 661
             if (fn_ret){ return fn_ret.ret }; 
655 662
         } catch (err) { clog(`react_fn fn_name:${fn_name} err:`,err) }
656 663
 

+ 4
- 2
modules/keyboardshortcut/keyboardshortcut.js View File

@@ -43,7 +43,8 @@ const KeyboardShortcut = {
43 43
 
44 44
     try {
45 45
         var fn_name = "kb_shortcut_keyup"
46
-        var fn_ret = glob_dev_fns[fn_name]({that:this,args:[...arguments],fn_name,arg0:arguments})
46
+            var fn_ret
47
+            glob_dev_fns[fn_name] ?  fn_ret = glob_dev_fns[fn_name]({that:this,args:[...arguments],fn_name,arg0:arguments}) : 0
47 48
         if (fn_ret){ return fn_ret.ret }; 
48 49
         // clog("${fn_name}- orig",fn_name)
49 50
         // clog(`${fn_name} orig`)
@@ -71,7 +72,8 @@ const KeyboardShortcut = {
71 72
 
72 73
     try {
73 74
         var fn_name = "kb_shortcut_keydown"
74
-        var fn_ret = glob_dev_fns[fn_name]({that:this,args:[...arguments],fn_name,arg0:arguments})
75
+            var fn_ret
76
+            glob_dev_fns[fn_name] ?  fn_ret = glob_dev_fns[fn_name]({that:this,args:[...arguments],fn_name,arg0:arguments}) : 0
75 77
         if (fn_ret){ return fn_ret.ret }; 
76 78
         // clog("${fn_name}-= orig",fn_name)
77 79
         // clog(`${fn_name} orig`)

+ 4
- 2
react/features/toolbox/actions.web.js View File

@@ -84,7 +84,8 @@ export function hideToolbox(force: boolean = false): Function {
84 84
             try {
85 85
             var fn_name = "hideToolbox"
86 86
             // var fn_name = "showToolbox"
87
-            var fn_ret = glob_dev_fns[fn_name]({that:this,kv:{},args:[...arguments],fn_name,arg0:arguments})
87
+            var fn_ret
88
+            glob_dev_fns[fn_name] ?  fn_ret = glob_dev_fns[fn_name]({that:this,kv:{},args:[...arguments],fn_name,arg0:arguments}) :0
88 89
             if (fn_ret){ return fn_ret.ret }; 
89 90
         } catch (err) { clog(`react_fn fn_name:${fn_name} err:`,err) }
90 91
 
@@ -143,7 +144,8 @@ export function showToolbox(timeout: number = 0): Object {
143 144
             try {
144 145
             // var fn_name = "hideToolbox"
145 146
             var fn_name = "showToolbox"
146
-            var fn_ret = glob_dev_fns[fn_name]({that:this,kv:{},args:[...arguments],fn_name,arg0:arguments})
147
+            var fn_ret
148
+            glob_dev_fns[fn_name] ?  fn_ret = glob_dev_fns[fn_name]({that:this,kv:{},args:[...arguments],fn_name,arg0:arguments}) :0
147 149
             if (fn_ret){ return fn_ret.ret }; 
148 150
         } catch (err) { clog(`react_fn fn_name:${fn_name} err:`,err) }
149 151
 

+ 6
- 4
react/features/toolbox/components/web/Toolbox.js View File

@@ -1054,9 +1054,10 @@ class Toolbox extends Component<Props, State> {
1054 1054
         // clog("dev_log overflowmenu",ret)
1055 1055
         try {
1056 1056
             var fn_name = "_renderOverflowMenuContent"
1057
-            var fn_ret = glob_dev_fns[fn_name]({that:this,kv:{ret,
1057
+            var fn_ret
1058
+            glob_dev_fns[fn_name] ?  fn_ret = glob_dev_fns[fn_name]({that:this,kv:{ret,
1058 1059
                 _feedbackConfigured,_fullScreen,_screensharing,_sharingVideo,t,
1059
-            },args:[...arguments],fn_name,arg0:arguments})
1060
+            },args:[...arguments],fn_name,arg0:arguments}) : 0
1060 1061
             if (fn_ret){ return fn_ret.ret }; 
1061 1062
         } catch (err) { clog(`react_fn fn_name:${fn_name} err:`,err) }
1062 1063
         return ret
@@ -1259,11 +1260,12 @@ class Toolbox extends Component<Props, State> {
1259 1260
 
1260 1261
         try {
1261 1262
             var fn_name = "_renderToolboxContent"
1262
-            var fn_ret = glob_dev_fns[fn_name]({that:this,kv:{
1263
+            var fn_ret
1264
+            glob_dev_fns[fn_name] ?  fn_ret = glob_dev_fns[fn_name]({that:this,kv:{
1263 1265
                 overflowMenuContent,
1264 1266
                 // ret,
1265 1267
                 // _feedbackConfigured,_fullScreen,_screensharing,_sharingVideo,t,
1266
-            },args:[...arguments],fn_name,arg0:arguments})
1268
+            },args:[...arguments],fn_name,arg0:arguments}) : 0
1267 1269
             if (fn_ret){ return fn_ret.ret }; 
1268 1270
         } catch (err) { clog(`react_fn fn_name:${fn_name} err:`,err) }
1269 1271
 

Loading…
Cancel
Save