revert workaround to non-polymer version, but keep as typescript

UWNetworksLab · Sep 7, 2016 · acdf838 · acdf838
1 parent 1bef2e3
commit acdf838
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 50 deletions.
diff --git a/src/cca/app/index.html b/src/cca/app/index.html
@@ -11,6 +11,7 @@
   <script src='../bower/webcomponentsjs/webcomponents.min.js'></script>
 
   <script src='scripts/context.static.js'></script>
+  <script src='scripts/workarounds.js'></script>
 
   <!-- The vulcanized code will be loaded asynchronously by context.static.js -->
   <!-- <link rel='import' href='polymer/vulcanized.html'> -->
@@ -44,9 +45,8 @@
 </head>
 
 <body unresolved touch-action='auto'>
-  <!-- uproxy-root and uproxy-workarounds will be loaded after polymer is loaded (see src/cca/app/scripts/context.ts) -->
+  <!-- uproxy-root will be appended here after polymer is loaded (see src/cca/app/scripts/context.ts) -->
   <!-- <uproxy-root></uproxy-root> -->
-  <!-- <uproxy-workarounds></uproxy-workarounds> -->
 </body>
 
 </html>
diff --git a/src/cca/app/polymer/browser-elements.html b/src/cca/app/polymer/browser-elements.html
@@ -1,4 +1,3 @@
 <!doctype html>
 <!-- Imports for all Chrome-specific Polymer elements. This ensures that the elements will be vulcanized along with the generic UI Polymer elements. -->
 
-<link rel='import' href='workarounds.html'>
diff --git a/src/cca/app/polymer/workarounds.html b/src/cca/app/polymer/workarounds.html
diff --git a/src/cca/app/polymer/workarounds.ts b/src/cca/app/polymer/workarounds.ts
diff --git a/src/cca/app/scripts/context.ts b/src/cca/app/scripts/context.ts
@@ -32,10 +32,6 @@ chrome.runtime.getBackgroundPage((bgPage) => {
     // an <iframe> in this page to represent the background page.
     var root = document.createElement('uproxy-root');
     document.body.appendChild(root);
-    // Also add our <uproxy-workarounds> Polymer element defined in
-    // ../polymer/workarounds.{html,js}
-    var workarounds = document.createElement('uproxy-workarounds');
-    document.body.appendChild(workarounds);
   };
   link.onerror = function(e) {
     console.log('Error while loading polymer/vulcanized.html:', e);

diff --git a/src/cca/app/scripts/workarounds.ts b/src/cca/app/scripts/workarounds.ts
@@ -0,0 +1,34 @@
+// CCA-specific workarounds.
+
+(function () {
+  // Force a repaint every 300 ms.
+  // Extremely hacky workaround for https://crbug.com/612836
+
+  let sendResize = true;
+
+  setInterval(function () {
+    if (sendResize) {
+      window.dispatchEvent(new Event('resize'));
+    } else {
+      console.debug('suppressed resize event');
+    }
+  }, 300);
+
+  // Workaround for janky inviteUserPanel transition,
+  // which is caused by the workaround above.
+  // https://github.com/uProxy/uproxy/issues/2659
+  document.addEventListener('uproxy-root-ready', function () {
+    // The 'uproxy-root-ready' event is dispatched in the `ready()` method of
+    // the uproxy root object instantiated in src/generic_ui/polymer/root.ts.
+    console.debug('got uproxy-root-ready');
+    let inviteButton = document.querySelector('uproxy-root /deep/ #inviteButton');
+    if (!inviteButton) {
+      console.error('#inviteButton missing:', inviteButton);
+      return;
+    }
+    inviteButton.addEventListener('tap', function () {
+      sendResize = false;
+      setTimeout(function () { sendResize = true; }, 2000);
+    });
+  });
+})();
diff --git a/src/generic_ui/polymer/root.ts b/src/generic_ui/polymer/root.ts
@@ -159,7 +159,7 @@ Polymer({
       this.$.browserElementContainer.appendChild(browserCustomElement);
     }
     this.setDirectionality();
-    // Logic that depends on the uproxy-root element being loaded
+    // Logic that depends on the uproxy-root element being ready
     // (as in src/cca/app/polymer/workarounds.ts)
     // can be scheduled appropriately by listening for this event:
     document.dispatchEvent(new Event('uproxy-root-ready'));