Fix the problem that other elements could not be dragged on the web page

containing OvenPlayer
AirenSoft · Aug 2, 2021 · 29776b9 · 29776b9
1 parent a36cf03
commit 29776b9
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 30 deletions.
diff --git a/dist/development/ovenplayer/COMMITHASH b/dist/development/ovenplayer/COMMITHASH
@@ -1 +1 @@
-fc427dc9812322fb289a4a8ac05be55b57614f1e
+a36cf03101172f3d9cfd588c4125800edf290243
diff --git a/dist/development/ovenplayer/VERSION b/dist/development/ovenplayer/VERSION
@@ -1 +1 @@
-fc427dc
+a36cf03
diff --git a/dist/development/ovenplayer/ovenplayer.js b/dist/development/ovenplayer/ovenplayer.js
diff --git a/dist/development/ovenplayer/ovenplayer.sdk.js b/dist/development/ovenplayer/ovenplayer.sdk.js
diff --git a/dist/production/ovenplayer/COMMITHASH b/dist/production/ovenplayer/COMMITHASH
@@ -1 +1 @@
-fc427dc9812322fb289a4a8ac05be55b57614f1e
+a36cf03101172f3d9cfd588c4125800edf290243
diff --git a/dist/production/ovenplayer/VERSION b/dist/production/ovenplayer/VERSION
@@ -1 +1 @@
-fc427dc
+a36cf03
diff --git a/dist/production/ovenplayer/ovenplayer.js b/dist/production/ovenplayer/ovenplayer.js
diff --git a/dist/production/ovenplayer/ovenplayer.sdk.js b/dist/production/ovenplayer/ovenplayer.sdk.js
diff --git a/dist/production/ovenplayer/report.html b/dist/production/ovenplayer/report.html
diff --git a/src/js/view/components/controls/progressBar.js b/src/js/view/components/controls/progressBar.js
@@ -353,10 +353,6 @@ const ProgressBar = function($container, api, isAd){
                 drawHoverProgress(percentage);
                 drawTimeIndicator(percentage, event);
             }
-        },
-        "mousemove document" : function(event, $current, template){
-
-            event.preventDefault();
 
             if (mouseDown && !isMobile) {
                 const percentage = calculatePercentage(event);
@@ -370,7 +366,7 @@ const ProgressBar = function($container, api, isAd){
                 drawTimeIndicator(percentage, event);
             }
         },
-        "mouseup document" : function(event, $current, template){
+        "mouseup .op-progressbar" : function(event, $current, template){
 
             event.preventDefault();
 

diff --git a/src/js/view/engine/OvenTemplate.js b/src/js/view/engine/OvenTemplate.js
@@ -81,19 +81,26 @@ const OvenTemplate = function (container, templateName, playerConfig, data, even
                 }
             }, true);*/
 
+            let eventOption = null;
+
+            if (eventName.indexOf('touch') > -1) {
+                eventOption = { passive: true };
+            }
+
             //sometimes target is NodeList
             let nodeLength = $target.get().length;
+
             if(nodeLength > 1){
                 let nodeList = $target.get();
                 for(let i = 0; i < nodeLength; i ++){
-                    nodeList[i].addEventListener(eventName, wrappedFunc);
+                    nodeList[i].addEventListener(eventName, wrappedFunc, eventOption);
                 }
                 //IE NodeList doesn't have forEach. It's wack.
                 //$target.get().forEach(function($item){
                 //    $item.addEventListener(eventName, wrappedFunc);
                 //});
             }else{
-                $target.get().addEventListener(eventName, wrappedFunc);
+                $target.get().addEventListener(eventName, wrappedFunc, eventOption);
             }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		fc427dc9812322fb289a4a8ac05be55b57614f1e
		a36cf03101172f3d9cfd588c4125800edf290243