From b90175760ed8754a3bee223ac0da8980483f617c Mon Sep 17 00:00:00 2001
From: Xidorn Quan <quanxunzhen@gmail.com>
Date: Thu, 26 Feb 2015 09:27:11 +1100
Subject: [PATCH] Avoid assigning objects to window.

---
 README.md  | 22 ++++++++++------------
 index.html | 15 +++++++--------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 319919a..d2a3f80 100644
--- a/README.md
+++ b/README.md
@@ -21,21 +21,20 @@ function getIPs(callback){
     var RTCPeerConnection = window.RTCPeerConnection
         || window.mozRTCPeerConnection
         || window.webkitRTCPeerConnection;
+    var useWebKit = !!window.webkitRTCPeerConnection;
 
     //bypass naive webrtc blocking
-    if (!RTCPeerConnection) {
+    if(!RTCPeerConnection){
         var iframe = document.createElement('iframe');
         //invalidate content script
         iframe.sandbox = 'allow-same-origin';
         iframe.style.display = 'none';
         document.body.appendChild(iframe);
         var win = iframe.contentWindow;
-        window.RTCPeerConnection = win.RTCPeerConnection;
-        window.mozRTCPeerConnection = win.mozRTCPeerConnection;
-        window.webkitRTCPeerConnection = win.webkitRTCPeerConnection;
-        RTCPeerConnection = window.RTCPeerConnection
-            || window.mozRTCPeerConnection
-            || window.webkitRTCPeerConnection;
+        RTCPeerConnection = win.RTCPeerConnection
+            || win.mozRTCPeerConnection
+            || win.webkitRTCPeerConnection;
+        useWebKit = !!win.webkitRTCPeerConnection;
     }
 
     //minimal requirements for data connection
@@ -49,7 +48,7 @@ function getIPs(callback){
     var servers = undefined;
 
     //add same stun server for chrome
-    if(window.webkitRTCPeerConnection)
+    if(useWebKit)
         servers = {iceServers: [{urls: "stun:stun.services.mozilla.com"}]};
 
     //construct a new RTCPeerConnection
@@ -87,14 +86,13 @@ function getIPs(callback){
     }, function(){});
 
     //wait for a while to let everything done
-    setTimeout(function() {
+    setTimeout(function(){
         //read candidate info from local description
         var lines = pc.localDescription.sdp.split('\n');
 
-        lines.forEach(function(line) {
-            if (line.startsWith('a=candidate:')) {
+        lines.forEach(function(line){
+            if(line.startsWith('a=candidate:'))
                 handleCandidate(line);
-            }
         });
     }, 1000);
 }
diff --git a/index.html b/index.html
index 02a47c0..866fb24 100644
--- a/index.html
+++ b/index.html
@@ -28,21 +28,20 @@
                 var RTCPeerConnection = window.RTCPeerConnection
                     || window.mozRTCPeerConnection
                     || window.webkitRTCPeerConnection;
+                var useWebKit = !!window.webkitRTCPeerConnection;
 
                 //bypass naive webrtc blocking
-                if (!RTCPeerConnection) {
+                if(!RTCPeerConnection){
                     var iframe = document.createElement('iframe');
                     //invalidate content script
                     iframe.sandbox = 'allow-same-origin';
                     iframe.style.display = 'none';
                     document.body.appendChild(iframe);
                     var win = iframe.contentWindow;
-                    window.RTCPeerConnection = win.RTCPeerConnection;
-                    window.mozRTCPeerConnection = win.mozRTCPeerConnection;
-                    window.webkitRTCPeerConnection = win.webkitRTCPeerConnection;
-                    RTCPeerConnection = window.RTCPeerConnection
-                        || window.mozRTCPeerConnection
-                        || window.webkitRTCPeerConnection;
+                    RTCPeerConnection = win.RTCPeerConnection
+                        || win.mozRTCPeerConnection
+                        || win.webkitRTCPeerConnection;
+                    useWebKit = !!win.webkitRTCPeerConnection;
                 }
 
                 //minimal requirements for data connection
@@ -56,7 +55,7 @@
                 var servers = undefined;
 
                 //add same stun server for chrome
-                if(window.webkitRTCPeerConnection)
+                if(useWebKit)
                     servers = {iceServers: [{urls: "stun:stun.services.mozilla.com"}]};
 
                 //construct a new RTCPeerConnection