소스 검색

Will close install Temasys plugin popup only when cancel or close button is clicked.

master
paweldomas 10 년 전
부모
커밋
b9b64242a5
1개의 변경된 파일11개의 추가작업 그리고 6개의 파일을 삭제
  1. 11
    6
      modules/RTC/adapter.screenshare.js

+ 11
- 6
modules/RTC/adapter.screenshare.js 파일 보기

@@ -1,4 +1,4 @@
1
-/*! adapterjs - custom version from - 2015-08-19 */
1
+/*! adapterjs - v0.12.0 - 2015-09-04 */
2 2
 
3 3
 // Adapter's interface.
4 4
 var AdapterJS = AdapterJS || {};
@@ -331,9 +331,10 @@ AdapterJS.renderNotificationBar = function (text, buttonText, buttonLink, openNe
331 331
     'sans-serif; font-size: .9rem; padding: 4px; vertical-align: ' +
332 332
     'middle; cursor: default;">' + text + '</span>');
333 333
   if(buttonText && buttonLink) {
334
-    c.document.write('<button id="okay">' + buttonText + '</button><button>Cancel</button>');
334
+    c.document.write('<button id="okay">' + buttonText + '</button><button id="cancel">Cancel</button>');
335 335
     c.document.close();
336 336
 
337
+    // On click on okay
337 338
     AdapterJS.addEvent(c.document.getElementById('okay'), 'click', function(e) {
338 339
       if (!!displayRefreshBar) {
339 340
         AdapterJS.renderNotificationBar(AdapterJS.TEXT.EXTENSION ?
@@ -363,12 +364,14 @@ AdapterJS.renderNotificationBar = function (text, buttonText, buttonLink, openNe
363 364
           });
364 365
       } , 500);
365 366
     });   
367
+
368
+    // On click on Cancel
369
+    AdapterJS.addEvent(c.document.getElementById('cancel'), 'click', function(e) {
370
+      w.document.body.removeChild(i);
371
+    });
366 372
   } else {
367 373
     c.document.close();
368 374
   }
369
-  AdapterJS.addEvent(c.document, 'click', function() {
370
-    w.document.body.removeChild(i);
371
-  });
372 375
   setTimeout(function() {
373 376
     if(typeof i.style.webkitTransform === 'string') {
374 377
       i.style.webkitTransform = 'translateY(40px)';
@@ -743,7 +746,7 @@ if (navigator.mozGetUserMedia) {
743 746
   // the minimum version still supported by adapter.
744 747
   webrtcMinimumVersion = 12;
745 748
 
746
-  getUserMedia = navigator.getUserMedia;
749
+  window.getUserMedia = navigator.getUserMedia.bind(navigator);
747 750
 
748 751
   attachMediaStream = function(element, stream) {
749 752
     element.srcObject = stream;
@@ -1072,9 +1075,11 @@ if (navigator.mozGetUserMedia) {
1072 1075
       }
1073 1076
       var newElement = document.getElementById(elementId);
1074 1077
       newElement.onplaying = (element.onplaying) ? element.onplaying : function (arg) {};
1078
+      newElement.onplay    = (element.onplay)    ? element.onplay    : function (arg) {};
1075 1079
       newElement.onclick   = (element.onclick)   ? element.onclick   : function (arg) {};
1076 1080
       if (isIE) { // on IE the event needs to be plugged manually
1077 1081
         newElement.attachEvent('onplaying', newElement.onplaying);
1082
+        newElement.attachEvent('onplay', newElement.onplay);
1078 1083
         newElement._TemOnClick = function (id) {
1079 1084
           var arg = {
1080 1085
             srcElement : document.getElementById(id)

Loading…
취소
저장