Merge pull request #2505 from uProxy/fix-cca

Attempt to fix CCA issues

Author: jpevarnek

src/cca/app/scripts/context.ts

@@ -1,10 +1,12 @@
 /// <reference path='../../../../../third_party/typings/browser.d.ts'/>
 /// <reference path='../../../generic_ui/polymer/context.d.ts' />
 
+import background_ui = require('../../../generic_ui/scripts/background_ui');
 import ui_model = require('../../../generic_ui/scripts/model');
 import user_interface = require('../../../generic_ui/scripts/ui');
 import CoreConnector = require('../../../generic_ui/scripts/core_connector');
 import CordovaCoreConnector = require('./cordova_core_connector');
+import same_context_panel_connector = require('../../../generic_ui/scripts/same_context_panel_connector');
 
 export var browserConnector = new CordovaCoreConnector({
   name: 'uproxy-ui-to-core-connector'
@@ -13,9 +15,12 @@ export var core = new CoreConnector(browserConnector);
 export var ui :user_interface.UserInterface;
 export var model :ui_model.Model;
 
+export var panelConnector = new same_context_panel_connector.SameContextPanelConnector();
+var backgroundUi = new background_ui.BackgroundUi(panelConnector, core);
+
 chrome.runtime.getBackgroundPage((bgPage) => {
   var ui_context = (<any>bgPage).ui_context;
-  ui = new user_interface.UserInterface(core, ui_context.browserApi, ui_context.backgroundUi);
+  ui = new user_interface.UserInterface(core, ui_context.browserApi, backgroundUi);
   model = ui.model;
   console.log('Got references from background page; importing vulcanized');
 

src/firefox/data/scripts/background.ts

@@ -2,10 +2,10 @@ import background_ui = require('../../../generic_ui/scripts/background_ui');
 import CoreConnector = require('../../../generic_ui/scripts/core_connector');
 import FirefoxBrowserApi = require('./firefox_browser_api');
 import FirefoxCoreConnector = require('./firefox_connector');
-import firefox_panel_connector = require('./firefox_panel_connector');
 import ui_model = require('../../../generic_ui/scripts/model');
 import panel_connector = require('../../../interfaces/panel_connector');
 import port = require('./port');
+import same_context_panel_connector = require('../../../generic_ui/scripts/same_context_panel_connector');
 import user_interface = require('../../../generic_ui/scripts/ui');
 
 export var ui   :user_interface.UserInterface;
@@ -19,7 +19,7 @@ function initUI() {
     browserConnector = new FirefoxCoreConnector();
     core = new CoreConnector(browserConnector);
     firefoxBrowserApi = new FirefoxBrowserApi();
-    panelConnector = new firefox_panel_connector.FirefoxPanelConnector();
+    panelConnector = new same_context_panel_connector.SameContextPanelConnector();
     var backgroundUi = new background_ui.BackgroundUi(panelConnector, core);
 
     return new user_interface.UserInterface(core, firefoxBrowserApi, backgroundUi);

src/generic_ui/polymer/state.ts

@@ -66,10 +66,13 @@ class Background {
   private promisesMap_: {[id: number]: FullfillAndReject} = {};
 
   constructor(state: any) {
-    if (window.chrome) {
+    if (typeof ui_context.panelConnector !== 'undefined' &&
+      typeof ui_context.panelConnector.sendMessageFromPanel === 'function') {
+      this.connector_ = new SameContextBackgroundUiConnector(this.handleMessage_);
+    } else if (window.chrome) {
       this.connector_ = new ChromeBackgroundUiConnector(this.handleMessage_);
     } else {
-      this.connector_ = new FirefoxBackgroundUiConnector(this.handleMessage_);
+      console.error('Cannot talk to background UI');
     }
 
     this.state_ = state;
@@ -152,7 +155,7 @@ class Background {
   }
 }
 
-class FirefoxBackgroundUiConnector implements panel_connector.BackgroundUiConnector {
+class SameContextBackgroundUiConnector implements panel_connector.BackgroundUiConnector {
   constructor(listener: panel_connector.MessageHandler) {
     ui_context.panelConnector.panelConnect(listener);
   }

…/data/scripts/firefox_panel_connector.ts …/scripts/same_context_panel_connector.tssrc/firefox/data/scripts/firefox_panel_connector.ts renamed to src/generic_ui/scripts/same_context_panel_connector.ts src/firefox/data/scripts/firefox_panel_connector.ts renamed to src/generic_ui/scripts/same_context_panel_connector.ts

@@ -1,12 +1,12 @@
 /**
- * In Firefox, we have a very strict singleton way of handling the panel where
- * we can guarantee that only one panel will ever be created and its state will
- * never be altered.  Given that all scripts are running in the same
- * environment, we have an insanely simple way of representing that here
+ * In some environments, we have a very strict singleton way of handling the
+ * panel where we can guarantee that only one panel will ever be created and
+ * its state will never be altered.  Given that all scripts are running in the
+ * same environment, we have an insanely simple way of representing that here
  */
-import panel_connector = require('../../../interfaces/panel_connector');
+import panel_connector = require('../../interfaces/panel_connector');
 
-export class FirefoxPanelConnector implements panel_connector.BrowserPanelConnector {
+export class SameContextPanelConnector implements panel_connector.BrowserPanelConnector {
   private connectHandler: panel_connector.PanelConnectHandler;
   private messageHandler: panel_connector.MessageHandler;
   private disconnectHandler: panel_connector.PanelDisconnectHandler;