Merge pull request #1742 from uProxy/release-candidate

Release v0.8.14

Author: iislucas

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "uProxy",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "dependencies": {
     "polymer": "^0.5.6",
     "paper-elements": "Polymer/paper-elements#^0.5.6",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "uProxy",
   "description": "Share your pathway to the Internet",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/uproxy/uproxy"
@@ -47,7 +47,7 @@
     "lodash": "^3.7.0",
     "regex2dfa": "^0.1.6",
     "tsd": "^0.5.7",
-    "uproxy-lib": "^27.2.5",
+    "uproxy-lib": "^28.0.0",
     "utransformers": "^0.2.1",
     "xregexp": "^2.0.0"
   },

src/chrome/app/manifest.json

@@ -3,7 +3,7 @@
   "name": "__MSG_appName__",
   "description": "__MSG_appDescription__",
   "minimum_chrome_version": "41.0.2272.63",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "default_locale": "en",
   "icons": {
       "128": "icons/128_online.png"

src/chrome/extension/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "__MSG_extName__",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "manifest_version": 2,
   "description": "__MSG_extDescription__",
   "minimum_chrome_version": "41.0.2272.63",

src/chrome/extension/scripts/background.ts

@@ -15,12 +15,11 @@ import UiApi = require('../../../interfaces/ui');
 import user_interface = require('../../../generic_ui/scripts/ui');
 import CoreConnector = require('../../../generic_ui/scripts/core_connector');
 import uproxy_core_api = require('../../../interfaces/uproxy_core_api');
+import Constants = require('../../../generic_ui/scripts/constants');
 
 /// <reference path='../../../freedom/typings/social.d.ts' />
 /// <reference path='../../../third_party/typings/chrome/chrome.d.ts'/>
 
-export import model = user_interface.model;
-
 // --------------------- Communicating with the App ----------------------------
 export var browserConnector :ChromeCoreConnector;  // way for ui to speak to a uProxy.CoreApi
 export var core :CoreConnector;  // way for ui to speak to a uProxy.CoreApi
@@ -63,13 +62,25 @@ chrome.runtime.onMessageExternal.addListener((request :any, sender :chrome.runti
  * updates from the Chrome App side propogate to the UI.
  */
 browserApi = new ChromeBrowserApi();
+browserConnector = new ChromeCoreConnector({ name: 'uproxy-extension-to-app-port' });
+browserConnector.onUpdate(uproxy_core_api.Update.LAUNCH_UPROXY,
+                          browserApi.bringUproxyToFront);
+
 // TODO (lucyhe): Make sure that the "install" event isn't missed if we
 // are adding the listener after the event is fired.
 chrome.runtime.onInstalled.addListener((details :chrome.runtime.InstalledDetails) => {
   if (details.reason !== 'install') {
     // we only want to launch the window on the first install
     return;
   }
+  browserConnector.onceConnected.then(() => {
+    chrome.browserAction.setIcon({
+      path: {
+        "19" : "icons/19_" + Constants.DEFAULT_ICON,
+        "38" : "icons/38_" + Constants.DEFAULT_ICON,
+      }
+    });
+  });
 
   chrome.tabs.query({currentWindow: true, active: true}, function(tabs){
       // Do not open the extension when it's installed if the user is
@@ -85,10 +96,6 @@ chrome.browserAction.onClicked.addListener((tab) => {
   browserApi.bringUproxyToFront();
 });
 
-browserConnector = new ChromeCoreConnector({ name: 'uproxy-extension-to-app-port' });
-browserConnector.onUpdate(uproxy_core_api.Update.LAUNCH_UPROXY,
-                          browserApi.bringUproxyToFront);
-
 core = new CoreConnector(browserConnector);
 var oAuth = new ChromeTabAuth();
 browserConnector.onUpdate(uproxy_core_api.Update.GET_CREDENTIALS,

src/chrome/extension/scripts/chrome_browser_api.ts

@@ -57,7 +57,7 @@ class ChromeBrowserApi implements BrowserAPI {
 
   private popupState_ = PopupState.NOT_LAUNCHED;
 
-  public fulfillLaunched : () => void;
+  public handlePopupLaunch :() => void;
   private onceLaunched_ :Promise<void>;
 
   constructor() {
@@ -169,7 +169,7 @@ class ChromeBrowserApi implements BrowserAPI {
       // after webstore installation), then allow the popup to open at a default
       // location.
       this.onceLaunched_ = new Promise<void>((F, R) => {
-        this.fulfillLaunched = F;
+        this.handlePopupLaunch = F;
       });
       chrome.windows.create({url: this.POPUP_URL,
                      type: "popup",

src/chrome/extension/scripts/chrome_core_connector.spec.ts

@@ -39,7 +39,8 @@ describe('core-connector', () => {
   chromeBrowserApi = jasmine.createSpyObj('ChromeBrowserApi',
     ['bringUproxyToFront',
      'showNotification',
-     'on']);
+     'on',
+    'handlePopupLaunch']);
 
 
 

src/chrome/extension/scripts/chrome_tab_auth.ts

@@ -34,7 +34,7 @@ class ChromeTabAuth {
       }
     };
 
-    var isActive = !user_interface.model.reconnecting;
+    var isActive = true; //TODO use actual value
     chrome.tabs.create({url: url, active: isActive},
                        function(tab: chrome.tabs.Tab) {
       if (isActive) {

src/chrome/extension/scripts/context.ts

@@ -13,7 +13,7 @@ export var browserConnector :browser_connector.CoreBrowserConnector = ui_context
 
 export var ui :user_interface.UserInterface = new user_interface.UserInterface(core, ui_context.browserApi);
 
-export var model :user_interface.Model = user_interface.model;
+export var model :user_interface.Model = ui.model;
 
 ui.browser = 'chrome';
 console.log('Loaded dependencies for Chrome Extension.');

src/firefox/data/scripts/background.ts

@@ -3,10 +3,10 @@ import CoreConnector = require('../../../generic_ui/scripts/core_connector');
 import FirefoxCoreConnector = require('./firefox_connector');
 import FirefoxBrowserApi = require('./firefox_browser_api');
 
-export import model = user_interface.model;
 export var ui   :user_interface.UserInterface;
 export var core :CoreConnector;
 export var browserConnector: FirefoxCoreConnector;
+export var model :user_interface.Model;
 function initUI() {
     browserConnector = new FirefoxCoreConnector();
     core = new CoreConnector(browserConnector);
@@ -17,6 +17,7 @@ function initUI() {
 
 if (undefined === ui) {
     ui = initUI();
+    model = ui.model;
 }
 
 ui.browser = 'firefox';