From 4599486290e119531268ddd36f59016ce43b627b Mon Sep 17 00:00:00 2001
From: Deathamns <deathamns@gmail.com>
Date: Sun, 8 Feb 2015 19:34:28 +0100
Subject: [PATCH] vAPI.sessionId, element-picker dialog as iframe

vAPI.sessionId - random ID generated every time when a page loads.

Having the dialog in an iframe lowers the chance of interference with the
styling of the page, also avoids using innerHTML (AMO complaint).
---
 platform/chromium/vapi-client.js | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/platform/chromium/vapi-client.js b/platform/chromium/vapi-client.js
index 4b0f562..d1d0966 100644
--- a/platform/chromium/vapi-client.js
+++ b/platform/chromium/vapi-client.js
@@ -25,14 +25,13 @@
 
 /******************************************************************************/
 
-(function() {
+(function(self) {
 
 'use strict';
 
 /******************************************************************************/
 
 var vAPI = self.vAPI = self.vAPI || {};
-
 var chrome = self.chrome;
 
 // https://github.com/gorhill/uBlock/issues/456
@@ -40,8 +39,10 @@ var chrome = self.chrome;
 if ( vAPI.vapiClientInjected ) {
     return;
 }
-vAPI.vapiClientInjected = true;
 
+vAPI.vapiClientInjected = true;
+vAPI.sessionId = String.fromCharCode(Date.now() % 25 + 97) +
+    Math.random().toString(36).slice(2);
 vAPI.chrome = true;
 
 /******************************************************************************/
@@ -85,21 +86,14 @@ var messagingConnector = function(response) {
 
 /******************************************************************************/
 
-var uniqueId = function() {
-    return Math.random().toString(36).slice(2);
-};
-
-/******************************************************************************/
-
 vAPI.messaging = {
     port: null,
     channels: {},
     listeners: {},
     requestId: 1,
-    connectorId: uniqueId(),
 
     setup: function() {
-        this.port = chrome.runtime.connect({name: this.connectorId});
+        this.port = chrome.runtime.connect({name: vAPI.sessionId});
         this.port.onMessage.addListener(messagingConnector);
     },
 
@@ -150,6 +144,6 @@ vAPI.messaging = {
 
 /******************************************************************************/
 
-})();
+})(this);
 
 /******************************************************************************/