Upgrade base to 2.1.4

dkotov · Apr 2, 2015 · 61e89e2 · 61e89e2
1 parent 06052cf
commit 61e89e2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Linked by Air customization of the Harvest Chrome extension
 
-Currently based on version 2.1.2 in the 
+Currently based on version 2.1.4 in the 
 [Chrome Store](https://chrome.google.com/webstore/detail/harvest-time-tracker/fbpiglieekigmkeebmeohkelfpjjlaia)
 
 ## Additional features compared to the official version:

diff --git a/linkedbyair-harvest-chrome-extension/js/iframe.js b/linkedbyair-harvest-chrome-extension/js/iframe.js
@@ -1,18 +1,19 @@
 (function() {
   (function() {
-    var canBeClosed, nextTick, setRunningTimerIcon, shouldClose;
+    var canBeClosed, setRunningTimerIcon, shouldClose, waitUntilChromeAutofocuses;
     canBeClosed = true;
     shouldClose = false;
-    nextTick = function(callback) {
-      return window.setTimeout(callback, 0);
-    };
-    document.addEventListener("DOMContentLoaded", nextTick((function(_this) {
+    window.addEventListener("load", (function(_this) {
       return function() {
         var iframe;
         iframe = document.querySelector("iframe");
-        return iframe.src = "" + _this.config.url + "/platform/timer?service=chrome.google.com&amp;format=platform&amp;external_item_id=1&amp;external_group_id=1&amp;external_group_name=undefined";
+        waitUntilChromeAutofocuses(iframe);
+        iframe.src = "" + _this.config.url + "/platform/timer?service=chrome.google.com&format=platform&external_item_id=1&external_group_id=1";
+        return iframe.addEventListener("load", function() {
+          return iframe.classList.add("is-loaded");
+        });
       };
-    })(this)));
+    })(this));
     window.addEventListener("message", function(e) {
       var height, iframe, isRunning, matches, message;
       iframe = document.querySelector("iframe");
@@ -31,7 +32,7 @@
         return setRunningTimerIcon(isRunning);
       }
     });
-    return setRunningTimerIcon = function(isRunning) {
+    setRunningTimerIcon = function(isRunning) {
       var options, state;
       state = isRunning ? "on" : "off";
       canBeClosed = false;
@@ -50,6 +51,9 @@
         title: isRunning ? "View the running Harvest timer" : "Start a Harvest timer"
       });
     };
+    return waitUntilChromeAutofocuses = function(element) {
+      return element.getBoundingClientRect().width;
+    };
   })();
 
 }).call(this);
diff --git a/linkedbyair-harvest-chrome-extension/manifest.json b/linkedbyair-harvest-chrome-extension/manifest.json
@@ -48,6 +48,6 @@
    "name": "Linked by Air Harvest Time Tracker",
    "permissions": [ "http://*/*", "https://*/*", "cookies", "webRequest" ],
    "update_url": "https://clients2.google.com/service/update2/crx",
-   "version": "2.3.3",
+   "version": "2.3.4",
    "web_accessible_resources": [ "images/trello-timer-icon.png" ]
 }
diff --git a/linkedbyair-harvest-chrome-extension/popup.html b/linkedbyair-harvest-chrome-extension/popup.html
@@ -3,12 +3,18 @@
   <head>
     <style>
       body {
-        margin: 0;
         background: url('images/loading.gif') no-repeat center center;
+        margin: 0;
       }
       iframe {
+        background: #fff;
+        height: 286px;
+        visibility: hidden;
         width: 500px;
-        height: 300px;
+      }
+
+      iframe.is-loaded {
+        visibility: visible;
       }
     </style>