From 17ace17f331a2f1eedabb682456952a000e39a9c Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Wed, 29 May 2013 01:16:21 -0700
Subject: [PATCH 01/63] cp

---
 api_bridge.js       | 74 ++++++++++++++++++++++++++++++++++++++++++---
 background.html     |  8 ++---
 background.js       |  2 ++
 extension_server.js |  9 +++---
 manifest.json       |  6 ++--
 options.html        | 16 ----------
 popup.html          | 12 ++++----
 popup.js            | 10 ++++--
 server_model.js     | 61 ++++++++++++++++++++++++++-----------
 9 files changed, 140 insertions(+), 58 deletions(-)
 create mode 100644 background.js

diff --git a/api_bridge.js b/api_bridge.js
index 38b2286..f87603a 100644
--- a/api_bridge.js
+++ b/api_bridge.js
@@ -1,7 +1,7 @@
 /**
  * Functionality to communicate with the Asana API. This should get loaded
  * in the "server" portion of the chrome extension because it will make
- * HTTP requests and needs cross-domain priveleges.
+ * HTTP requests and needs cross-domain privileges.
  *
  * The bridge does not need to use an auth token to connect to
  * the API, because since it is a browser extension it can access
@@ -17,6 +17,26 @@ Asana.ApiBridge = {
    */
   API_VERSION: "1.0",
 
+  /**
+   * @type {Integer} How long an entry stays in the cache.
+   */
+  CACHE_TTL_MS: 15 * 60 * 1000,
+
+  /**
+   * @type {Boolean} Set to true on the server (background page), which will
+   *     actually make the API requests. Clients will just talk to the API
+   *     through the ExtensionServer.
+   *
+   */
+  is_server: false,
+
+  /**
+   * @type {dict} Map from API path to cache entry for recent GET requests.
+   *     date {Date} When cache entry was last refreshed
+   *     response {*} Cached request.
+   */
+  _cache: {},
+
   /**
    * @param opt_options {dict} Options to use; if unspecified will be loaded.
    * @return {String} The base URL to use for API requests.
@@ -37,9 +57,37 @@ Asana.ApiBridge = {
    *     data {dict} Object representing response of API call, depends on
    *         method. Only available if response was a 200.
    *     error {String?} Error message, if there was a problem.
+   * @param options {dict?}
+   *     miss_cache {Boolean} Do not check cache before requesting
    */
-  request: function(http_method, path, params, callback) {
-    var url = this.baseApiUrl() + path;
+  request: function(http_method, path, params, callback, options) {
+    var me = this;
+
+    // If we're not the server page, send a message to it to make the
+    // API request.
+    if (!me.is_server) {
+      chrome.extension.sendRequest({
+        type: "api",
+        method: http_method,
+        path: path,
+        params: params,
+        options: options || {}
+      }, callback);
+      return;
+    }
+
+    // Serve from cache first.
+    if (!options.miss_cache && http_method.toLowerCase() === "get") {
+      var data = me._readCache(path, new Date());
+      if (data) {
+        console.log("Serving request from cache", path);
+        callback(data);
+        return;
+      }
+    }
+
+    console.log("Making request to API", http_method, path);
+    var url = me.baseApiUrl() + path;
     chrome.cookies.get({
       url: url,
       name: 'ticket'
@@ -63,6 +111,9 @@ Asana.ApiBridge = {
         },
         accept: "application/json",
         success: function(data, status, xhr) {
+          if (http_method.toLowerCase() === "get") {
+            me._writeCache(path, data, new Date());
+          }
           callback(data);
         },
         error: function(xhr, status, error) {
@@ -80,7 +131,7 @@ Asana.ApiBridge = {
             }
             callback(response);
           } else {
-            callback({ error: error || status });
+            callback({ errors: [{message: error || status }]});
           }
         },
         xhrFields: {
@@ -95,5 +146,20 @@ Asana.ApiBridge = {
       }
       $.ajax(attrs);
     });
+  },
+
+  _readCache: function(path, date) {
+    var entry = this._cache[path];
+    if (entry && entry.date >= date - this.CACHE_TTL_MS) {
+      return entry.response;
+    }
+    return null;
+  },
+
+  _writeCache: function(path, response, date) {
+    this._cache[path] = {
+      response: response,
+      date: date
+    };
   }
 };
diff --git a/background.html b/background.html
index ea54961..7131ce1 100644
--- a/background.html
+++ b/background.html
@@ -1,13 +1,11 @@
 <html>
 <head>
+    <script type="text/javascript" src="jquery-1.7.1.min.js"></script>
 	<script src="asana.js"></script>
 	<script src="api_bridge.js"></script>
 	<script src="extension_server.js"></script>
+	<script src="server_model.js"></script>
     <script src="options.js"></script>
-	<script>
-
-    Asana.ExtensionServer.listen();
-
-  </script>
+	<script src="background.js"></script>
 </head>
 </html>
\ No newline at end of file
diff --git a/background.js b/background.js
new file mode 100644
index 0000000..302af45
--- /dev/null
+++ b/background.js
@@ -0,0 +1,2 @@
+Asana.ExtensionServer.listen();
+Asana.ServerModel.startPrimingCache();
diff --git a/extension_server.js b/extension_server.js
index eaeb190..fe7f42c 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -9,13 +9,14 @@ Asana.ExtensionServer = {
    * requests from page clients, which can't make cross-domain requests.
    */
   listen: function() {
-    var self = this;
+    Asana.ApiBridge.is_server = true;
     chrome.extension.onRequest.addListener(function(request, sender, sendResponse) {
       if (request.type === "api") {
         // Request to the API. Pass it on to the bridge.
-        Asana.ApiBridge.api(
-            request.method, request.path, request.data || {}, sendResponse);
-
+        Asana.ApiBridge.request(
+            request.method, request.path, request.data || {}, sendResponse,
+            request.options || {});
+        return true;  // will call sendResponse asynchronously
       } else if (request.type === "quick_add") {
         // QuickAdd request, made from a content window.
         // Open up a new popup, and set the request information on its window
diff --git a/manifest.json b/manifest.json
index e67fc44..f7d3bec 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,12 +1,12 @@
 {
   "manifest_version": 2,
   "name": "Asana Extension for Chrome",
-  "version": "0.9.1",
+  "version": "1.0.0",
   "description": "Integrates Asana with your browsing experience.",
   "icons": {
     "128": "icon128.png"
   },
-  "minimum_chrome_version": "16",
+  "minimum_chrome_version": "24",
 
   "browser_action": {
     "default_icon": "icon19.png",
@@ -30,7 +30,7 @@
       "<all_urls>"
     ],
     "exclude_matches": [
-      "*://*.asana.com/*"
+      "*://app.asana.com/*"
     ],
     "js": [
       "asana.js",
diff --git a/options.html b/options.html
index e44be0a..15d7c9d 100644
--- a/options.html
+++ b/options.html
@@ -19,22 +19,6 @@
   <td id="options">
 
   <table class="form">
-    <tr>
-      <td class="field-name">Default Workspace:</td>
-      <td class="field-value">
-        <div id="domains_group">Loading...</div>
-      </td>
-    </tr>
-    <tr>
-      <td class="field-name"></td>
-      <td class="field-notes">
-        The default workspace where new tasks are added. You can always select
-        a different workspace when you're creating a task.
-      </td>
-    </tr>
-
-    <tr><td colspan="2" class="field-spacer"></td></tr>
-
     <tr>
       <td class="field-name">Asana Host:</td>
       <td class="field-value">
diff --git a/popup.html b/popup.html
index 5d3aecf..16def5a 100644
--- a/popup.html
+++ b/popup.html
@@ -24,7 +24,12 @@
 
   <div id="content">
     <div id="add_view" style="display:none">
-      <table class="form">
+        <div id="success" style="display:none">
+            <span class="success-icon"></span>
+            Created task <a id="new_task_link" target="_blank" href=""></a>.
+        </div>
+
+        <table class="form">
         <tr>
           <td class="field-name">Name:</td>
           <td class="field-value">
@@ -64,11 +69,6 @@
       </table>
     </div>
 
-    <div id="success_view" style="display:none">
-      <span class="success-icon"></span>
-      Created task <a id="new_task_link" target="_blank" href=""></a>.
-    </div>
-
     <div id="login_view" style="display:none">
       Please <a id="login_link" href="#">log into Asana</a> to start adding
       tasks.
diff --git a/popup.js b/popup.js
index 11b2b4b..67a9224 100644
--- a/popup.js
+++ b/popup.js
@@ -67,7 +67,7 @@ window.addEventListener('load', function() {
 
 // Helper to show a named view.
 var showView = function(name) {
-  ["login", "add", "success"].forEach(function(view_name) {
+  ["login", "add"].forEach(function(view_name) {
     $("#" + view_name + "_view").css("display", view_name === name ? "" : "none");
   });
 };
@@ -118,6 +118,11 @@ var setAddEnabled = function(enabled) {
   }
 };
 
+var resetFields = function() {
+  $("#name").val("");
+  $("#notes").val("");
+};
+
 // Set the add button as being "working", waiting for the Asana request
 // to complete.
 var setAddWorking = function(working) {
@@ -197,7 +202,8 @@ var showSuccess = function(task) {
       window.close();
       return false;
     });
-    showView("success");
+    resetFields();
+    $("#success").css("display", "");
   });
 };
 
diff --git a/server_model.js b/server_model.js
index 62ca5a4..185b343 100644
--- a/server_model.js
+++ b/server_model.js
@@ -7,7 +7,7 @@
  */
 Asana.ServerModel = {
 
-  _cached_user: null,
+  CACHE_REFRESH_INTERVAL_MS: 15 * 60 * 1000,
 
   /**
    * Called by the model whenever a request is made and error occurs.
@@ -65,12 +65,12 @@ Asana.ServerModel = {
    * @param callback {Function(workspaces)} Callback on success.
    *     workspaces {dict[]}
    */
-  workspaces: function(callback, errback) {
+  workspaces: function(callback, errback, options) {
     var self = this;
     Asana.ApiBridge.request("GET", "/workspaces", {},
         function(response) {
           self._makeCallback(response, callback, errback);
-        });
+        }, options);
   },
 
   /**
@@ -79,12 +79,12 @@ Asana.ServerModel = {
    * @param callback {Function(users)} Callback on success.
    *     users {dict[]}
    */
-  users: function(workspace_id, callback) {
+  users: function(workspace_id, callback, errback, options) {
     var self = this;
     Asana.ApiBridge.request("GET", "/workspaces/" + workspace_id + "/users", {},
         function(response) {
-          self._makeCallback(response, callback);
-        });
+          self._makeCallback(response, callback, errback);
+        }, options);
   },
 
   /**
@@ -93,19 +93,12 @@ Asana.ServerModel = {
    * @param callback {Function(user)} Callback on success.
    *     user {dict[]}
    */
-  me: function(callback) {
+  me: function(callback, errback, options) {
     var self = this;
-    if (self._cached_user !== null) {
-      callback(self._cached_user);
-    } else {
-      Asana.ApiBridge.request("GET", "/users/me", {},
-          function(response) {
-            if (!response.errors) {
-              self._cached_user = response.data;
-            }
-            self._makeCallback(response, callback);
-          });
-    }
+    Asana.ApiBridge.request("GET", "/users/me", {},
+        function(response) {
+          self._makeCallback(response, callback, errback);
+        }, options);
   },
 
   /**
@@ -131,6 +124,38 @@ Asana.ServerModel = {
     } else {
       callback(response.data);
     }
+  },
+
+  startPrimingCache: function() {
+    var me = this;
+    me._cache_refresh_interval = setInterval(function() {
+      me._refreshCache();
+    }, me.CACHE_REFRESH_INTERVAL_MS);
+    me._refreshCache();
+  },
+
+  refreshCache: function() {
+    var me = this;
+    // Fetch logged-in user.
+    me.me(function(user) {
+      if (!user.errors) {
+        // Fetch list of workspaces.
+        me.workspaces(function(workspaces) {
+          if (!workspaces.errors) {
+            var i = 0;
+            // Fetch users in each workspace.
+            var fetchUsers = function() {
+              me.users(workspaces[i].id, function(workspace) {
+                if (++i < workspaces.length) {
+                  fetchUsers();
+                }
+              }, null, { miss_cache: true });
+            };
+            fetchUsers();
+          }
+        }, null, { miss_cache: true })
+      }
+    }, null, { miss_cache: true });
   }
 
 };
\ No newline at end of file

From f52ac5a2e0f2cfa17ec06660bb2ad1184c4b39e4 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Thu, 30 May 2013 15:29:22 -0700
Subject: [PATCH 02/63] removed options

---
 manifest.json   |  3 +--
 options.html    |  9 +++++++++
 popup.js        |  8 +++++---
 server_model.js | 13 ++++++++++++-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index f7d3bec..95c4bee 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Asana Extension for Chrome",
   "version": "1.0.0",
-  "description": "Integrates Asana with your browsing experience.",
+  "description": "Allows quick adding of tasks to Asana from any web page in your browser.",
   "icons": {
     "128": "icon128.png"
   },
@@ -16,7 +16,6 @@
   "background": {
     "page": "background.html"
   },
-  "options_page": "options.html",
   "permissions": [
     "tabs",
     "*://*/*",
diff --git a/options.html b/options.html
index 15d7c9d..e869141 100644
--- a/options.html
+++ b/options.html
@@ -1,4 +1,13 @@
 <html>
+<!--
+This page is no longer in use.
+
+To enable it, simply add the following line to the top level dict
+in manifest.json:
+
+  "options_page": "options.html",
+
+-->
 <head><title>Asana Options</title>
 <script type="text/javascript" src="asana.js"></script>
 <script type="text/javascript" src="options.js"></script>
diff --git a/popup.js b/popup.js
index 67a9224..c419438 100644
--- a/popup.js
+++ b/popup.js
@@ -89,8 +89,8 @@ var showAddUi = function(url, title, selected_text, options) {
             "<option value='" + workspace.id + "'>" + workspace.name + "</option>");
       });
       $("#workspace").val(options.default_workspace_id);
-      onWorkspaceChanged();
-      $("#workspace").change(onWorkspaceChanged);
+      onWorkspaceChanged(options);
+      $("#workspace").change(function() { onWorkspaceChanged(options); });
     });
   });
 };
@@ -132,10 +132,12 @@ var setAddWorking = function(working) {
 };
 
 // When the user changes the workspace, update the list of users.
-var onWorkspaceChanged = function() {
+var onWorkspaceChanged = function(options) {
   var workspace_id = readWorkspaceId();
   $("#assignee").html("<option>Loading...</option>");
   setAddEnabled(false);
+  options.default_workspace_id = workspace_id;
+  Asana.ServerModel.saveOptions(options, function() {});
   Asana.ServerModel.users(workspace_id, function(users) {
     $("#assignee").html("");
     users = users.sort(function(a, b) {
diff --git a/server_model.js b/server_model.js
index 185b343..b72d8fb 100644
--- a/server_model.js
+++ b/server_model.js
@@ -23,12 +23,23 @@ Asana.ServerModel = {
    * Requests the user's preferences for the extension.
    *
    * @param callback {Function(options)} Callback on completion.
-   *     workspaces {dict[]} See Asana.Options for details.
+   *     options {dict} See Asana.Options for details.
    */
   options: function(callback) {
     callback(Asana.Options.loadOptions());
   },
 
+  /**
+   * Saves the user's preferences for the extension.
+   *
+   * @param options {dict} See Asana.Options for details.
+   * @param callback {Function()} Callback on completion.
+   */
+  saveOptions: function(options, callback) {
+    Asana.Options.saveOptions(options);
+    callback();
+  },
+
   /**
    * Determine if the user is logged in.
    *

From 4397aa3fb3c794f5b0a0baa8cd273338d492312a Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Thu, 30 May 2013 15:32:33 -0700
Subject: [PATCH 03/63] moved success/error

---
 popup.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/popup.html b/popup.html
index 16def5a..1b6fd9d 100644
--- a/popup.html
+++ b/popup.html
@@ -17,19 +17,9 @@
     <a id="close-banner" class="close-x"></a>
   </div>
 
-  <div id="error" style="display:none">
-    <span class="error-icon"></span>
-    Sorry, an error occurred. Please try again later.
-  </div>
-
   <div id="content">
     <div id="add_view" style="display:none">
-        <div id="success" style="display:none">
-            <span class="success-icon"></span>
-            Created task <a id="new_task_link" target="_blank" href=""></a>.
-        </div>
-
-        <table class="form">
+      <table class="form">
         <tr>
           <td class="field-name">Name:</td>
           <td class="field-value">
@@ -67,6 +57,16 @@
           </td>
         </tr>
       </table>
+
+      <div id="success" style="display:none">
+        <span class="success-icon"></span>
+        Created task <a id="new_task_link" target="_blank" href=""></a>.
+      </div>
+      <div id="error" style="display:none">
+        <span class="error-icon"></span>
+        Sorry, an error occurred. Please try again later.
+      </div>
+
     </div>
 
     <div id="login_view" style="display:none">

From f42933ab0ecc1ef43a5ca0449411b6a9dadf4fe6 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Thu, 30 May 2013 16:56:47 -0700
Subject: [PATCH 04/63] fix typekit

---
 background.js   | 25 +++++++++++++++++++++++++
 load_typekit.js |  1 +
 manifest.json   |  5 ++++-
 popup.html      |  3 +++
 popup_style.css |  6 +++---
 server_model.js |  4 ++--
 6 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 load_typekit.js

diff --git a/background.js b/background.js
index 302af45..19c39b2 100644
--- a/background.js
+++ b/background.js
@@ -1,2 +1,27 @@
 Asana.ExtensionServer.listen();
 Asana.ServerModel.startPrimingCache();
+
+// Modify referer header sent to typekit, to allow it to serve to us.
+// See http://stackoverflow.com/questions/12631853/google-chrome-extensions-with-typekit-fonts
+chrome.webRequest.onBeforeSendHeaders.addListener(function(details) {
+  var requestHeaders = details.requestHeaders;
+  for (var i = 0; i < requestHeaders.length; ++i) {
+    if (requestHeaders[i].name.toLowerCase() === 'referer') {
+      // The request was certainly not initiated by a Chrome extension...
+      return;
+    }
+  }
+  // Set Referer
+  requestHeaders.push({
+    name: 'referer',
+    // Host must match the domain in our Typekit kit settings
+    value: 'https://app.asana.com/chrome-extension/abkfopjdddhbjkiamjhkmogkcfedcnml'
+  });
+  console.info(requestHeaders);
+  return {
+    requestHeaders: requestHeaders
+  };
+}, {
+  urls: ['*://use.typekit.net/*'],
+  types: ['stylesheet', 'script']
+}, ['requestHeaders','blocking']);
diff --git a/load_typekit.js b/load_typekit.js
new file mode 100644
index 0000000..25e75c3
--- /dev/null
+++ b/load_typekit.js
@@ -0,0 +1 @@
+try{Typekit.load();}catch(e){}
diff --git a/manifest.json b/manifest.json
index 95c4bee..5ded010 100644
--- a/manifest.json
+++ b/manifest.json
@@ -18,11 +18,14 @@
   },
   "permissions": [
     "tabs",
-    "*://*/*",
     "cookies",
+    "webRequest",
+    "webRequestBlocking",
+    "*://*/*",
     "*://*.asana.com/*",
     "*://localhost.org/*"
   ],
+  "content_security_policy": "script-src 'self' https://use.typekit.net; object-src 'self'",
 
   "content_scripts": [{
     "matches": [
diff --git a/popup.html b/popup.html
index 1b6fd9d..83ae6bf 100644
--- a/popup.html
+++ b/popup.html
@@ -6,6 +6,9 @@
   <script type="text/javascript" src="options.js"></script>
   <script type="text/javascript" src="api_bridge.js"></script>
   <script type="text/javascript" src="server_model.js"></script>
+  <!-- TODO: detect non-latin language and use alternate typekit -->
+  <script type="text/javascript" src="https://use.typekit.net/sli4yxq.js"></script>
+  <script type="text/javascript" src="load_typekit.js"></script>
   <link rel="stylesheet" href="common.css"/>
   <link rel="stylesheet" href="popup_style.css"/>
 </head>
diff --git a/popup_style.css b/popup_style.css
index 15e99c7..6d9efb9 100644
--- a/popup_style.css
+++ b/popup_style.css
@@ -10,13 +10,14 @@ body {
   border: 1px solid #AFBCC8;
   -webkit-border-radius: 6px;
   font-size: 14px;
-  font-family: "Helvetica Neue", Arial, sans-serif;
+  font-family: proxima-nova, "Helvetica Neue", Arial, sans-serif;
 }
 
 
 #banner {
   font-size: 17px;
   font-weight: 800;
+  font-family: proxima-nova;
   background-color:#f2f2f2;
   padding: 10px 14px 8px;
   color: #596573;
@@ -25,7 +26,6 @@ body {
   border-bottom: 1px solid #E5E5E5;
   -webkit-box-shadow: inset 0px -1px rgba(0,0,0,0.1);
   -webkit-border-radius: 5px 5px 0px 0px;
-
 }
 
 #content {
@@ -123,6 +123,6 @@ input, textarea {
 }
 select, input, textarea {
   font-size: 14px;
-  font-family: "Helvetica Neue", Arial, sans-serif;
+  font-family: proxima-nova, "Helvetica Neue", Arial, sans-serif;
   color: #212F40;
 }
\ No newline at end of file
diff --git a/server_model.js b/server_model.js
index b72d8fb..5802a8a 100644
--- a/server_model.js
+++ b/server_model.js
@@ -140,9 +140,9 @@ Asana.ServerModel = {
   startPrimingCache: function() {
     var me = this;
     me._cache_refresh_interval = setInterval(function() {
-      me._refreshCache();
+      me.refreshCache();
     }, me.CACHE_REFRESH_INTERVAL_MS);
-    me._refreshCache();
+    me.refreshCache();
   },
 
   refreshCache: function() {

From dc8478aa6c4924e7f99dc113f0538f1268c0a8ec Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Thu, 30 May 2013 18:02:05 -0700
Subject: [PATCH 05/63] styling

---
 background.js   |  2 +-
 popup.html      | 39 ++++++++++++++--------------
 popup.js        | 24 +++++++++++------
 popup_style.css | 69 ++++++++++++++++++++++++++++++++++++++++++++-----
 4 files changed, 100 insertions(+), 34 deletions(-)

diff --git a/background.js b/background.js
index 19c39b2..5eff847 100644
--- a/background.js
+++ b/background.js
@@ -15,7 +15,7 @@ chrome.webRequest.onBeforeSendHeaders.addListener(function(details) {
   requestHeaders.push({
     name: 'referer',
     // Host must match the domain in our Typekit kit settings
-    value: 'https://app.asana.com/chrome-extension/abkfopjdddhbjkiamjhkmogkcfedcnml'
+    value: 'https://abkfopjdddhbjkiamjhkmogkcfedcnml'
   });
   console.info(requestHeaders);
   return {
diff --git a/popup.html b/popup.html
index 83ae6bf..52e3603 100644
--- a/popup.html
+++ b/popup.html
@@ -15,13 +15,17 @@
 
 <body>
 
-  <div id="banner">
-    Add to Asana
-    <a id="close-banner" class="close-x"></a>
-  </div>
-
-  <div id="content">
-    <div id="add_view" style="display:none">
+  <div id="add_view" style="display:none">
+    <div class="banner">
+      <span class="banner-add">
+        Add to
+        <span id="workspace"></span>
+        <span class="button"><span class="dropdown-arrow"></span></span>
+        <select id="workspace_select"><option>Loading...</option></select>
+      </span>
+      <a id="close_banner" class="close-x"></a>
+    </div>
+    <div class="content">
       <table class="form">
         <tr>
           <td class="field-name">Name:</td>
@@ -37,13 +41,6 @@
           </td>
         </tr>
 
-        <tr>
-          <td class="field-name">Workspace:</td>
-          <td class="field-value">
-            <select id="workspace"><option>Loading...</option></select>
-          </td>
-        </tr>
-
         <tr>
           <td class="field-name">Assignee:</td>
           <td class="field-value">
@@ -69,14 +66,18 @@
         <span class="error-icon"></span>
         Sorry, an error occurred. Please try again later.
       </div>
-
     </div>
+  </div>
 
-    <div id="login_view" style="display:none">
-      Please <a id="login_link" href="#">log into Asana</a> to start adding
-      tasks.
+  <div id="login_view" style="display:none">
+    <div class="banner">
+      Add to Asana
+      <a id="close-banner" class="close-x"></a>
+    </div>
+    <div class="content">
+      You must log in to Asana before you can add tasks.
+      <span class="button"><span class="button-text">Log In to Asana</span></span>
     </div>
-
   </div>
 
 </body>
diff --git a/popup.js b/popup.js
index c419438..f9fc7ca 100644
--- a/popup.js
+++ b/popup.js
@@ -83,14 +83,15 @@ var showAddUi = function(url, title, selected_text, options) {
   Asana.ServerModel.me(function(user) {
     // Just to cache result.
     Asana.ServerModel.workspaces(function(workspaces) {
-      $("#workspace").html("");
+      var select = $("#workspace_select");
+      select.html("");
       workspaces.forEach(function(workspace) {
-        $("#workspace").append(
+        $("#workspace_select").append(
             "<option value='" + workspace.id + "'>" + workspace.name + "</option>");
       });
-      $("#workspace").val(options.default_workspace_id);
+      select.val(options.default_workspace_id);
       onWorkspaceChanged(options);
-      $("#workspace").change(function() { onWorkspaceChanged(options); });
+      select.change(function() { onWorkspaceChanged(options); });
     });
   });
 };
@@ -134,10 +135,17 @@ var setAddWorking = function(working) {
 // When the user changes the workspace, update the list of users.
 var onWorkspaceChanged = function(options) {
   var workspace_id = readWorkspaceId();
-  $("#assignee").html("<option>Loading...</option>");
-  setAddEnabled(false);
+
+  // Update selected workspace
+  $("#workspace").html($("#workspace_select option:selected").text());
+
+  // Save selection as new default.
   options.default_workspace_id = workspace_id;
   Asana.ServerModel.saveOptions(options, function() {});
+
+  // Update assignee list.
+  $("#assignee").html("<option>Loading...</option>");
+  setAddEnabled(false);
   Asana.ServerModel.users(workspace_id, function(users) {
     $("#assignee").html("");
     users = users.sort(function(a, b) {
@@ -159,7 +167,7 @@ var readAssignee = function() {
 };
 
 var readWorkspaceId = function() {
-  return $("#workspace").val();
+  return $("#workspace_select").val();
 };
 
 var createTask = function() {
@@ -228,4 +236,4 @@ window.addEventListener("keydown", function(e) {
   }
 }, /*capture=*/false);
 
-$("#close-banner").click(function() { window.close(); });
+$("#close_banner").click(function() { window.close(); });
diff --git a/popup_style.css b/popup_style.css
index 6d9efb9..69010e3 100644
--- a/popup_style.css
+++ b/popup_style.css
@@ -1,4 +1,49 @@
 /* Styles for popup.html */
+
+.button {
+  display:inline-block;
+  font-size: 12px;
+  font-weight: $semibold;
+  line-height: 100%;
+  white-space: nowrap;
+  cursor: pointer;
+  text-align: center;
+  padding: 4px 5px 4px 10px;
+  -webkit-border-radius: 3px 3px 3px 3px;
+  -webkit-box-shadow: inset 0px -1px $border_shadow;
+}
+.button.disabled {
+  background: $gray95;
+  border-color: $gray80;
+  outline: none;
+  -webkit-box-shadow: none;
+  cursor: auto;
+}
+.button.disabled .button-text {
+  color: $gray_text;
+  text-shadow: none;
+}
+.button.disabled:hover {
+  background: $gray95;
+  border-color: $gray80;
+  outline: none;
+  -webkit-box-shadow: none;
+}
+.button.disabled:hover .button-text {
+  color: $gray_text;
+  text-shadow: none;
+}
+.button:focus {
+  @include box-shadow(0px 0px 6px 3px $blueglow);
+  outline: none;
+}
+
+.dropdown-arrow {
+
+}
+
+/* Popup-specific elements */
+
 body {
   overflow: hidden;
   width: 410px;
@@ -13,22 +58,34 @@ body {
   font-family: proxima-nova, "Helvetica Neue", Arial, sans-serif;
 }
 
-
-#banner {
-  font-size: 17px;
-  font-weight: 800;
+.banner {
+  font-size: 20px;
   font-family: proxima-nova;
+  font-weight: 600;
   background-color:#f2f2f2;
   padding: 10px 14px 8px;
   color: #596573;
-  text-transform: uppercase;
   text-shadow: 0px 1px #fff;
   border-bottom: 1px solid #E5E5E5;
   -webkit-box-shadow: inset 0px -1px rgba(0,0,0,0.1);
   -webkit-border-radius: 5px 5px 0px 0px;
 }
 
-#content {
+.banner-add {
+  position: relative;
+}
+
+.banner-add #workspace {
+  font-weight: 200;
+}
+
+#workspace_select {
+  opacity: 0;
+  position: absolute;
+  right: 0px;
+}
+
+.content {
   padding: 10px 14px;
   width: 100%;
 }

From 15ee2ffc04a44a3b6131d8fa4539d3fcd87830d2 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Thu, 30 May 2013 19:00:28 -0700
Subject: [PATCH 06/63] changing layout, wip

---
 common.css => options.css |  59 ++++++++++-
 options.html              |   3 +-
 options_style.css         |  53 ----------
 popup.css                 | 215 ++++++++++++++++++++++++++++++++++++++
 popup.html                | 118 +++++++++++++--------
 popup.js                  |  38 +++++--
 popup_style.css           | 185 --------------------------------
 7 files changed, 375 insertions(+), 296 deletions(-)
 rename common.css => options.css (71%)
 delete mode 100644 options_style.css
 create mode 100644 popup.css
 delete mode 100644 popup_style.css

diff --git a/common.css b/options.css
similarity index 71%
rename from common.css
rename to options.css
index 7c816a7..337d8b7 100644
--- a/common.css
+++ b/options.css
@@ -1,3 +1,4 @@
+/* Common styles? */
 body, td, div {
   font-size: 14px;
   font-family: "Helvetica Neue", Arial, sans-serif;
@@ -5,8 +6,8 @@ body, td, div {
 }
 
 .close-x {
+  display: block;
   cursor: pointer;
-  float: right;
   width: 14px;
   height: 14px;
   background-image: url(sprite.png);
@@ -75,4 +76,60 @@ a:link, a:visited {
 }
 a:hover {
   text-decoration: underline;
+}
+
+
+
+/* Styles for options.html */
+body {
+  padding: 0;
+  margin: 0;
+  background-color: #DDE4EA;
+}
+body, td, div {
+  font-size: 13px;
+}
+
+#layout {
+  width: 100%;
+}
+#options {
+  width: 600px;
+  min-width: 600px;
+  max-width: 600px;
+}
+
+#status {
+  height: 30px;
+}
+
+.v-spacer {
+  height: 100px;
+}
+.form {
+    border: 0;
+    margin: 0;
+    padding: 0;
+}
+td.field-name {
+    width: 150px;
+    padding: 2px 2px 2px 0;
+    vertical-align: top;
+}
+td.field-value {
+    padding: 2px 0 2px 2px;
+    vertical-align: top;
+}
+td.field-notes {
+    font-size: 11px;
+    margin-top: 12px;
+    padding: 2px 0 2px 2px;
+    vertical-align: top;
+}
+td.field-spacer {
+    height: 12px;
+}
+
+#reset_button {
+    margin-left: 10px;
 }
\ No newline at end of file
diff --git a/options.html b/options.html
index e869141..fdede4a 100644
--- a/options.html
+++ b/options.html
@@ -15,8 +15,7 @@
 <script type="text/javascript" src="api_bridge.js"></script>
 <script type="text/javascript" src="jquery-1.7.1.min.js"></script>
 <script type="text/javascript" src="jquery-ui-1.8.10.custom.min.js"></script>
-<link rel="stylesheet" href="common.css"/>
-<link rel="stylesheet" href="options_style.css"/>
+<link rel="stylesheet" href="options.css"/>
 <script type="text/javascript" src="options_page.js"></script>
 </head>
 
diff --git a/options_style.css b/options_style.css
deleted file mode 100644
index fe382ed..0000000
--- a/options_style.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Styles for options.html */
-body {
-  padding: 0;
-  margin: 0;
-  background-color: #DDE4EA;
-}
-body, td, div {
-  font-size: 13px;
-}
-
-#layout {
-  width: 100%;
-}
-#options {
-  width: 600px;
-  min-width: 600px;
-  max-width: 600px;
-}
-
-#status {
-  height: 30px;
-}
-
-.v-spacer {
-  height: 100px;
-}
-.form {
-    border: 0;
-    margin: 0;
-    padding: 0;
-}
-td.field-name {
-    width: 150px;
-    padding: 2px 2px 2px 0;
-    vertical-align: top;
-}
-td.field-value {
-    padding: 2px 0 2px 2px;
-    vertical-align: top;
-}
-td.field-notes {
-    font-size: 11px;
-    margin-top: 12px;
-    padding: 2px 0 2px 2px;
-    vertical-align: top;
-}
-td.field-spacer {
-    height: 12px;
-}
-
-#reset_button {
-    margin-left: 10px;
-}
\ No newline at end of file
diff --git a/popup.css b/popup.css
new file mode 100644
index 0000000..4cbd73d
--- /dev/null
+++ b/popup.css
@@ -0,0 +1,215 @@
+/* Styles for popup.html */
+
+/* Common widgets, from Asana app */
+
+.close-x {
+  display: block;
+  cursor: pointer;
+  width: 14px;
+  height: 14px;
+  background-image: url(sprite.png);
+  background-position: 0px -100px;
+  background-repeat: no-repeat;
+}
+.close-x:hover {
+  background-position: -50px -100px;
+}
+
+
+.button {
+  border-radius: 3px 3px 3px 3px;
+  -webkit-border-radius: 3px 3px 3px 3px;
+  box-shadow: inset 0px -1px rgba(0,0,0,0.12);
+  -webkit-box-shadow: inset 0px -1px rgba(0,0,0,0.12);
+  display:inline-block;
+  padding: 4px 10px 5px;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 100%;
+  white-space: nowrap;
+  cursor: pointer;
+  text-align: center;
+}
+.button .button-text {
+  display: inline-block;
+}
+
+.primary-button {
+  color: white;
+  text-shadow: 0px -1px #114D97;
+  border: 1px solid #114D97;
+  background-color: #1F8DD6;
+  background-image: -webkit-gradient(linear,left top,left bottom,from(#74C1ED), color-stop(10%, #1F8DD6));
+}
+.primary-button:hover {
+  background-color: #1F8DD6;
+  background-image: -webkit-gradient(linear,left top,left bottom,from(#74C1ED), color-stop(100%, #1F8DD6));
+  border: 1px solid #114D97;
+}
+.primary-button:hover .button-text {
+  color: white;
+  text-shadow: 0px -1px #114D97;
+}
+.primary-button:focus {
+  box-shadow: 0px 0px 6px 3px rgba(31,141,214,0.3);
+  -webkit-box-shadow: 0px 0px 6px 3px rgba(31,141,214,0.3);
+  outline: none;
+}
+
+.primary-button.disabled, .primary-button.disabled:hover {
+  background: #F2F2F2;
+  border-color: #CCCCCC;
+  outline: none;
+  box-shadow: none;
+  -webkit-box-shadow: none;
+}
+.primary-button.disabled .button-text, .primary-button.disabled:hover .button-text {
+  color: #999999;
+  text-shadow: none;
+}
+
+a:link, a:visited {
+  color: #1F8DD6;
+  text-decoration: none;
+}
+a:hover {
+  text-decoration: underline;
+}
+
+/* Popup-specific layout */
+
+body {
+  overflow: hidden;
+  width: 410px;
+  height: 310px;  /* keep this correct for the window-based (non-button) version */
+  padding: 0px;
+  margin: 0px;
+  margin-top: 1px;
+  background-color: #fff;
+  font-size: 14px;
+  font-family: proxima-nova, "Helvetica Neue", Arial, sans-serif;
+}
+
+.left-column {
+  display: inline-block;
+  margin-left: 12px;
+  width: 26px;
+}
+.middle-column {
+  display: inline-block;
+  width: 342px;
+  padding: 0 8px 0 8px;
+}
+.right-column {
+  display: inline-block;
+  margin-right: 12px;
+  width: 26px;
+}
+
+/* Popup areas */
+
+.banner {
+  font-size: 20px;
+  font-weight: 600;
+  background-color:#f2f2f2;
+  padding: 10px 14px 8px;
+  color: #596573;
+  text-shadow: 0px 1px #fff;
+  border-bottom: 1px solid #E5E5E5;
+  -webkit-box-shadow: inset 0px -1px rgba(0,0,0,0.1);
+  -webkit-border-radius: 5px 5px 0px 0px;
+}
+
+.banner-add {
+  position: relative;
+}
+
+.banner-add #workspace {
+  font-weight: 200;
+}
+
+#workspace_select {
+  opacity: 0;
+  position: absolute;
+  right: 0px;
+}
+
+
+.name-row {
+  padding-top: 14px;
+}
+.name-row #name {
+  font-size: 20px;
+  width: 100%;
+}
+
+.notes-row #notes {
+  width: 100%;
+  resize: none;
+  height: 96px;
+}
+
+.footer {
+  background: xcxc;
+  padding: 8px 0 10px 0;
+}
+
+
+#error {
+  width: 100%;
+  padding: 10px 14px;
+  background-color: #434C56;
+  font-weight: 500;
+  color: #ECF0F3;
+}
+.icon-error {
+  background-image: url(sprite.png);
+  background-position: 0px 0px;
+  background-repeat: no-repeat;
+  width: 19px;
+  min-width: 19px;
+  height: 16px;
+  min-height: 16px;
+  margin-bottom: -2px;
+  display: inline-block;
+
+}
+
+
+#add_view {
+  padding-bottom: 12px;
+}
+
+
+#login_view {
+  padding-top: 10px;
+  width: 100%;
+  text-align: center;
+  font-weight: 600;
+  width: 382px;
+}
+
+.icon-success {
+  background-image: url(sprite.png);
+  background-position: 0px -50px;
+  background-repeat: no-repeat;
+  width: 19px;
+  min-width: 19px;
+  height: 16px;
+  min-height: 16px;
+  margin-bottom: -2px;
+  display: inline-block;
+}
+
+input, textarea {
+  -webkit-border-radius: 3px;
+  border: 1px solid rgba(0,0,0,0.2);
+  color: #212F40;
+  padding: 4px 5px 3px;
+  -webkit-box-shadow: inset 0px 1px 1px rgba(0,0,0,0.1), 0px 1px #fff;
+}
+select, input, textarea {
+  font-size: 14px;
+  font-family: proxima-nova, "Helvetica Neue", Arial, sans-serif;
+  color: #212F40;
+}
\ No newline at end of file
diff --git a/popup.html b/popup.html
index 52e3603..4123932 100644
--- a/popup.html
+++ b/popup.html
@@ -9,63 +9,91 @@
   <!-- TODO: detect non-latin language and use alternate typekit -->
   <script type="text/javascript" src="https://use.typekit.net/sli4yxq.js"></script>
   <script type="text/javascript" src="load_typekit.js"></script>
-  <link rel="stylesheet" href="common.css"/>
-  <link rel="stylesheet" href="popup_style.css"/>
+  <link rel="stylesheet" href="popup.css"/>
 </head>
 
 <body>
 
   <div id="add_view" style="display:none">
     <div class="banner">
-      <span class="banner-add">
-        Add to
-        <span id="workspace"></span>
-        <span class="button"><span class="dropdown-arrow"></span></span>
-        <select id="workspace_select"><option>Loading...</option></select>
-      </span>
-      <a id="close_banner" class="close-x"></a>
+      <div class="left-column"></div>
+      <div class="middle-column">
+        <span class="banner-add">
+          Add to
+          <span id="workspace"></span>
+          <span id="workspace_select_container">
+            <span class="button"><span class="dropdown-arrow"></span></span>
+            <select id="workspace_select"><option>Loading...</option></select>
+          </span>
+        </span>
+      </div>
+      <div class="right-column">
+        <a id="close_popup" class="close-x"></a>
+      </div>
     </div>
-    <div class="content">
-      <table class="form">
-        <tr>
-          <td class="field-name">Name:</td>
-          <td class="field-value">
-            <input id="name"/>
-          </td>
-        </tr>
+    <div class="name-row">
+      <div class="left-column">
+        <span class="icon-checkbox"></span>
+      </div>
+      <div class="middle-column">
+        <input id="name"/>
+      </div>
+      <div class="right-column">
+        <span id="use_page_details" class="button" title="Use page title for task details"><span class="icon-use-link"></span></span>
+      </div>
+    </div>
+    <div class="notes-row">
+      <div class="left-column">
+        <span class="icon-notes"></span>
+      </div>
+      <div class="middle-column">
+        <textarea id="notes" placeholder="Description"></textarea>
+      </div>
+      <div class="right-column"></div>
+    </div>
+    <div class="assignee-row">
+      <div class="left-column">
+        <span class="icon-assignee"></span>
+      </div>
+      <div class="middle-column">
+        <div class="without-assignee">
+          <input id=""
+        </div>
+        <div class="with-assignee">
 
-        <tr>
-          <td class="field-name">Notes:</td>
-          <td class="field-value">
-            <textarea id="notes"></textarea>
-          </td>
-        </tr>
+        </div>
 
-        <tr>
-          <td class="field-name">Assignee:</td>
-          <td class="field-value">
-            <select id="assignee"><option>Loading...</option></select>
-          </td>
-        </tr>
+      </div>
+      <div class="right-column"></div>
+    </div>
 
-        <tr>
-          <td class="field-name"></td>
-          <td class="field-value">
-            <div id="add_button" tabindex="0" class="button primary-button disabled">
-              <span class="button-text">Add to Asana</span>
-            </div>
-          </td>
-        </tr>
-      </table>
+    <div class="footer">
+      <div class="left-column"></div>
+      <div class="middle-column">
+        <div id="add_button" tabindex="0" class="button primary-button disabled">
+          <span class="button-text">Add to Asana</span>
+        </div>
+      </div>
+    </div>
+
+    <div id="success" style="display:none">
+      <div class="left-column">
+        <span class="icon-success"></span>
+      </div>
+      <div class="middle-column">
+        Added <a id="new_task_link" target="_blank" href=""></a> to <span id="new_task_workspace_name"></span>.
+      </div>
+      <div class="right-column"></div>
+    </div>
 
-      <div id="success" style="display:none">
-        <span class="success-icon"></span>
-        Created task <a id="new_task_link" target="_blank" href=""></a>.
+    <div id="error" style="display:none">
+      <div class="left-column">
+        <span class="icon-error"></span>
       </div>
-      <div id="error" style="display:none">
-        <span class="error-icon"></span>
-        Sorry, an error occurred. Please try again later.
+      <div class="middle-column">
+        There was an error. Your task was not added.
       </div>
+      <div class="right-column"></div>
     </div>
   </div>
 
@@ -76,7 +104,7 @@
     </div>
     <div class="content">
       You must log in to Asana before you can add tasks.
-      <span class="button"><span class="button-text">Log In to Asana</span></span>
+      <span id="login_button" class="button"><span class="button-text">Log In to Asana</span></span>
     </div>
   </div>
 
diff --git a/popup.js b/popup.js
index f9fc7ca..7458f6e 100644
--- a/popup.js
+++ b/popup.js
@@ -1,3 +1,9 @@
+PopupState = {
+  title: null,
+  url: null,
+  selected_text: null
+};
+
 window.addEventListener('load', function() {
 
   // Our default error handler.
@@ -78,8 +84,9 @@ var showAddUi = function(url, title, selected_text, options) {
   showView("add");
   $("#notes").val(url + selected_text);
   $("#name").val(title);
-  $("#name").focus();
-  $("#name").select();
+  var name_input = $("#name");
+  name_input.focus();
+  name_input.select();
   Asana.ServerModel.me(function(user) {
     // Just to cache result.
     Asana.ServerModel.workspaces(function(workspaces) {
@@ -89,6 +96,11 @@ var showAddUi = function(url, title, selected_text, options) {
         $("#workspace_select").append(
             "<option value='" + workspace.id + "'>" + workspace.name + "</option>");
       });
+      if (workspaces.length > 1) {
+        $("workspace_select_container").show();
+      } else {
+        $("workspace_select_container").hide();
+      }
       select.val(options.default_workspace_id);
       onWorkspaceChanged(options);
       select.change(function() { onWorkspaceChanged(options); });
@@ -204,10 +216,12 @@ var hideError = function() {
 var showSuccess = function(task) {
   Asana.ServerModel.taskViewUrl(task, function(url) {
     var name = task.name.replace(/^\s*/, "").replace(/\s*$/, "");
-    $("#new_task_link").attr("href", url);
-    $("#new_task_link").text(name !== "" ? name : "unnamed task");
-    $("#new_task_link").unbind("click");
-    $("#new_task_link").click(function() {
+    $("#new_task_workspace_name").text("xcxc");
+    var link = $("#new_task_link");
+    link.attr("href", url);
+    link.text(name !== "" ? name : "unnamed task");
+    link.unbind("click");
+    link.click(function() {
       chrome.tabs.create({url: url});
       window.close();
       return false;
@@ -219,9 +233,7 @@ var showSuccess = function(task) {
 
 // Helper to show the login page.
 var showLogin = function(url) {
-  $("#login_link").attr("href", url);
-  $("#login_link").unbind("click");
-  $("#login_link").click(function() {
+  $("#login_button").click(function() {
     chrome.tabs.create({url: url});
     window.close();
     return false;
@@ -236,4 +248,10 @@ window.addEventListener("keydown", function(e) {
   }
 }, /*capture=*/false);
 
-$("#close_banner").click(function() { window.close(); });
+$("#close_popup").click(function() {
+  window.close();
+});
+
+$("#use_page_details").click(function() {
+  //xcxc
+});
diff --git a/popup_style.css b/popup_style.css
deleted file mode 100644
index 69010e3..0000000
--- a/popup_style.css
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Styles for popup.html */
-
-.button {
-  display:inline-block;
-  font-size: 12px;
-  font-weight: $semibold;
-  line-height: 100%;
-  white-space: nowrap;
-  cursor: pointer;
-  text-align: center;
-  padding: 4px 5px 4px 10px;
-  -webkit-border-radius: 3px 3px 3px 3px;
-  -webkit-box-shadow: inset 0px -1px $border_shadow;
-}
-.button.disabled {
-  background: $gray95;
-  border-color: $gray80;
-  outline: none;
-  -webkit-box-shadow: none;
-  cursor: auto;
-}
-.button.disabled .button-text {
-  color: $gray_text;
-  text-shadow: none;
-}
-.button.disabled:hover {
-  background: $gray95;
-  border-color: $gray80;
-  outline: none;
-  -webkit-box-shadow: none;
-}
-.button.disabled:hover .button-text {
-  color: $gray_text;
-  text-shadow: none;
-}
-.button:focus {
-  @include box-shadow(0px 0px 6px 3px $blueglow);
-  outline: none;
-}
-
-.dropdown-arrow {
-
-}
-
-/* Popup-specific elements */
-
-body {
-  overflow: hidden;
-  width: 410px;
-  height: 310px;  /* keep this correct for the window-based (non-button) version */
-  padding: 0px;
-  margin: 0px;
-  margin-top: 1px;
-  background-color: #fff;
-  border: 1px solid #AFBCC8;
-  -webkit-border-radius: 6px;
-  font-size: 14px;
-  font-family: proxima-nova, "Helvetica Neue", Arial, sans-serif;
-}
-
-.banner {
-  font-size: 20px;
-  font-family: proxima-nova;
-  font-weight: 600;
-  background-color:#f2f2f2;
-  padding: 10px 14px 8px;
-  color: #596573;
-  text-shadow: 0px 1px #fff;
-  border-bottom: 1px solid #E5E5E5;
-  -webkit-box-shadow: inset 0px -1px rgba(0,0,0,0.1);
-  -webkit-border-radius: 5px 5px 0px 0px;
-}
-
-.banner-add {
-  position: relative;
-}
-
-.banner-add #workspace {
-  font-weight: 200;
-}
-
-#workspace_select {
-  opacity: 0;
-  position: absolute;
-  right: 0px;
-}
-
-.content {
-  padding: 10px 14px;
-  width: 100%;
-}
-
-#error {
-  width: 100%;
-  padding: 10px 14px;
-  background-color: #434C56;
-  font-weight: 500;
-  color: #ECF0F3;
-}
-.error-icon {
-  background-image: url(sprite.png);
-  background-position: 0px 0px;
-  background-repeat: no-repeat;
-  width: 19px;
-  min-width: 19px;
-  height: 16px;
-  min-height: 16px;
-  margin-bottom: -2px;
-  display: inline-block;
-
-}
-
-
-#add_view {
-  padding-bottom: 12px;
-}
-
-.form {
-  border: 0;
-  margin: 0;
-  padding: 0;
-}
-.field-name {
-  width: 80px;
-  padding: 6px 2px 2px 0px;
-  vertical-align: top;
-  font-size: 12px;
-  font-weight: bold;
-  color: #999999;
-  
-}
-.field-value {
-    width: 294px;
-    padding: 2px 0 2px 2px;
-    vertical-align: top;
-}
-#name {
-    width: 100%;
-}
-#notes {
-    width: 100%;
-    height: 100px;
-}
-#add_button {
-    margin-top: 10px;
-}
-
-#login_view {
-    padding-top: 10px;
-    width: 100%;
-    text-align: center;
-    font-weight: 600;
-    width: 382px;
-}
-#success_view {
-    padding-top: 84px;
-    text-align: center;
-    font-weight: 600;
-    width: 382px;
-    
-}
-.success-icon {
-  background-image: url(sprite.png);
-  background-position: 0px -50px;
-  background-repeat: no-repeat;
-  width: 19px;
-  min-width: 19px;
-  height: 16px;
-  min-height: 16px;
-  margin-bottom: -2px;
-  display: inline-block;
-
-}
-input, textarea {
-  -webkit-border-radius: 3px;
-  border: 1px solid rgba(0,0,0,0.2);
-  color: #212F40;
-  padding: 4px 5px 3px;
-  -webkit-box-shadow: inset 0px 1px 1px rgba(0,0,0,0.1), 0px 1px #fff;
-}
-select, input, textarea {
-  font-size: 14px;
-  font-family: proxima-nova, "Helvetica Neue", Arial, sans-serif;
-  color: #212F40;
-}
\ No newline at end of file

From 401fdb8fb6436ee58d456a650a624bc24b6f4728 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Thu, 30 May 2013 20:10:30 -0700
Subject: [PATCH 07/63] fixed API communication

---
 api_bridge.js       |   5 +-
 extension_server.js |   4 +-
 popup.html          |   7 +-
 popup.js            | 480 ++++++++++++++++++++++++--------------------
 quick_add_client.js |   2 +-
 selection_client.js |   2 +-
 6 files changed, 272 insertions(+), 228 deletions(-)

diff --git a/api_bridge.js b/api_bridge.js
index f87603a..73b0808 100644
--- a/api_bridge.js
+++ b/api_bridge.js
@@ -66,7 +66,8 @@ Asana.ApiBridge = {
     // If we're not the server page, send a message to it to make the
     // API request.
     if (!me.is_server) {
-      chrome.extension.sendRequest({
+      console.info("Client API Request", http_method, path, params);
+      chrome.runtime.sendMessage({
         type: "api",
         method: http_method,
         path: path,
@@ -76,6 +77,8 @@ Asana.ApiBridge = {
       return;
     }
 
+    console.info("Server API Request", http_method, path, params);
+
     // Serve from cache first.
     if (!options.miss_cache && http_method.toLowerCase() === "get") {
       var data = me._readCache(path, new Date());
diff --git a/extension_server.js b/extension_server.js
index fe7f42c..e340b90 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -10,11 +10,11 @@ Asana.ExtensionServer = {
    */
   listen: function() {
     Asana.ApiBridge.is_server = true;
-    chrome.extension.onRequest.addListener(function(request, sender, sendResponse) {
+    chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
       if (request.type === "api") {
         // Request to the API. Pass it on to the bridge.
         Asana.ApiBridge.request(
-            request.method, request.path, request.data || {}, sendResponse,
+            request.method, request.path, request.params, sendResponse,
             request.options || {});
         return true;  // will call sendResponse asynchronously
       } else if (request.type === "quick_add") {
diff --git a/popup.html b/popup.html
index 4123932..be517d7 100644
--- a/popup.html
+++ b/popup.html
@@ -57,11 +57,16 @@
       </div>
       <div class="middle-column">
         <div class="without-assignee">
-          <input id=""
+          <input id="assignee"/>
         </div>
         <div class="with-assignee">
 
         </div>
+        <div class="assignee-list-container">
+          <div id="#assignee_list">
+
+          </div>
+        </div>
 
       </div>
       <div class="right-column"></div>
diff --git a/popup.js b/popup.js
index 7458f6e..a780e78 100644
--- a/popup.js
+++ b/popup.js
@@ -1,257 +1,293 @@
-PopupState = {
-  title: null,
-  url: null,
-  selected_text: null
-};
+Popup = {
 
-window.addEventListener('load', function() {
+  // Options loaded when popup opened.
+  options: null,
 
-  // Our default error handler.
-  Asana.ServerModel.onError = function(response) {
-    showError(response.errors[0].message);
-  };
+  // Info from page we were triggered from
+  page_title: null,
+  page_url: null,
+  page_selection: null,
 
-  // Ah, the joys of asynchronous programming.
-  // To initialize, we've got to gather various bits of information.
-  // Starting with a reference to the window and tab that were active when
-  // the popup was opened ...
-  chrome.windows.getCurrent(function(w) {
-    chrome.tabs.query({
-      active: true,
-      windowId: w.id
-    }, function(tabs) {
-      // Now load our options ...
-      Asana.ServerModel.options(function(options) {
-        // And ensure the user is logged in ...
-        Asana.ServerModel.isLoggedIn(function(is_logged_in) {
-          if (is_logged_in) {
-            if (window.quick_add_request) {
-              // If this was a QuickAdd request (set by the code popping up
-              // the window in Asana.ExtensionServer), then we have all the
-              // info we need and should show the add UI right away.
-              showAddUi(
-                  quick_add_request.url, quick_add_request.title,
-                  quick_add_request.selected_text, options);
-            } else {
-              // Otherwise we want to get the selection from the tab that
-              // was active when we were opened. So we set up a listener
-              // to listen for the selection send event from the content
-              // window ...
-              var selection = "";
-              var listener = function(request, sender, sendResponse) {
-                if (request.type === "selection") {
-                  chrome.extension.onRequest.removeListener(listener);
-                  console.info("Asana popup got selection");
-                  selection = "\n" + request.value;
-                }
-              };
-              chrome.extension.onRequest.addListener(listener);
+  workspaces: null,
+  users: null,
+
+  onLoad: function() {
+    var me = this;
 
-              // ... and then we make a request to the content window to
-              // send us the selection.
-              var tab = tabs[0];
-              chrome.tabs.executeScript(tab.id, {
-                code: "(Asana && Asana.SelectionClient) ? Asana.SelectionClient.sendSelection() : 0"
-              }, function() {
-                // The requests appear to be handled synchronously, so the
-                // selection should have been sent by the time we get this
-                // completion callback. If the timing ever changes, however,
-                // that could break and we would never show the add UI.
-                // So this could be made more robust.
-                showAddUi(tab.url, tab.title, selection, options);
-              });
+    // Our default error handler.
+    Asana.ServerModel.onError = function(response) {
+      me.showError(response.errors[0].message);
+    };
+
+    // Ah, the joys of asynchronous programming.
+    // To initialize, we've got to gather various bits of information.
+    // Starting with a reference to the window and tab that were active when
+    // the popup was opened ...
+    chrome.windows.getCurrent(function(w) {
+      chrome.tabs.query({
+        active: true,
+        windowId: w.id
+      }, function(tabs) {
+        // Now load our options ...
+        Asana.ServerModel.options(function(options) {
+          me.options = options;
+          // And ensure the user is logged in ...
+          Asana.ServerModel.isLoggedIn(function(is_logged_in) {
+            if (is_logged_in) {
+              if (window.quick_add_request) {
+                // If this was a QuickAdd request (set by the code popping up
+                // the window in Asana.ExtensionServer), then we have all the
+                // info we need and should show the add UI right away.
+                me.showAddUi(
+                    quick_add_request.url, quick_add_request.title,
+                    quick_add_request.selected_text);
+              } else {
+                // Otherwise we want to get the selection from the tab that
+                // was active when we were opened. So we set up a listener
+                // to listen for the selection send event from the content
+                // window ...
+                var selection = "";
+                var listener = function(request, sender, sendResponse) {
+                  if (request.type === "selection") {
+                    chrome.runtime.onMessage.removeListener(listener);
+                    console.info("Asana popup got selection");
+                    selection = "\n" + request.value;
+                  }
+                };
+                chrome.runtime.onMessage.addListener(listener);
+
+                // ... and then we make a request to the content window to
+                // send us the selection.
+                var tab = tabs[0];
+                chrome.tabs.executeScript(tab.id, {
+                  code: "(Asana && Asana.SelectionClient) ? Asana.SelectionClient.sendSelection() : 0"
+                }, function() {
+                  // The requests appear to be handled synchronously, so the
+                  // selection should have been sent by the time we get this
+                  // completion callback. If the timing ever changes, however,
+                  // that could break and we would never show the add UI.
+                  // So this could be made more robust.
+                  me.showAddUi(tab.url, tab.title, selection);
+                });
+              }
+            } else {
+              // The user is not even logged in. Prompt them to do so!
+              me.showLogin(Asana.Options.loginUrl(options));
             }
-          } else {
-            // The user is not even logged in. Prompt them to do so!
-            showLogin(Asana.Options.loginUrl(options));
-          }
+          });
         });
       });
     });
-  });
-});
 
-// Helper to show a named view.
-var showView = function(name) {
-  ["login", "add"].forEach(function(view_name) {
-    $("#" + view_name + "_view").css("display", view_name === name ? "" : "none");
-  });
-};
+    // Wire up some events to DOM elements on the page.
 
-// Show the add UI
-var showAddUi = function(url, title, selected_text, options) {
-  var self = this;
-  showView("add");
-  $("#notes").val(url + selected_text);
-  $("#name").val(title);
-  var name_input = $("#name");
-  name_input.focus();
-  name_input.select();
-  Asana.ServerModel.me(function(user) {
-    // Just to cache result.
-    Asana.ServerModel.workspaces(function(workspaces) {
-      var select = $("#workspace_select");
-      select.html("");
-      workspaces.forEach(function(workspace) {
-        $("#workspace_select").append(
-            "<option value='" + workspace.id + "'>" + workspace.name + "</option>");
-      });
-      if (workspaces.length > 1) {
-        $("workspace_select_container").show();
-      } else {
-        $("workspace_select_container").hide();
+    // Close the popup if the ESCAPE key is pressed.
+    window.addEventListener("keydown", function(e) {
+      if (e.keyCode === 27) {
+        window.close();
       }
-      select.val(options.default_workspace_id);
-      onWorkspaceChanged(options);
-      select.change(function() { onWorkspaceChanged(options); });
+    }, /*capture=*/false);
+
+    $("#close_popup").click(function() {
+      window.close();
     });
-  });
-};
 
-// Enable/disable the add button.
-var setAddEnabled = function(enabled) {
-  var button = $("#add_button");
-  if (enabled) {
-    button.removeClass("disabled");
-    button.addClass("enabled");
-    button.click(function() {
-      createTask();
-      return false;
+    $("#use_page_details").click(function() {
+      $("#name").val(me.page_title);
+      var notes = $("#notes");
+      notes.val(notes.val() + me.page_url + me.page_selection);
     });
-    button.keydown(function(e) {
-      if (e.keyCode === 13) {
-        createTask();
-      }
+  },
+
+  showView: function(name) {
+    ["login", "add"].forEach(function(view_name) {
+      $("#" + view_name + "_view").css("display", view_name === name ? "" : "none");
     });
-  } else {
-    button.removeClass("enabled");
-    button.addClass("disabled");
-    button.unbind('click');
-    button.unbind('keydown');
-  }
-};
+  },
 
-var resetFields = function() {
-  $("#name").val("");
-  $("#notes").val("");
-};
+  showAddUi: function(url, title, selected_text) {
+    var me = this;
 
-// Set the add button as being "working", waiting for the Asana request
-// to complete.
-var setAddWorking = function(working) {
-  setAddEnabled(!working);
-  $("#add_button").find(".button-text").text(
-      working ? "Adding..." : "Add to Asana");
-};
+    // Store off info from page we got triggered from.
+    me.page_url = url;
+    me.page_title = title;
+    me.page_selection = selected_text;
 
-// When the user changes the workspace, update the list of users.
-var onWorkspaceChanged = function(options) {
-  var workspace_id = readWorkspaceId();
+    me.resetFields();
+    me.showView("add");
+    var name_input = $("#name");
+    name_input.focus();
+    name_input.select();
+    Asana.ServerModel.me(function(user) {
+      // Just to cache result.
+      Asana.ServerModel.workspaces(function(workspaces) {
+        me.workspaces = workspaces;
+        var select = $("#workspace_select");
+        select.html("");
+        workspaces.forEach(function(workspace) {
+          $("#workspace_select").append(
+              "<option value='" + workspace.id + "'>" + workspace.name + "</option>");
+        });
+        if (workspaces.length > 1) {
+          $("workspace_select_container").show();
+        } else {
+          $("workspace_select_container").hide();
+        }
+        select.val(me.options.default_workspace_id);
+        me.onWorkspaceChanged();
+        select.change(function() { me.onWorkspaceChanged(); });
+      });
+    });
+  },
 
-  // Update selected workspace
-  $("#workspace").html($("#workspace_select option:selected").text());
+  setAddEnabled: function(enabled) {
+    var me = this;
+    var button = $("#add_button");
+    if (enabled) {
+      button.removeClass("disabled");
+      button.addClass("enabled");
+      button.click(function() {
+        me.createTask();
+        return false;
+      });
+      button.keydown(function(e) {
+        if (e.keyCode === 13) {
+          me.createTask();
+        }
+      });
+    } else {
+      button.removeClass("enabled");
+      button.addClass("disabled");
+      button.unbind('click');
+      button.unbind('keydown');
+    }
+  },
 
-  // Save selection as new default.
-  options.default_workspace_id = workspace_id;
-  Asana.ServerModel.saveOptions(options, function() {});
+  showError: function(message) {
+    console.log("Error: " + message);
+    $("#error").css("display", "");
+  },
 
-  // Update assignee list.
-  $("#assignee").html("<option>Loading...</option>");
-  setAddEnabled(false);
-  Asana.ServerModel.users(workspace_id, function(users) {
-    $("#assignee").html("");
-    users = users.sort(function(a, b) {
-      return (a.name < b.name) ? -1 : ((a.name > b.name) ? 1 : 0);
-    });
-    users.forEach(function(user) {
-      $("#assignee").append(
-          "<option value='" + user.id + "'>" + user.name + "</option>");
-    });
-    Asana.ServerModel.me(function(user) {
-      $("#assignee").val(user.id);
-    });
-    setAddEnabled(true);
-  });
-};
+  hideError: function() {
+    $("#error").css("display", "none");
+  },
 
-var readAssignee = function() {
-  return $("#assignee").val();
-};
+  resetFields: function() {
+    $("#name").val("");
+    $("#notes").val("");
+  },
 
-var readWorkspaceId = function() {
-  return $("#workspace_select").val();
-};
+  // Set the add button as being "working", waiting for the Asana request
+  // to complete.
+  setAddWorking: function(working) {
+    this.setAddEnabled(!working);
+    $("#add_button").find(".button-text").text(
+        working ? "Adding..." : "Add to Asana");
+  },
 
-var createTask = function() {
-  console.info("Creating task");
-  hideError();
-  setAddWorking(true);
-  Asana.ServerModel.createTask(
-      readWorkspaceId(),
-      {
-        name: $("#name").val(),
-        notes: $("#notes").val(),
-        assignee: readAssignee()
-      },
-      function(task) {
-        setAddWorking(false);
-        showSuccess(task);
-      },
-      function(response) {
-        setAddWorking(false);
-        showError(response.errors[0].message);
+  // When the user changes the workspace, update the list of users.
+  onWorkspaceChanged: function() {
+    var me = this;
+    var workspace_id = me.readWorkspaceId();
+
+    // Update selected workspace
+    $("#workspace").html($("#workspace_select option:selected").text());
+
+    // Save selection as new default.
+    me.options.default_workspace_id = workspace_id;
+    Asana.ServerModel.saveOptions(me.options, function() {});
+
+    // Update assignee list.
+    $("#assignee").html("<option>Loading...</option>");
+    me.setAddEnabled(false);
+    Asana.ServerModel.users(workspace_id, function(users) {
+      $("#assignee").html("");
+      users = users.sort(function(a, b) {
+        return (a.name < b.name) ? -1 : ((a.name > b.name) ? 1 : 0);
       });
-};
+      users.forEach(function(user) {
+        $("#assignee").append(
+            "<option value='" + user.id + "'>" + user.name + "</option>");
+      });
+      Asana.ServerModel.me(function(user) {
+        $("#assignee").val(user.id);
+      });
+      me.setAddEnabled(true);
+    });
+  },
 
-var showError = function(message) {
-  console.log("Error: " + message);
-  $("#error").css("display", "");
-};
+  workspaceById: function(id) {
+    var found = null;
+    this.workspaces.forEach(function(w) {
+      if (w.id === id) {
+        found = w;
+      }
+    });
+    return found;
+  },
 
-var hideError = function() {
-  $("#error").css("display", "none");
-};
+  readAssigneeId: function() {
+    return parseInt($("#assignee").val(), 10);
+  },
 
-// Helper to show a success message after a task is added.
-var showSuccess = function(task) {
-  Asana.ServerModel.taskViewUrl(task, function(url) {
-    var name = task.name.replace(/^\s*/, "").replace(/\s*$/, "");
-    $("#new_task_workspace_name").text("xcxc");
-    var link = $("#new_task_link");
-    link.attr("href", url);
-    link.text(name !== "" ? name : "unnamed task");
-    link.unbind("click");
-    link.click(function() {
+  readWorkspaceId: function() {
+    return parseInt($("#workspace_select").val(), 10);
+  },
+
+  createTask: function() {
+    var me = this;
+    console.info("Creating task");
+    me.hideError();
+    me.setAddWorking(true);
+    Asana.ServerModel.createTask(
+        me.readWorkspaceId(),
+        {
+          name: $("#name").val(),
+          notes: $("#notes").val(),
+          assignee: me.readAssigneeId()
+        },
+        function(task) {
+          me.setAddWorking(false);
+          me.showSuccess(task);
+        },
+        function(response) {
+          me.setAddWorking(false);
+          me.showError(response.errors[0].message);
+        });
+  },
+
+  // Helper to show a success message after a task is added.
+  showSuccess: function(task) {
+    var me = this;
+    Asana.ServerModel.taskViewUrl(task, function(url) {
+      var name = task.name.replace(/^\s*/, "").replace(/\s*$/, "");
+      $("#new_task_workspace_name").text(me.workspaceById(me.readWorkspaceId()).name);
+      var link = $("#new_task_link");
+      link.attr("href", url);
+      link.text(name !== "" ? name : "unnamed task");
+      link.unbind("click");
+      link.click(function() {
+        chrome.tabs.create({url: url});
+        window.close();
+        return false;
+      });
+      me.resetFields();
+      $("#success").css("display", "");
+    });
+  },
+
+  // Helper to show the login page.
+  showLogin: function(url) {
+    var me = this;
+    $("#login_button").click(function() {
       chrome.tabs.create({url: url});
       window.close();
       return false;
     });
-    resetFields();
-    $("#success").css("display", "");
-  });
-};
-
-// Helper to show the login page.
-var showLogin = function(url) {
-  $("#login_button").click(function() {
-    chrome.tabs.create({url: url});
-    window.close();
-    return false;
-  });
-  showView("login");
-};
-
-// Close the popup if the ESCAPE key is pressed.
-window.addEventListener("keydown", function(e) {
-  if (e.keyCode === 27) {
-    window.close();
+    me.showView("login");
   }
-}, /*capture=*/false);
-
-$("#close_popup").click(function() {
-  window.close();
-});
+};
 
-$("#use_page_details").click(function() {
-  //xcxc
+window.addEventListener('load', function() {
+  Popup.onLoad();
 });
diff --git a/quick_add_client.js b/quick_add_client.js
index 538dcb3..987f6d6 100644
--- a/quick_add_client.js
+++ b/quick_add_client.js
@@ -32,7 +32,7 @@ Asana.QuickAddClient = {
         // We cannot open the popup programmatically.
         // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
         // So we do this roundabout thing.
-        chrome.extension.sendRequest({
+        chrome.runtime.sendMessage({
           type: "quick_add",
           url: window.location.href,
           title: document.title,
diff --git a/selection_client.js b/selection_client.js
index 049b979..c64913a 100644
--- a/selection_client.js
+++ b/selection_client.js
@@ -9,7 +9,7 @@ Asana.SelectionClient = {
   sendSelection: function() {
     var selected_text = "" + window.getSelection();
     console.info("Sending selection to Asana popup");
-    chrome.extension.sendRequest({
+    chrome.runtime.sendMessage({
       type: "selection",
       value: selected_text
     });

From d2223312967786103e9366d17be0ad0aece50aac Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Thu, 30 May 2013 22:45:06 -0700
Subject: [PATCH 08/63] basic typeahead, no keyboard selection yet

---
 asana.js        |  26 ++++++-
 popup.css       |  21 ++++-
 popup.html      |  18 ++---
 popup.js        | 203 ++++++++++++++++++++++++++++++++++++++++++++----
 server_model.js |   4 +-
 5 files changed, 242 insertions(+), 30 deletions(-)

diff --git a/asana.js b/asana.js
index 719d6b7..07dbebd 100644
--- a/asana.js
+++ b/asana.js
@@ -1,4 +1,28 @@
 /**
  * Define the top-level Asana namespace.
  */
-Asana = {};
\ No newline at end of file
+Asana = {};
+
+/**
+ * Things borrowed from asana library.
+ */
+
+
+update = function(to, from) {
+  for (var k in from) {
+    to[k] = from[k];
+  }
+  return to;
+};
+
+if (!RegExp.escape) {
+  // Taken from http://simonwillison.net/2006/Jan/20/escape/
+  RegExp.escape = function(text, opt_do_not_escape_spaces) {
+    if (opt_do_not_escape_spaces !== true) {
+      return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); // nolint
+    } else {
+      // only difference is lack of escaping \s
+      return text.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&"); // nolint
+    }
+  };
+}
diff --git a/popup.css b/popup.css
index 4cbd73d..18e3f10 100644
--- a/popup.css
+++ b/popup.css
@@ -138,17 +138,34 @@ body {
 .name-row {
   padding-top: 14px;
 }
-.name-row #name {
+.name-row #name_input {
   font-size: 20px;
   width: 100%;
 }
 
-.notes-row #notes {
+.notes-row #notes_input {
   width: 100%;
   resize: none;
   height: 96px;
 }
 
+.user-photo-frame {
+  display: inline-block;
+}
+.user-photo {
+}
+.user-name {
+  display: inline-block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+#assignee_list_container {
+  height: 126px;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+
 .footer {
   background: xcxc;
   padding: 8px 0 10px 0;
diff --git a/popup.html b/popup.html
index be517d7..ff1d4da 100644
--- a/popup.html
+++ b/popup.html
@@ -36,7 +36,7 @@
         <span class="icon-checkbox"></span>
       </div>
       <div class="middle-column">
-        <input id="name"/>
+        <input id="name_input"/>
       </div>
       <div class="right-column">
         <span id="use_page_details" class="button" title="Use page title for task details"><span class="icon-use-link"></span></span>
@@ -47,7 +47,7 @@
         <span class="icon-notes"></span>
       </div>
       <div class="middle-column">
-        <textarea id="notes" placeholder="Description"></textarea>
+        <textarea id="notes_input" placeholder="Description"></textarea>
       </div>
       <div class="right-column"></div>
     </div>
@@ -56,16 +56,10 @@
         <span class="icon-assignee"></span>
       </div>
       <div class="middle-column">
-        <div class="without-assignee">
-          <input id="assignee"/>
-        </div>
-        <div class="with-assignee">
-
-        </div>
-        <div class="assignee-list-container">
-          <div id="#assignee_list">
-
-          </div>
+        <input id="assignee_input"/>
+        <div id="assignee"></div>
+        <div id="assignee_list_container">
+          <div id="assignee_list"></div>
         </div>
 
       </div>
diff --git a/popup.js b/popup.js
index a780e78..ed51e02 100644
--- a/popup.js
+++ b/popup.js
@@ -10,6 +10,7 @@ Popup = {
 
   workspaces: null,
   users: null,
+  typeahead: null,
 
   onLoad: function() {
     var me = this;
@@ -82,11 +83,11 @@ Popup = {
     // Wire up some events to DOM elements on the page.
 
     // Close the popup if the ESCAPE key is pressed.
-    window.addEventListener("keydown", function(e) {
-      if (e.keyCode === 27) {
+    $(window).keypress(function(e) {
+      if (e.which === 27) {
         window.close();
       }
-    }, /*capture=*/false);
+    });
 
     $("#close_popup").click(function() {
       window.close();
@@ -97,6 +98,8 @@ Popup = {
       var notes = $("#notes");
       notes.val(notes.val() + me.page_url + me.page_selection);
     });
+
+    me.typeahead = new UserTypeahead("assignee");
   },
 
   showView: function(name) {
@@ -198,19 +201,11 @@ Popup = {
     Asana.ServerModel.saveOptions(me.options, function() {});
 
     // Update assignee list.
-    $("#assignee").html("<option>Loading...</option>");
     me.setAddEnabled(false);
     Asana.ServerModel.users(workspace_id, function(users) {
-      $("#assignee").html("");
-      users = users.sort(function(a, b) {
-        return (a.name < b.name) ? -1 : ((a.name > b.name) ? 1 : 0);
-      });
-      users.forEach(function(user) {
-        $("#assignee").append(
-            "<option value='" + user.id + "'>" + user.name + "</option>");
-      });
+      me.typeahead.updateUsers(users);
       Asana.ServerModel.me(function(user) {
-        $("#assignee").val(user.id);
+        me.typeahead.setSelectedUserId(user.id);
       });
       me.setAddEnabled(true);
     });
@@ -288,6 +283,186 @@ Popup = {
   }
 };
 
-window.addEventListener('load', function() {
+UserTypeahead = function(id) {
+  var me = this;
+  me.id = id;
+  me.users = [];
+  me.user_id_to_user = {};
+  me.selected_user_id = null;
+  me.user_id_to_select = null;
+  me.has_focus = false;
+
+  me.input = $("#" + id + "_input");
+  me.label = $("#" + id);
+  me.list = $("#" + id + "_list");
+  me.list_container = $("#" + id + "_list_container");
+
+  me.input.focus(function() {
+    me.user_id_to_select = me.selected_user_id;
+    me.has_focus = true;
+    me.render();
+  });
+  me.input.blur(function() {
+    me.selected_user_id = me.user_id_to_select;
+    me.has_focus = false;
+    me.render();
+  });
+  me.input.keypress(function(e) {
+    if (e.which === 13) {
+      me._confirmSelection();
+      return false;
+    } else if (e.which === 8) {
+      me._confirmSelection();
+      return true;
+    } else if (e.which === 27) {
+      //xcxc for some reason this still exits the popup
+      e.stopPropagation();
+      me.input.blur();
+      return false;
+    }
+  });
+  me.input.bind("input", function() {
+    me._renderList();
+  });
+  me.label.click(function() {
+    me.input.focus();
+  });
+  me.render();
+};
+
+update(UserTypeahead, {
+
+  SILHOUETTE_URL: "xcxc",
+
+  photoForUser: function(user) {
+    var url = user.photo ? user.photo.image_21x21 : UserTypeahead.SILHOUETTE_URL;
+    var photo = $('<div class="user-photo"></div>"');
+    photo.css("background-image", "url(" + url + ")");
+    return $('<div class="user-photo-frame"></div>').append(photo);
+  }
+
+});
+
+update(UserTypeahead.prototype, {
+
+  render: function() {
+    var me = this;
+    me._renderLabel();
+
+    if (this.has_focus) {
+      me._renderList();
+      me.input.show();
+      me.label.hide();
+      me.list_container.show();
+    } else {
+      me.input.hide();
+      me.label.show();
+      me.list_container.hide();
+    }
+  },
+
+  _renderLabel: function() {
+    var me = this;
+    me.label.empty();
+    var selected_user = me.user_id_to_user[me.selected_user_id];
+    if (selected_user) {
+      me.label.append(UserTypeahead.photoForUser(selected_user));
+      me.label.append($('<div class="user-name">').text(selected_user.name));
+    } else {
+      me.label.append($('<span class="unassigned">').text("Assignee"));
+    }
+  },
+
+  _renderList: function() {
+    var me = this;
+    me.list.empty();
+    me._filteredUsers().forEach(function(user) {
+      me.list.append(me._entryForUser(user));
+    });
+  },
+
+  _entryForUser: function(user, is_selected) {
+    var me = this;
+    var node = $('<div id="user_' + user.id + '" class="user"></div>');
+    node.append(UserTypeahead.photoForUser(user));
+    node.append($('<div class="user-name">').text(user.name));
+    if (is_selected) {
+      node.addClass("selected");
+    }
+    node.mousedown(function() {
+      me.user_id_to_select = user.id;
+      me.setSelectedUserId(user.id);
+    });
+    return node;
+  },
+
+  _filteredUsers: function() {
+    var regexp = this._regexpFromFilterText(this.input.val());
+    return this.users.filter(function(user) {
+      if (regexp !== null) {
+        var parts = user.name.split(regexp);
+        return parts.length > 1;
+      } else {
+        return true;  // no filter
+      }
+    });
+  },
+
+  /**
+   * Generates a regular expression that will match strings which contain words
+   * that start with the words in filter_text. The matching is case-insensitive
+   * and the matching words do not need to be consecutive but they must be in
+   * the same order as those in filter_text.
+   *
+   * @param filter_text {String|null} The input text used to generate the regular
+   *  expression.
+   * @returns {Regexp}
+   */
+  _regexpFromFilterText: function(filter_text) {
+    if (!filter_text || filter_text.trim() === '') {
+      return null;
+    } else {
+      var escaped_filter_text = RegExp.escape(
+          filter_text.trim(),
+          /*opt_do_not_escape_spaces=*/true);
+      var parts = escaped_filter_text.trim().split(/\s+/).map(function(word) {
+        return "(" + word + ")";
+      }).join("(.*\\s+)");
+      return new RegExp("(?:\\b|^|(?=\\W))" + parts, "i");
+    }
+  },
+
+  _confirmSelection: function() {
+    this.user_id_to_select = this.selected_user_id;
+  },
+
+  updateUsers: function(users) {
+    var me = this;
+    // TODO: get from API in top contact order
+    users = users.sort(function(a, b) {
+      return (a.name < b.name) ? -1 : ((a.name > b.name) ? 1 : 0);
+    });
+    me.users = users;
+    me.user_id_to_user = {};
+    users.forEach(function(user) {
+      me.user_id_to_user[user.id] = user;
+    });
+    me.render();
+  },
+
+  setSelectedUserId: function(id) {
+    if (this.selected_user_id !== null) {
+      $("#user_" + this.selected_user_id).removeClass("selected");
+    }
+    this.selected_user_id = id;
+    if (this.selected_user_id !== null) {
+      $("#user_" + this.selected_user_id).addClass("selected");
+    }
+  }
+
+});
+
+
+$(window).load(function() {
   Popup.onLoad();
 });
diff --git a/server_model.js b/server_model.js
index 5802a8a..7affc9f 100644
--- a/server_model.js
+++ b/server_model.js
@@ -92,7 +92,9 @@ Asana.ServerModel = {
    */
   users: function(workspace_id, callback, errback, options) {
     var self = this;
-    Asana.ApiBridge.request("GET", "/workspaces/" + workspace_id + "/users", {},
+    Asana.ApiBridge.request(
+        "GET", "/workspaces/" + workspace_id + "/users",
+        { opt_fields: "name, photo.image_21x21" },
         function(response) {
           self._makeCallback(response, callback, errback);
         }, options);

From a9dfbb6b98d7b3915c954679507320aa3bb8638c Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Fri, 31 May 2013 00:34:59 -0700
Subject: [PATCH 09/63] keyboard selection, kinda working

---
 popup.css  |  3 +++
 popup.html | 10 ++++-----
 popup.js   | 64 +++++++++++++++++++++++++++++++++++++++---------------
 3 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/popup.css b/popup.css
index 18e3f10..8a537db 100644
--- a/popup.css
+++ b/popup.css
@@ -149,6 +149,9 @@ body {
   height: 96px;
 }
 
+.user.selected {
+  background-color: #cccccc;
+}
 .user-photo-frame {
   display: inline-block;
 }
diff --git a/popup.html b/popup.html
index ff1d4da..dad12d9 100644
--- a/popup.html
+++ b/popup.html
@@ -28,7 +28,7 @@
         </span>
       </div>
       <div class="right-column">
-        <a id="close_popup" class="close-x"></a>
+        <a id="close_popup" class="close-x" tabindex="-1"></a>
       </div>
     </div>
     <div class="name-row">
@@ -36,7 +36,7 @@
         <span class="icon-checkbox"></span>
       </div>
       <div class="middle-column">
-        <input id="name_input"/>
+        <input id="name_input" tabindex="0"/>
       </div>
       <div class="right-column">
         <span id="use_page_details" class="button" title="Use page title for task details"><span class="icon-use-link"></span></span>
@@ -47,7 +47,7 @@
         <span class="icon-notes"></span>
       </div>
       <div class="middle-column">
-        <textarea id="notes_input" placeholder="Description"></textarea>
+        <textarea id="notes_input" tabindex="0" placeholder="Description"></textarea>
       </div>
       <div class="right-column"></div>
     </div>
@@ -57,7 +57,7 @@
       </div>
       <div class="middle-column">
         <input id="assignee_input"/>
-        <div id="assignee"></div>
+        <div id="assignee" tabindex="0"></div>
         <div id="assignee_list_container">
           <div id="assignee_list"></div>
         </div>
@@ -99,7 +99,7 @@
   <div id="login_view" style="display:none">
     <div class="banner">
       Add to Asana
-      <a id="close-banner" class="close-x"></a>
+      <a id="close-banner" class="close-x" tabindex="-1"></a>
     </div>
     <div class="content">
       You must log in to Asana before you can add tasks.
diff --git a/popup.js b/popup.js
index ed51e02..fb6eecb 100644
--- a/popup.js
+++ b/popup.js
@@ -287,6 +287,7 @@ UserTypeahead = function(id) {
   var me = this;
   me.id = id;
   me.users = [];
+  me.filtered_users = [];
   me.user_id_to_user = {};
   me.selected_user_id = null;
   me.user_id_to_select = null;
@@ -299,6 +300,7 @@ UserTypeahead = function(id) {
 
   me.input.focus(function() {
     me.user_id_to_select = me.selected_user_id;
+    me.selected_user_id = null;
     me.has_focus = true;
     me.render();
   });
@@ -307,24 +309,41 @@ UserTypeahead = function(id) {
     me.has_focus = false;
     me.render();
   });
-  me.input.keypress(function(e) {
+  me.input.keydown(function(e) {
+    console.info("keydown", e.which);
     if (e.which === 13) {
       me._confirmSelection();
       return false;
-    } else if (e.which === 8) {
+    } else if (e.which === 9) {
       me._confirmSelection();
       return true;
     } else if (e.which === 27) {
-      //xcxc for some reason this still exits the popup
+      // TODO: for some reason this still exits the popup
       e.stopPropagation();
       me.input.blur();
       return false;
+    } else if (e.which === 40) {
+      // Down: select next.
+      var index = me._indexOfSelectedUser();
+      console.info(index, me.filtered_users.length);
+      if (index === -1 && me.filtered_users.length > 0) {
+        me.setSelectedUserId(me.filtered_users[0].id);
+      } else if (index >= 0 && index < me.filtered_users.length) {
+        me.setSelectedUserId(me.filtered_users[index + 1].id);
+      }
+    } else if (e.which === 38) {
+      // Up: select prev.
+      var index = me._indexOfSelectedUser();
+      if (index > 0) {
+        me.setSelectedUserId(me.filtered_users[index - 1].id);
+      }
     }
   });
   me.input.bind("input", function() {
+    me._updateFilteredUsers();
     me._renderList();
   });
-  me.label.click(function() {
+  me.label.focus(function() {
     me.input.focus();
   });
   me.render();
@@ -376,7 +395,7 @@ update(UserTypeahead.prototype, {
   _renderList: function() {
     var me = this;
     me.list.empty();
-    me._filteredUsers().forEach(function(user) {
+    me.filtered_users.forEach(function(user) {
       me.list.append(me._entryForUser(user));
     });
   },
@@ -396,18 +415,6 @@ update(UserTypeahead.prototype, {
     return node;
   },
 
-  _filteredUsers: function() {
-    var regexp = this._regexpFromFilterText(this.input.val());
-    return this.users.filter(function(user) {
-      if (regexp !== null) {
-        var parts = user.name.split(regexp);
-        return parts.length > 1;
-      } else {
-        return true;  // no filter
-      }
-    });
-  },
-
   /**
    * Generates a regular expression that will match strings which contain words
    * that start with the words in filter_text. The matching is case-insensitive
@@ -447,9 +454,32 @@ update(UserTypeahead.prototype, {
     users.forEach(function(user) {
       me.user_id_to_user[user.id] = user;
     });
+    me._updateFilteredUsers();
     me.render();
   },
 
+  _updateFilteredUsers: function() {
+    var regexp = this._regexpFromFilterText(this.input.val());
+    this.filtered_users = this.users.filter(function(user) {
+      if (regexp !== null) {
+        var parts = user.name.split(regexp);
+        return parts.length > 1;
+      } else {
+        return user.name.trim() !== "";  // no filter
+      }
+    });
+  },
+
+  _indexOfSelectedUser: function() {
+    var me = this;
+    var selected_user = me.user_id_to_user[me.selected_user_id];
+    if (selected_user) {
+      return me.filtered_users.indexOf(selected_user);
+    } else {
+      return -1;
+    }
+  },
+
   setSelectedUserId: function(id) {
     if (this.selected_user_id !== null) {
       $("#user_" + this.selected_user_id).removeClass("selected");

From 97d1b76d04e1affdbb4b121b0935495f6025dd8a Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Fri, 31 May 2013 09:56:22 -0700
Subject: [PATCH 10/63] better keyb selection

---
 asana.js | 26 +++++++++++++++++++++++++-
 popup.js | 14 ++++++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/asana.js b/asana.js
index 07dbebd..25910c2 100644
--- a/asana.js
+++ b/asana.js
@@ -8,13 +8,37 @@ Asana = {};
  */
 
 
-update = function(to, from) {
+Asana.update = function(to, from) {
   for (var k in from) {
     to[k] = from[k];
   }
   return to;
 };
 
+Asana.Node = {
+
+  /**
+   * Ensures that the bottom of the element is visible. If it is not then it
+   * will be scrolled up enough to be visible.
+   *
+   * Note: this does not take account of the size of the window. That's ok for
+   * now because the scrolling element is not the top-level element.
+   */
+  ensureBottomVisible: function(el) {
+    //xcxc
+    var item_element_dimensions = this.dimensions;
+
+    var element_from_point = document.elementFromPoint(
+        this.dimensions.x(),
+        this.dimensions.y() + this.dimensions.height());
+    if (element_from_point === null ||
+        !MochiKit.DOM.isChildNode(element_from_point, this)) {
+      this.scrollIntoView(/*alignWithTop=*/ false);
+    }
+  },
+
+};
+
 if (!RegExp.escape) {
   // Taken from http://simonwillison.net/2006/Jan/20/escape/
   RegExp.escape = function(text, opt_do_not_escape_spaces) {
diff --git a/popup.js b/popup.js
index fb6eecb..4f17f99 100644
--- a/popup.js
+++ b/popup.js
@@ -313,6 +313,7 @@ UserTypeahead = function(id) {
     console.info("keydown", e.which);
     if (e.which === 13) {
       me._confirmSelection();
+      $("#add_button").focus();
       return false;
     } else if (e.which === 9) {
       me._confirmSelection();
@@ -349,7 +350,7 @@ UserTypeahead = function(id) {
   me.render();
 };
 
-update(UserTypeahead, {
+Asana.update(UserTypeahead, {
 
   SILHOUETTE_URL: "xcxc",
 
@@ -362,7 +363,7 @@ update(UserTypeahead, {
 
 });
 
-update(UserTypeahead.prototype, {
+Asana.update(UserTypeahead.prototype, {
 
   render: function() {
     var me = this;
@@ -480,6 +481,14 @@ update(UserTypeahead.prototype, {
     }
   },
 
+  _ensureSelectedUserVisible: function() {
+    var index = this._indexOfSelectedUser();
+    if (index !== -1) {
+      var el = this.list.children().eq(index);
+      this.list_container.scrollTo(el);
+    }
+  },
+
   setSelectedUserId: function(id) {
     if (this.selected_user_id !== null) {
       $("#user_" + this.selected_user_id).removeClass("selected");
@@ -488,6 +497,7 @@ update(UserTypeahead.prototype, {
     if (this.selected_user_id !== null) {
       $("#user_" + this.selected_user_id).addClass("selected");
     }
+    this._ensureSelectedUserVisible();
   }
 
 });

From e4529508984c54e9a5231f57557b36961fc74450 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Fri, 31 May 2013 10:47:47 -0700
Subject: [PATCH 11/63] working scrolling on keyboard

---
 asana.js | 14 ++++++--------
 popup.js | 14 +++++++-------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/asana.js b/asana.js
index 25910c2..4557c39 100644
--- a/asana.js
+++ b/asana.js
@@ -24,16 +24,14 @@ Asana.Node = {
    * Note: this does not take account of the size of the window. That's ok for
    * now because the scrolling element is not the top-level element.
    */
-  ensureBottomVisible: function(el) {
-    //xcxc
-    var item_element_dimensions = this.dimensions;
-
+  ensureBottomVisible: function(node) {
+    var el = $(node);
+    var pos = el.position();
     var element_from_point = document.elementFromPoint(
-        this.dimensions.x(),
-        this.dimensions.y() + this.dimensions.height());
+        pos.left, pos.top + el.height());
     if (element_from_point === null ||
-        !MochiKit.DOM.isChildNode(element_from_point, this)) {
-      this.scrollIntoView(/*alignWithTop=*/ false);
+        $(element_from_point).closest(node).size() === 0) {
+      node.scrollIntoView(/*alignWithTop=*/ false);
     }
   },
 
diff --git a/popup.js b/popup.js
index 4f17f99..84f7500 100644
--- a/popup.js
+++ b/popup.js
@@ -204,9 +204,9 @@ Popup = {
     me.setAddEnabled(false);
     Asana.ServerModel.users(workspace_id, function(users) {
       me.typeahead.updateUsers(users);
-      Asana.ServerModel.me(function(user) {
-        me.typeahead.setSelectedUserId(user.id);
-      });
+//      Asana.ServerModel.me(function(user) {
+//        me.typeahead.setSelectedUserId(user.id);
+//      });
       me.setAddEnabled(true);
     });
   },
@@ -300,7 +300,7 @@ UserTypeahead = function(id) {
 
   me.input.focus(function() {
     me.user_id_to_select = me.selected_user_id;
-    me.selected_user_id = null;
+    me.input.val("");
     me.has_focus = true;
     me.render();
   });
@@ -397,7 +397,7 @@ Asana.update(UserTypeahead.prototype, {
     var me = this;
     me.list.empty();
     me.filtered_users.forEach(function(user) {
-      me.list.append(me._entryForUser(user));
+      me.list.append(me._entryForUser(user, user.id === me.selected_user_id));
     });
   },
 
@@ -484,8 +484,8 @@ Asana.update(UserTypeahead.prototype, {
   _ensureSelectedUserVisible: function() {
     var index = this._indexOfSelectedUser();
     if (index !== -1) {
-      var el = this.list.children().eq(index);
-      this.list_container.scrollTo(el);
+      var node = this.list.children().get(index);
+      Asana.Node.ensureBottomVisible(node);
     }
   },
 

From 891936fe5b942af00659bf69585f2786061125fc Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Fri, 31 May 2013 15:50:58 -0700
Subject: [PATCH 12/63] Grab favicon url from page and fix some bugs

---
 extension_server.js |   3 ++
 popup.css           |   1 -
 popup.js            | 121 +++++++++++++++++++++++---------------------
 quick_add_client.js |   2 +-
 4 files changed, 67 insertions(+), 60 deletions(-)

diff --git a/extension_server.js b/extension_server.js
index e340b90..9084cb0 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -26,6 +26,9 @@ Asana.ExtensionServer = {
             "asana_quick_add",
             "dependent=1,resizable=0,location=0,menubar=0,status=0,toolbar=0,width=410,height=310");
         popup.quick_add_request = request;
+        // Quick Add should only come from a content script, so it must have
+        // a `tab`.
+        popup.quick_add_request.favicon_url = sender.tab.favIconUrl;
       }
     });
   }
diff --git a/popup.css b/popup.css
index 8a537db..c596767 100644
--- a/popup.css
+++ b/popup.css
@@ -134,7 +134,6 @@ body {
   right: 0px;
 }
 
-
 .name-row {
   padding-top: 14px;
 }
diff --git a/popup.js b/popup.js
index 84f7500..c5c1005 100644
--- a/popup.js
+++ b/popup.js
@@ -7,6 +7,7 @@ Popup = {
   page_title: null,
   page_url: null,
   page_selection: null,
+  favicon_url: null,
 
   workspaces: null,
   users: null,
@@ -24,58 +25,57 @@ Popup = {
     // To initialize, we've got to gather various bits of information.
     // Starting with a reference to the window and tab that were active when
     // the popup was opened ...
-    chrome.windows.getCurrent(function(w) {
-      chrome.tabs.query({
-        active: true,
-        windowId: w.id
-      }, function(tabs) {
-        // Now load our options ...
-        Asana.ServerModel.options(function(options) {
-          me.options = options;
-          // And ensure the user is logged in ...
-          Asana.ServerModel.isLoggedIn(function(is_logged_in) {
-            if (is_logged_in) {
-              if (window.quick_add_request) {
-                // If this was a QuickAdd request (set by the code popping up
-                // the window in Asana.ExtensionServer), then we have all the
-                // info we need and should show the add UI right away.
-                me.showAddUi(
-                    quick_add_request.url, quick_add_request.title,
-                    quick_add_request.selected_text);
-              } else {
-                // Otherwise we want to get the selection from the tab that
-                // was active when we were opened. So we set up a listener
-                // to listen for the selection send event from the content
-                // window ...
-                var selection = "";
-                var listener = function(request, sender, sendResponse) {
-                  if (request.type === "selection") {
-                    chrome.runtime.onMessage.removeListener(listener);
-                    console.info("Asana popup got selection");
-                    selection = "\n" + request.value;
-                  }
-                };
-                chrome.runtime.onMessage.addListener(listener);
-
-                // ... and then we make a request to the content window to
-                // send us the selection.
-                var tab = tabs[0];
-                chrome.tabs.executeScript(tab.id, {
-                  code: "(Asana && Asana.SelectionClient) ? Asana.SelectionClient.sendSelection() : 0"
-                }, function() {
-                  // The requests appear to be handled synchronously, so the
-                  // selection should have been sent by the time we get this
-                  // completion callback. If the timing ever changes, however,
-                  // that could break and we would never show the add UI.
-                  // So this could be made more robust.
-                  me.showAddUi(tab.url, tab.title, selection);
-                });
-              }
+    chrome.tabs.query({
+      active: true,
+      currentWindow: true
+    }, function(tabs) {
+      // Now load our options ...
+      Asana.ServerModel.options(function(options) {
+        me.options = options;
+        // And ensure the user is logged in ...
+        Asana.ServerModel.isLoggedIn(function(is_logged_in) {
+          if (is_logged_in) {
+            if (window.quick_add_request) {
+              // If this was a QuickAdd request (set by the code popping up
+              // the window in Asana.ExtensionServer), then we have all the
+              // info we need and should show the add UI right away.
+              me.showAddUi(
+                  quick_add_request.url, quick_add_request.title,
+                  quick_add_request.selected_text,
+                  quick_add_request.favicon_url);
             } else {
-              // The user is not even logged in. Prompt them to do so!
-              me.showLogin(Asana.Options.loginUrl(options));
+              // Otherwise we want to get the selection from the tab that
+              // was active when we were opened. So we set up a listener
+              // to listen for the selection send event from the content
+              // window ...
+              var selection = "";
+              var listener = function(request, sender, sendResponse) {
+                if (request.type === "selection") {
+                  chrome.runtime.onMessage.removeListener(listener);
+                  console.info("Asana popup got selection");
+                  selection = "\n" + request.value;
+                }
+              };
+              chrome.runtime.onMessage.addListener(listener);
+
+              // ... and then we make a request to the content window to
+              // send us the selection.
+              var tab = tabs[0];
+              chrome.tabs.executeScript(tab.id, {
+                code: "(Asana && Asana.SelectionClient) ? Asana.SelectionClient.sendSelection() : 0"
+              }, function() {
+                // The requests appear to be handled synchronously, so the
+                // selection should have been sent by the time we get this
+                // completion callback. If the timing ever changes, however,
+                // that could break and we would never show the add UI.
+                // So this could be made more robust.
+                me.showAddUi(tab.url, tab.title, selection, tab.favIconUrl);
+              });
             }
-          });
+          } else {
+            // The user is not even logged in. Prompt them to do so!
+            me.showLogin(Asana.Options.loginUrl(options));
+          }
         });
       });
     });
@@ -94,8 +94,8 @@ Popup = {
     });
 
     $("#use_page_details").click(function() {
-      $("#name").val(me.page_title);
-      var notes = $("#notes");
+      $("#name_input").val(me.page_title);
+      var notes = $("#notes_input");
       notes.val(notes.val() + me.page_url + me.page_selection);
     });
 
@@ -108,19 +108,24 @@ Popup = {
     });
   },
 
-  showAddUi: function(url, title, selected_text) {
+  showAddUi: function(url, title, selected_text, favicon_url) {
     var me = this;
 
     // Store off info from page we got triggered from.
     me.page_url = url;
     me.page_title = title;
     me.page_selection = selected_text;
+    me.favicon_url = favicon_url;
 
     me.resetFields();
     me.showView("add");
-    var name_input = $("#name");
+    var name_input = $("#name_input");
     name_input.focus();
     name_input.select();
+
+    // TODO: handle when no favicon
+    $(".icon-use-link").css("background-image", "url(" + favicon_url + ")");
+
     Asana.ServerModel.me(function(user) {
       // Just to cache result.
       Asana.ServerModel.workspaces(function(workspaces) {
@@ -176,8 +181,8 @@ Popup = {
   },
 
   resetFields: function() {
-    $("#name").val("");
-    $("#notes").val("");
+    $("#name_input").val("");
+    $("#notes_input").val("");
   },
 
   // Set the add button as being "working", waiting for the Asana request
@@ -237,8 +242,8 @@ Popup = {
     Asana.ServerModel.createTask(
         me.readWorkspaceId(),
         {
-          name: $("#name").val(),
-          notes: $("#notes").val(),
+          name: $("#name_input").val(),
+          notes: $("#notes_input").val(),
           assignee: me.readAssigneeId()
         },
         function(task) {
diff --git a/quick_add_client.js b/quick_add_client.js
index 987f6d6..70b7a7a 100644
--- a/quick_add_client.js
+++ b/quick_add_client.js
@@ -36,7 +36,7 @@ Asana.QuickAddClient = {
           type: "quick_add",
           url: window.location.href,
           title: document.title,
-          selected_text: "" + window.getSelection()
+          selected_text: "" + window.getSelection(),
         });
         e.preventDefault();
         return false;

From d5e84661ca3e7b574f62efd5ea770c4f3b50a65b Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Fri, 31 May 2013 16:24:10 -0700
Subject: [PATCH 13/63] Fix resize bug, and show contacts in order

---
 popup.html      | 7 +++++++
 popup.js        | 7 ++-----
 server_model.js | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/popup.html b/popup.html
index dad12d9..2ef8bf5 100644
--- a/popup.html
+++ b/popup.html
@@ -1,3 +1,10 @@
+<!DOCTYPE html>
+<!--
+The above DOCTYPE declaration is actually required for Chrome to
+properly resize the window as content size changes. See:
+http://stackoverflow.com/questions/9498685/resize-popup-html-in-chrome-extension
+-->
+
 <html>
 <head>
   <script type="text/javascript" src="jquery-1.7.1.min.js"></script>
diff --git a/popup.js b/popup.js
index c5c1005..6eca5c2 100644
--- a/popup.js
+++ b/popup.js
@@ -313,6 +313,7 @@ UserTypeahead = function(id) {
     me.selected_user_id = me.user_id_to_select;
     me.has_focus = false;
     me.render();
+    me._shrinkWindow();
   });
   me.input.keydown(function(e) {
     console.info("keydown", e.which);
@@ -360,7 +361,7 @@ Asana.update(UserTypeahead, {
   SILHOUETTE_URL: "xcxc",
 
   photoForUser: function(user) {
-    var url = user.photo ? user.photo.image_21x21 : UserTypeahead.SILHOUETTE_URL;
+    var url = user.photo ? user.photo.image_27x27 : UserTypeahead.SILHOUETTE_URL;
     var photo = $('<div class="user-photo"></div>"');
     photo.css("background-image", "url(" + url + ")");
     return $('<div class="user-photo-frame"></div>').append(photo);
@@ -451,10 +452,6 @@ Asana.update(UserTypeahead.prototype, {
 
   updateUsers: function(users) {
     var me = this;
-    // TODO: get from API in top contact order
-    users = users.sort(function(a, b) {
-      return (a.name < b.name) ? -1 : ((a.name > b.name) ? 1 : 0);
-    });
     me.users = users;
     me.user_id_to_user = {};
     users.forEach(function(user) {
diff --git a/server_model.js b/server_model.js
index 7affc9f..dfa5627 100644
--- a/server_model.js
+++ b/server_model.js
@@ -94,7 +94,7 @@ Asana.ServerModel = {
     var self = this;
     Asana.ApiBridge.request(
         "GET", "/workspaces/" + workspace_id + "/users",
-        { opt_fields: "name, photo.image_21x21" },
+        { opt_fields: "name, photo.image_27x27" },
         function(response) {
           self._makeCallback(response, callback, errback);
         }, options);

From f2c7be9174360f77a535c882612d7cb512f4a60c Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Fri, 31 May 2013 17:29:05 -0700
Subject: [PATCH 14/63] Fix task creation functionality, add logging

---
 api_bridge.js   | 25 +++++++++++++++++++++----
 popup.js        |  9 +--------
 server_model.js |  2 +-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/api_bridge.js b/api_bridge.js
index 73b0808..aa550d3 100644
--- a/api_bridge.js
+++ b/api_bridge.js
@@ -62,6 +62,7 @@ Asana.ApiBridge = {
    */
   request: function(http_method, path, params, callback, options) {
     var me = this;
+    http_method = http_method.toUpperCase();
 
     // If we're not the server page, send a message to it to make the
     // API request.
@@ -80,7 +81,7 @@ Asana.ApiBridge = {
     console.info("Server API Request", http_method, path, params);
 
     // Serve from cache first.
-    if (!options.miss_cache && http_method.toLowerCase() === "get") {
+    if (!options.miss_cache && http_method === "GET") {
       var data = me._readCache(path, new Date());
       if (data) {
         console.log("Serving request from cache", path);
@@ -89,8 +90,24 @@ Asana.ApiBridge = {
       }
     }
 
-    console.log("Making request to API", http_method, path);
     var url = me.baseApiUrl() + path;
+    var body_data;
+    var client_name = "chrome-extension:" +
+        chrome.i18n.getMessage("@@extension_id");
+    if (http_method === "PUT" || http_method === "POST") {
+      // POST/PUT request, put params in body
+      body_data = {
+        data: params,
+        options: { client_name: client_name }
+      };
+    } else {
+      // GET/DELETE request, add params as URL parameters.
+      var url_params = Asana.update({ opt_client_name: client_name }, params);
+      url += "?" + $.param(url_params);
+    }
+
+    console.log("Making request to API", http_method, url);
+
     chrome.cookies.get({
       url: url,
       name: 'ticket'
@@ -114,7 +131,7 @@ Asana.ApiBridge = {
         },
         accept: "application/json",
         success: function(data, status, xhr) {
-          if (http_method.toLowerCase() === "get") {
+          if (http_method === "GET") {
             me._writeCache(path, data, new Date());
           }
           callback(data);
@@ -142,7 +159,7 @@ Asana.ApiBridge = {
         }
       };
       if (http_method === "POST" || http_method === "PUT") {
-        attrs.data = JSON.stringify({data: params});
+        attrs.data = JSON.stringify(body_data);
         attrs.dataType = "json";
         attrs.processData = false;
         attrs.contentType = "application/json";
diff --git a/popup.js b/popup.js
index 6eca5c2..f4ca8f3 100644
--- a/popup.js
+++ b/popup.js
@@ -226,10 +226,6 @@ Popup = {
     return found;
   },
 
-  readAssigneeId: function() {
-    return parseInt($("#assignee").val(), 10);
-  },
-
   readWorkspaceId: function() {
     return parseInt($("#workspace_select").val(), 10);
   },
@@ -244,7 +240,7 @@ Popup = {
         {
           name: $("#name_input").val(),
           notes: $("#notes_input").val(),
-          assignee: me.readAssigneeId()
+          assignee: me.typeahead.selected_user_id
         },
         function(task) {
           me.setAddWorking(false);
@@ -313,10 +309,8 @@ UserTypeahead = function(id) {
     me.selected_user_id = me.user_id_to_select;
     me.has_focus = false;
     me.render();
-    me._shrinkWindow();
   });
   me.input.keydown(function(e) {
-    console.info("keydown", e.which);
     if (e.which === 13) {
       me._confirmSelection();
       $("#add_button").focus();
@@ -332,7 +326,6 @@ UserTypeahead = function(id) {
     } else if (e.which === 40) {
       // Down: select next.
       var index = me._indexOfSelectedUser();
-      console.info(index, me.filtered_users.length);
       if (index === -1 && me.filtered_users.length > 0) {
         me.setSelectedUserId(me.filtered_users[0].id);
       } else if (index >= 0 && index < me.filtered_users.length) {
diff --git a/server_model.js b/server_model.js
index dfa5627..8458e41 100644
--- a/server_model.js
+++ b/server_model.js
@@ -94,7 +94,7 @@ Asana.ServerModel = {
     var self = this;
     Asana.ApiBridge.request(
         "GET", "/workspaces/" + workspace_id + "/users",
-        { opt_fields: "name, photo.image_27x27" },
+        { opt_fields: "name,photo.image_27x27" },
         function(response) {
           self._makeCallback(response, callback, errback);
         }, options);

From b0f447a372e6a024cdb5f12348664641c2aa89b5 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Fri, 31 May 2013 18:36:26 -0700
Subject: [PATCH 15/63] Load correct typekit for locale

---
 load_typekit.js | 69 ++++++++++++++++++++++++++++++++++++++++++++++++-
 popup.html      |  2 --
 popup.js        |  1 -
 3 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/load_typekit.js b/load_typekit.js
index 25e75c3..5064ac5 100644
--- a/load_typekit.js
+++ b/load_typekit.js
@@ -1 +1,68 @@
-try{Typekit.load();}catch(e){}
+(function() {
+
+  // From luna_page.js
+  var ISO3316_LANGUAGE_CODES_FOR_NON_LATIN1 = [
+    'cs', // Czech
+    // The only German character that seems to not be in our font is 0159
+    // (see http://alt-codes.org/list/german/) and it seems close enough to
+    // not warrant loading a heavier font so commenting out.
+//     'de', // German
+
+    'hu', // Hungarian
+    'pl', // Polish
+    'ro', // Romanian
+    'hr', // Croatian
+    'sk', // Slovak
+    'sl', // Slovene
+    'eo', // Esperanto
+    'gl', // Galician
+    'mt', // Maltese
+    'tr', // Turkish
+    'et', // Estonian
+    'lv', // Latvian
+    'lt', // Lithuanian
+    'iu', 'ik', 'kl', // Eskimo
+    'se', // "Northern" Sami
+
+//    Cyrillic - seems like this shouldn't be an issue (see comment below)
+//    but we've gotten specific reports
+
+    'bg', // Bulgarian
+    'be', // Byelorussian aka Belarisuian,
+    'mk', // Macedonian
+    'ru', // Russian
+    'sr', // Serbian
+    'uk' // Ukrainian
+
+//    Commented out languages with no Latin characters since
+//    other languages only look bad when they mix Latin characters
+//    from our font with extended characters from the system font.
+
+//     'el', // Greek
+
+    // Skipping Arabic since RTL
+    // Skipping Hebrew since RTL
+    // Couldn't find Lappish in http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+    // Couldn't find Nordic
+    // Couldn't find Inuit
+  ];
+
+  chrome.i18n.getAcceptLanguages(function(language_list) {
+    var languages = language_list.join(",");
+    var non_latin1 = ISO3316_LANGUAGE_CODES_FOR_NON_LATIN1.filter(function(code) {
+      return languages.indexOf(code) !== -1;
+    });
+    Asana.TYPEKIT_ID = non_latin1.length > 0 ? "hra6rda" : "sli4yxq";
+    console.info("Accepting languages: " + languages + " using typekit " +
+        Asana.TYPEKIT_ID);
+
+    var head = document.getElementsByTagName('head')[0];
+    var script = document.createElement('script');
+    script.type = 'text/javascript';
+    script.src = 'https://use.typekit.net/' + Asana.TYPEKIT_ID + '.js';
+    script.onload = function() {
+      try{Typekit.load();}catch(e){}
+    };
+    head.appendChild(script);
+  });
+})();
diff --git a/popup.html b/popup.html
index 2ef8bf5..1e01c25 100644
--- a/popup.html
+++ b/popup.html
@@ -13,8 +13,6 @@
   <script type="text/javascript" src="options.js"></script>
   <script type="text/javascript" src="api_bridge.js"></script>
   <script type="text/javascript" src="server_model.js"></script>
-  <!-- TODO: detect non-latin language and use alternate typekit -->
-  <script type="text/javascript" src="https://use.typekit.net/sli4yxq.js"></script>
   <script type="text/javascript" src="load_typekit.js"></script>
   <link rel="stylesheet" href="popup.css"/>
 </head>
diff --git a/popup.js b/popup.js
index f4ca8f3..8c57692 100644
--- a/popup.js
+++ b/popup.js
@@ -319,7 +319,6 @@ UserTypeahead = function(id) {
       me._confirmSelection();
       return true;
     } else if (e.which === 27) {
-      // TODO: for some reason this still exits the popup
       e.stopPropagation();
       me.input.blur();
       return false;

From a6162f32409cab9d14ffa076e11789a2cdfe6144 Mon Sep 17 00:00:00 2001
From: Andrew Watterson <andrew@asana.com>
Date: Fri, 31 May 2013 18:43:16 -0700
Subject: [PATCH 16/63] Checkpoint.

---
 popup.css  |  87 +++++++++++++++++++++++++++++++++++++++++++----------
 popup.html |  18 ++++++-----
 sprite.png | Bin 2168 -> 8597 bytes
 3 files changed, 81 insertions(+), 24 deletions(-)

diff --git a/popup.css b/popup.css
index c596767..eaf9498 100644
--- a/popup.css
+++ b/popup.css
@@ -5,16 +5,25 @@
 .close-x {
   display: block;
   cursor: pointer;
-  width: 14px;
-  height: 14px;
-  background-image: url(sprite.png);
-  background-position: 0px -100px;
-  background-repeat: no-repeat;
+  width: 16px;
+  height: 16px;
+  margin: 4px auto;
+  background-position: -175px 0px;
 }
 .close-x:hover {
-  background-position: -50px -100px;
+  background-position: -175px -25px;
 }
 
+.dropdown-arrow {
+  background-position: -150px 0px;
+  width: 16px;
+  height: 16px;
+  margin: 5px auto;  
+}
+
+.dropdown-arrow:hover, .button:hover .dropdown-arrow {
+  background-position: -150px -25px;
+}
 
 .button {
   border-radius: 3px 3px 3px 3px;
@@ -25,7 +34,6 @@
   padding: 4px 10px 5px;
   font-size: 14px;
   font-weight: 600;
-  line-height: 100%;
   white-space: nowrap;
   cursor: pointer;
   text-align: center;
@@ -84,40 +92,81 @@ body {
   height: 310px;  /* keep this correct for the window-based (non-button) version */
   padding: 0px;
   margin: 0px;
-  margin-top: 1px;
   background-color: #fff;
   font-size: 14px;
   font-family: proxima-nova, "Helvetica Neue", Arial, sans-serif;
 }
 
+a, input, textarea {
+  outline: none;
+}
+
+.sprite {
+  background-image: url('./sprite.png');
+  background-size: 250px 75px;
+  background-repeat: no-repeat;
+  display: inline-block;
+}
+
 .left-column {
   display: inline-block;
   margin-left: 12px;
-  width: 26px;
+  width: 24px;
+  height: 24px;
+  vertical-align: middle;
 }
 .middle-column {
   display: inline-block;
-  width: 342px;
+  width: 310px;
   padding: 0 8px 0 8px;
+  vertical-align: middle;
 }
 .right-column {
   display: inline-block;
   margin-right: 12px;
-  width: 26px;
+  width: 24px;
+  height: 24px;
+  vertical-align: middle;
+}
+
+.left-column .sprite {
+  margin-top: 3px;
+  height: 18px;
+  width: 24px;
 }
 
 /* Popup areas */
 
 .banner {
-  font-size: 20px;
+  font-size: 19px;
   font-weight: 600;
   background-color:#f2f2f2;
-  padding: 10px 14px 8px;
   color: #596573;
   text-shadow: 0px 1px #fff;
-  border-bottom: 1px solid #E5E5E5;
-  -webkit-box-shadow: inset 0px -1px rgba(0,0,0,0.1);
-  -webkit-border-radius: 5px 5px 0px 0px;
+  border-bottom: 1px solid #c0ccd7;
+  -webkit-border-radius: 1px 1px 0px 0px;
+  background: -webkit-gradient(linear, left top, left bottom, from(white), color-stop(100%, #edf1f4));
+}
+
+.notes-row .left-column, .notes-row .middle-column, .notes-row .right-column {
+  vertical-align: top;
+}
+
+.banner .middle-column {
+  line-height: 46px;
+  padding-top: 2px;
+}
+
+.banner .button {
+  height: 26px;
+  width: 26px;
+  border: 1px solid #c0ccd7;
+  box-shadow: 0px 1px 0px 0px white;
+  padding: 0;
+}
+
+.banner .button:hover {
+  background-color: rgba(17,77,151,.08);
 }
 
 .banner-add {
@@ -128,6 +177,12 @@ body {
   font-weight: 200;
 }
 
+#workspace_select_container {
+  display: inline-block;
+  vertical-align: middle;
+  line-height: 100%;
+}
+
 #workspace_select {
   opacity: 0;
   position: absolute;
diff --git a/popup.html b/popup.html
index 1e01c25..0a0f83c 100644
--- a/popup.html
+++ b/popup.html
@@ -21,24 +21,26 @@
 
   <div id="add_view" style="display:none">
     <div class="banner">
-      <div class="left-column"></div>
+      <div class="left-column">
+        <div id="logo" class="sprite"></div>
+      </div>
       <div class="middle-column">
         <span class="banner-add">
           Add to
           <span id="workspace"></span>
-          <span id="workspace_select_container">
-            <span class="button"><span class="dropdown-arrow"></span></span>
+          <div id="workspace_select_container">
+            <div class="button"><div class="dropdown-arrow sprite"></div></div>
             <select id="workspace_select"><option>Loading...</option></select>
-          </span>
+          </div>
         </span>
       </div>
       <div class="right-column">
-        <a id="close_popup" class="close-x" tabindex="-1"></a>
+        <a id="close_popup" class="sprite close-x" tabindex="-1"></a>
       </div>
     </div>
     <div class="name-row">
       <div class="left-column">
-        <span class="icon-checkbox"></span>
+        <span class="icon-checkbox sprite"></span>
       </div>
       <div class="middle-column">
         <input id="name_input" tabindex="0"/>
@@ -49,7 +51,7 @@
     </div>
     <div class="notes-row">
       <div class="left-column">
-        <span class="icon-notes"></span>
+        <span class="icon-notes sprite"></span>
       </div>
       <div class="middle-column">
         <textarea id="notes_input" tabindex="0" placeholder="Description"></textarea>
@@ -58,7 +60,7 @@
     </div>
     <div class="assignee-row">
       <div class="left-column">
-        <span class="icon-assignee"></span>
+        <span class="icon-assignee sprite"></span>
       </div>
       <div class="middle-column">
         <input id="assignee_input"/>
diff --git a/sprite.png b/sprite.png
index 7f590482045afc50b84405a7a7e7fa59045ab6c8..d51cd179f2f1f681b1f5b95aa4085507a68419fe 100644
GIT binary patch
literal 8597
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

literal 2168
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
LdqnMJ&xHR0NNEI$


From 6e39ad196d9ec4b83a066c855e460537af14e51c Mon Sep 17 00:00:00 2001
From: Andrew Watterson <andrew@asana.com>
Date: Fri, 31 May 2013 18:48:54 -0700
Subject: [PATCH 17/63] More changes.

---
 popup.css  | 17 +++++++++++++++++
 popup.html |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/popup.css b/popup.css
index eaf9498..22f9e9d 100644
--- a/popup.css
+++ b/popup.css
@@ -177,6 +177,18 @@ a, input, textarea {
   font-weight: 200;
 }
 
+.icon-checkbox {
+  background-position: -25px 0px;
+}
+
+.icon-notes {
+  background-position: -50px 0px;
+}
+
+.icon-assignee {
+  background-position: -75px 0px;
+}
+
 #workspace_select_container {
   display: inline-block;
   vertical-align: middle;
@@ -187,6 +199,11 @@ a, input, textarea {
   opacity: 0;
   position: absolute;
   right: 0px;
+  top: 0px;
+}
+
+#workspace_select:hover ~ .button {
+  background-color: red;
 }
 
 .name-row {
diff --git a/popup.html b/popup.html
index 0a0f83c..12f5cb3 100644
--- a/popup.html
+++ b/popup.html
@@ -46,7 +46,7 @@
         <input id="name_input" tabindex="0"/>
       </div>
       <div class="right-column">
-        <span id="use_page_details" class="button" title="Use page title for task details"><span class="icon-use-link"></span></span>
+        <span id="use_page_details" class="button" title="Insert page title and URL"><span class="icon-use-link"></span></span>
       </div>
     </div>
     <div class="notes-row">

From 150085badeffdbf919db5bf4b11704e5778245ee Mon Sep 17 00:00:00 2001
From: Andrew Watterson <andrew@asana.com>
Date: Fri, 31 May 2013 22:15:21 -0700
Subject: [PATCH 18/63] Finalized CSS.

---
 popup.css         | 274 +++++++++++++++++++++++++++++++++++-----------
 popup.html        |  58 +++++-----
 popup.js          |  33 ++++--
 sprite-retina.png | Bin 0 -> 7943 bytes
 sprite.png        | Bin 8597 -> 4301 bytes
 5 files changed, 265 insertions(+), 100 deletions(-)
 create mode 100644 sprite-retina.png

diff --git a/popup.css b/popup.css
index 22f9e9d..9f7010b 100644
--- a/popup.css
+++ b/popup.css
@@ -7,7 +7,7 @@
   cursor: pointer;
   width: 16px;
   height: 16px;
-  margin: 4px auto;
+  margin: 8px 0px 0px -4px;
   background-position: -175px 0px;
 }
 .close-x:hover {
@@ -21,7 +21,7 @@
   margin: 5px auto;  
 }
 
-.dropdown-arrow:hover, .button:hover .dropdown-arrow {
+.dropdown-arrow:hover, #workspace_select:hover ~ .button .dropdown-arrow {
   background-position: -150px -25px;
 }
 
@@ -76,6 +76,15 @@
   text-shadow: none;
 }
 
+.big-button {
+  padding: 10px 20px;
+  border-radius: 6px;
+}
+
+.big-button .button-text {
+  font-size: 18px;
+}
+
 a:link, a:visited {
   color: #1F8DD6;
   text-decoration: none;
@@ -84,6 +93,34 @@ a:hover {
   text-decoration: underline;
 }
 
+::-webkit-scrollbar{
+  width: 14px;
+}
+::-webkit-scrollbar-thumb {
+  background: rgba(0,0,0,.05);
+  box-shadow: inset 0px -1px rgba(0,0,0,.12);
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: rgba(0,0,0, .08);
+}
+
+::-webkit-scrollbar-track {
+  background-color: rgba(0,0,0, .05);
+}
+
+textarea::-webkit-scrollbar {
+  width: 7px;
+  background: #E5F1FF;
+}
+textarea::-webkit-scrollbar-thumb {
+  background: rgba(116, 193, 237, 0.3);
+}
+textarea::-webkit-scrollbar-thumb:hover {
+  background: rgba(116, 193, 237, 0.5);
+}
+
+
 /* Popup-specific layout */
 
 body {
@@ -103,11 +140,17 @@ a, input, textarea {
 
 .sprite {
   background-image: url('./sprite.png');
-  background-size: 250px 75px;
   background-repeat: no-repeat;
   display: inline-block;
 }
 
+@media only screen and (-webkit-min-device-pixel-ratio: 2) {
+	.sprite {
+    background-image: url('./sprite-retina.png');
+    background-size: 250px 75px;
+  }
+}
+
 .left-column {
   display: inline-block;
   margin-left: 12px;
@@ -117,16 +160,18 @@ a, input, textarea {
 }
 .middle-column {
   display: inline-block;
-  width: 310px;
+  width: 304px;
   padding: 0 8px 0 8px;
   vertical-align: middle;
 }
 .right-column {
   display: inline-block;
-  margin-right: 12px;
-  width: 24px;
-  height: 24px;
+  margin-right: 8px;
+  margin-left: 4px;
+  width: 32px;
+  height: 32px;
   vertical-align: middle;
+  text-align: center;
 }
 
 .left-column .sprite {
@@ -148,7 +193,8 @@ a, input, textarea {
   background: -webkit-gradient(linear, left top, left bottom, from(white), color-stop(100%, #edf1f4));
 }
 
-.notes-row .left-column, .notes-row .middle-column, .notes-row .right-column {
+.notes-row .left-column, .notes-row .middle-column, .notes-row .right-column,
+.assignee-row .left-column, .assignee-row .middle-column, .assignee-row .right-column {
   vertical-align: top;
 }
 
@@ -165,8 +211,9 @@ a, input, textarea {
   padding: 0;
 }
 
-.banner .button:hover {
-  background-color: rgba(17,77,151,.08);
+#workspace_select:hover ~ .button {
+  border: 1px solid #afbcc8;
+  background: -webkit-gradient(linear, left top, left bottom, from(white), color-stop(100%, #dde4ea));
 }
 
 .banner-add {
@@ -181,11 +228,13 @@ a, input, textarea {
   background-position: -25px 0px;
 }
 
-.icon-notes {
+.sprite.icon-notes {
+  margin-top: 5px;
   background-position: -50px 0px;
 }
 
-.icon-assignee {
+.sprite.icon-assignee {
+  margin-top: 6px;
   background-position: -75px 0px;
 }
 
@@ -199,34 +248,122 @@ a, input, textarea {
   opacity: 0;
   position: absolute;
   right: 0px;
-  top: 0px;
+  top: -4px;
+  padding: 8px 0px;
+  -webkit-appearance: none;
+  margin: 0;
 }
 
-#workspace_select:hover ~ .button {
-  background-color: red;
+.name-row {
+  padding-top: 11px;
+  padding-bottom: 12px;
 }
 
-.name-row {
-  padding-top: 14px;
+#name_input, #notes_input, #assignee, #assignee_input {
+  width: 100%;
 }
+
 .name-row #name_input {
   font-size: 20px;
-  width: 100%;
+}
+
+.notes-row {
+  border-bottom: 1px solid #e5e5e5;
+  padding-bottom: 4px;
+}
+
+.assignee-row {
+  padding-top: 8px;
 }
 
 .notes-row #notes_input {
-  width: 100%;
   resize: none;
   height: 96px;
 }
 
-.user.selected {
-  background-color: #cccccc;
+#use_page_details {
+  width: 20px;
+  height: 20px;
+  position: relative;
+  border: 1px solid transparent;
+  border-radius: 3px;
+  padding: 5px 2px 3px 6px;
+  cursor: pointer;
+}
+
+#use_page_details:not(.disabled):hover {
+  border: 1px solid #e5e5e5;
 }
+
+#use_page_details.disabled {
+  opacity: .25;
+  cursor: default;
+}
+
+#use_page_details:not(.disabled):hover .icon-use-link-arrow {
+  background-position: -225px -25px;
+}
+
+.icon-use-link {
+  height: 16px;
+  width: 16px;
+}
+
+.icon-use-link.no-favicon {
+  height: 18px;
+  width: 18px;
+  background-position: -200px 0px;
+}
+
+#use_page_details:not(.disabled):hover .icon-use-link.no-favicon {
+  background-position: -200px -25px;
+}
+
+.icon-use-link-arrow {
+  height: 18px;
+  width: 18px;
+  background-position: -225px 0px;
+  position: absolute;
+  top: 7px;
+  left: 3px;
+}
+
+#assignee {
+  font-weight: bold;
+}
+
+#assignee .user-photo-frame {
+  margin: -5px 7px -5px 0px;
+}
+
+#assignee .unassigned {
+  color: #a9a9a9;
+  font-weight: normal;
+}
+
+.user {
+  line-height: 34px;
+  font-size: 12px;
+  font-weight: bold;
+  padding-left: 54px;
+}
+
+.user.selected, .user:hover {
+  background-color: #1F8DD6;
+  color: white;
+}
+
 .user-photo-frame {
+  height: 27px;
+  width: 27px;
   display: inline-block;
+  vertical-align: middle;
+  margin-right: 7px;
 }
 .user-photo {
+  height: 27px;
+  width: 27px;
+  border-radius: 2px;
 }
 .user-name {
   display: inline-block;
@@ -235,72 +372,85 @@ a, input, textarea {
 }
 
 #assignee_list_container {
-  height: 126px;
+  height: 121px;
   overflow-x: hidden;
   overflow-y: scroll;
+  border-bottom: 1px solid #e5e5e5;
+  margin-top: 8px;
 }
 
 .footer {
-  background: xcxc;
-  padding: 8px 0 10px 0;
+  padding: 14px 0px;
 }
 
 
-#error {
-  width: 100%;
-  padding: 10px 14px;
-  background-color: #434C56;
-  font-weight: 500;
-  color: #ECF0F3;
-}
-.icon-error {
-  background-image: url(sprite.png);
-  background-position: 0px 0px;
-  background-repeat: no-repeat;
-  width: 19px;
-  min-width: 19px;
-  height: 16px;
-  min-height: 16px;
-  margin-bottom: -2px;
+#success, #error {
+  width: 175px;
   display: inline-block;
-
+  vertical-align: middle;
+  margin-left: 15px;
+  font-size: 12px;
+  line-height: 17px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
-
-#add_view {
-  padding-bottom: 12px;
+#success a, #error a {
+  font-weight: bold;
+  text-decoration: none;
+  color: #5998c0;
 }
 
-
 #login_view {
-  padding-top: 10px;
   width: 100%;
+  font-weight: 600;
+  height: 100%;
+  background-color: #edf1f4;
+}
+
+#login_view .content {
+  padding-top: 70px;
+  width: 250px;
+  margin: 0 auto;
   text-align: center;
+  font-size: 19px;
   font-weight: 600;
-  width: 382px;
+  color: #596573;
 }
 
-.icon-success {
-  background-image: url(sprite.png);
-  background-position: 0px -50px;
-  background-repeat: no-repeat;
-  width: 19px;
-  min-width: 19px;
+#login_view .button {
+  margin-top: 24px;
+}
+
+.icon-success, .icon-error {
+  width: 16px;
   height: 16px;
-  min-height: 16px;
-  margin-bottom: -2px;
   display: inline-block;
+  vertical-align: top;
+  margin-right: 3px;
 }
 
-input, textarea {
-  -webkit-border-radius: 3px;
-  border: 1px solid rgba(0,0,0,0.2);
+.icon-success { background-position: -100px 0px; }
+.icon-error { background-position: -125px 0px; margin-right: 7px; }
+
+input, textarea, #assignee {
   color: #212F40;
-  padding: 4px 5px 3px;
-  -webkit-box-shadow: inset 0px 1px 1px rgba(0,0,0,0.1), 0px 1px #fff;
-}
-select, input, textarea {
+  padding: 6px 5px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 3px;
   font-size: 14px;
   font-family: proxima-nova, "Helvetica Neue", Arial, sans-serif;
   color: #212F40;
+  margin: 0;
+}
+
+input:hover, textarea:hover, #assignee:hover {
+  border: 1px solid #cccccc;
+  -webkit-box-shadow: inset 0px 1px 1px rgba(0,0,0,0.1);
+}
+
+input:focus, textarea:focus {
+  border: 1px solid #74C1ED;
+  box-shadow: 0px 0px 5px 1px rgba(31, 141, 214, 0.3);
 }
\ No newline at end of file
diff --git a/popup.html b/popup.html
index 12f5cb3..5c5c668 100644
--- a/popup.html
+++ b/popup.html
@@ -29,8 +29,8 @@
           Add to
           <span id="workspace"></span>
           <div id="workspace_select_container">
-            <div class="button"><div class="dropdown-arrow sprite"></div></div>
             <select id="workspace_select"><option>Loading...</option></select>
+            <div class="button"><div class="dropdown-arrow sprite"></div></div>
           </div>
         </span>
       </div>
@@ -43,10 +43,10 @@
         <span class="icon-checkbox sprite"></span>
       </div>
       <div class="middle-column">
-        <input id="name_input" tabindex="0"/>
+        <input id="name_input" tabindex="0" placeholder="Task" />
       </div>
       <div class="right-column">
-        <span id="use_page_details" class="button" title="Insert page title and URL"><span class="icon-use-link"></span></span>
+        <div id="use_page_details" title="Insert page title and URL"><div class="icon-use-link-arrow sprite"></div><div class="icon-use-link"></div></div>
       </div>
     </div>
     <div class="notes-row">
@@ -63,54 +63,54 @@
         <span class="icon-assignee sprite"></span>
       </div>
       <div class="middle-column">
-        <input id="assignee_input"/>
+        <input id="assignee_input" placeholder="Assignee" />
         <div id="assignee" tabindex="0"></div>
-        <div id="assignee_list_container">
-          <div id="assignee_list"></div>
-        </div>
-
       </div>
       <div class="right-column"></div>
     </div>
 
+    <div id="assignee_list_container">
+      <div id="assignee_list"></div>
+    </div>
+
+
     <div class="footer">
       <div class="left-column"></div>
       <div class="middle-column">
         <div id="add_button" tabindex="0" class="button primary-button disabled">
           <span class="button-text">Add to Asana</span>
         </div>
+        <div id="error" style="display:none">
+          <div class="sprite icon-error"></div>
+          Error. Please try again.
+        </div>
+        <div id="success" style="display:none">
+          <div class="sprite icon-success"></div>
+          Added <a id="new_task_link" target="_blank" href=""></a>
+        </div>
       </div>
     </div>
 
-    <div id="success" style="display:none">
-      <div class="left-column">
-        <span class="icon-success"></span>
-      </div>
-      <div class="middle-column">
-        Added <a id="new_task_link" target="_blank" href=""></a> to <span id="new_task_workspace_name"></span>.
-      </div>
-      <div class="right-column"></div>
-    </div>
 
-    <div id="error" style="display:none">
-      <div class="left-column">
-        <span class="icon-error"></span>
-      </div>
-      <div class="middle-column">
-        There was an error. Your task was not added.
-      </div>
-      <div class="right-column"></div>
-    </div>
   </div>
 
   <div id="login_view" style="display:none">
     <div class="banner">
-      Add to Asana
-      <a id="close-banner" class="close-x" tabindex="-1"></a>
+      <div class="left-column">
+        <div id="logo" class="sprite"></div>
+      </div>
+      <div class="middle-column">
+        <span class="banner-add">
+          Add to Asana
+        </span>
+      </div>
+      <div class="right-column">
+        <a id="close_login" class="sprite close-x" tabindex="-1"></a>
+      </div>
     </div>
     <div class="content">
       You must log in to Asana before you can add tasks.
-      <span id="login_button" class="button"><span class="button-text">Log In to Asana</span></span>
+      <span id="login_button" class="primary-button button big-button"><span class="button-text">Log In to Asana</span></span>
     </div>
   </div>
 
diff --git a/popup.js b/popup.js
index 8c57692..5d52bf5 100644
--- a/popup.js
+++ b/popup.js
@@ -89,19 +89,30 @@ Popup = {
       }
     });
 
-    $("#close_popup").click(function() {
+    $(".close-x").click(function() {
       window.close();
     });
 
+    $("#name_input").keyup(me.checkToDisablePageDetailsButton);
+    $("#notes_input").keyup(me.checkToDisablePageDetailsButton);
+
     $("#use_page_details").click(function() {
-      $("#name_input").val(me.page_title);
-      var notes = $("#notes_input");
-      notes.val(notes.val() + me.page_url + me.page_selection);
+      if(!($("#use_page_details").hasClass('disabled'))) {
+        $("#name_input").val(me.page_title);
+        var notes = $("#notes_input");
+        notes.val(notes.val() + me.page_url + me.page_selection);
+      }
     });
 
     me.typeahead = new UserTypeahead("assignee");
   },
 
+  checkToDisablePageDetailsButton: function() {
+    console.log($("#name_input").val(),$("#notes_input").val());
+    if($("#name_input").val() != "" || $("#notes_input").val() != "") { $("#use_page_details").addClass('disabled'); }
+    else { $("#use_page_details").removeClass('disabled'); }  
+  },
+
   showView: function(name) {
     ["login", "add"].forEach(function(view_name) {
       $("#" + view_name + "_view").css("display", view_name === name ? "" : "none");
@@ -124,7 +135,11 @@ Popup = {
     name_input.select();
 
     // TODO: handle when no favicon
-    $(".icon-use-link").css("background-image", "url(" + favicon_url + ")");
+    if(favicon_url) {
+      $(".icon-use-link").css("background-image", "url(" + favicon_url + ")");
+    } else {
+      $(".icon-use-link").addClass("no-favicon sprite");
+    }
 
     Asana.ServerModel.me(function(user) {
       // Just to cache result.
@@ -173,7 +188,7 @@ Popup = {
 
   showError: function(message) {
     console.log("Error: " + message);
-    $("#error").css("display", "");
+    $("#error").css("display", "inline-block");
   },
 
   hideError: function() {
@@ -257,10 +272,10 @@ Popup = {
     var me = this;
     Asana.ServerModel.taskViewUrl(task, function(url) {
       var name = task.name.replace(/^\s*/, "").replace(/\s*$/, "");
-      $("#new_task_workspace_name").text(me.workspaceById(me.readWorkspaceId()).name);
+      //$("#new_task_workspace_name").text(me.workspaceById(me.readWorkspaceId()).name);
       var link = $("#new_task_link");
       link.attr("href", url);
-      link.text(name !== "" ? name : "unnamed task");
+      link.text(name !== "" ? name : "Task");
       link.unbind("click");
       link.click(function() {
         chrome.tabs.create({url: url});
@@ -268,7 +283,7 @@ Popup = {
         return false;
       });
       me.resetFields();
-      $("#success").css("display", "");
+      $("#success").css("display", "inline-block");
     });
   },
 
diff --git a/sprite-retina.png b/sprite-retina.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9506408d8140a02731cab587e117f16462bcb85
GIT binary patch
literal 7943
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
b0-yop$t_innU*J<!lS2cq=nOX^y2>j&TBbi

literal 0
HcmV?d00001

diff --git a/sprite.png b/sprite.png
index d51cd179f2f1f681b1f5b95aa4085507a68419fe..13da6ede1c428f047566c93da66dd0cee761b053 100644
GIT binary patch
literal 4301
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

literal 8597
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


From fd957b68e85fa4d883d5830cabb23fe711ab875c Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Sat, 1 Jun 2013 00:08:58 -0700
Subject: [PATCH 19/63] added logging, default assigned to logged-in user

---
 api_bridge.js   | 10 ++++--
 popup.js        | 84 ++++++++++++++++++++++++++++++++++++++++---------
 server_model.js |  8 +++++
 3 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/api_bridge.js b/api_bridge.js
index aa550d3..46f9d3f 100644
--- a/api_bridge.js
+++ b/api_bridge.js
@@ -90,10 +90,16 @@ Asana.ApiBridge = {
       }
     }
 
+    var manifest = chrome.runtime.getManifest();
+    var client_name = [
+      "chrome-extension",
+      chrome.i18n.getMessage("@@extension_id"),
+      manifest.version,
+      manifest.name
+    ];
+
     var url = me.baseApiUrl() + path;
     var body_data;
-    var client_name = "chrome-extension:" +
-        chrome.i18n.getMessage("@@extension_id");
     if (http_method === "PUT" || http_method === "POST") {
       // POST/PUT request, put params in body
       body_data = {
diff --git a/popup.js b/popup.js
index 5d52bf5..5c8d717 100644
--- a/popup.js
+++ b/popup.js
@@ -9,9 +9,16 @@ Popup = {
   page_selection: null,
   favicon_url: null,
 
+  // State to track so we only log events once.
+  has_edited_name: false,
+  has_edited_notes: false,
+  has_reassigned: false,
+  has_used_page_details: false,
+
   workspaces: null,
   users: null,
   typeahead: null,
+  user_id: null,
 
   onLoad: function() {
     var me = this;
@@ -36,6 +43,9 @@ Popup = {
         Asana.ServerModel.isLoggedIn(function(is_logged_in) {
           if (is_logged_in) {
             if (window.quick_add_request) {
+              Asana.ServerModel.logEvent({
+                name: "ChromeExtension-Open-QuickAdd"
+              });
               // If this was a QuickAdd request (set by the code popping up
               // the window in Asana.ExtensionServer), then we have all the
               // info we need and should show the add UI right away.
@@ -44,6 +54,9 @@ Popup = {
                   quick_add_request.selected_text,
                   quick_add_request.favicon_url);
             } else {
+              Asana.ServerModel.logEvent({
+                name: "ChromeExtension-Open-Button"
+              });
               // Otherwise we want to get the selection from the tab that
               // was active when we were opened. So we set up a listener
               // to listen for the selection send event from the content
@@ -85,22 +98,50 @@ Popup = {
     // Close the popup if the ESCAPE key is pressed.
     $(window).keypress(function(e) {
       if (e.which === 27) {
+        Asana.ServerModel.logEvent({
+          name: "ChromeExtension-Abort"
+        });
         window.close();
       }
     });
 
     $(".close-x").click(function() {
+      Asana.ServerModel.logEvent({
+        name: "ChromeExtension-Abort"
+      });
       window.close();
     });
 
-    $("#name_input").keyup(me.checkToDisablePageDetailsButton);
-    $("#notes_input").keyup(me.checkToDisablePageDetailsButton);
+    $("#name_input").keyup(function() {
+      if (!me.has_edited_name && $("#name_input").val() !== "") {
+        me.has_edited_name = true;
+        Asana.ServerModel.logEvent({
+          name: "ChromeExtension-ChangedTaskName"
+        });
+      }
+      me.checkToDisablePageDetailsButton();
+    });
+    $("#notes_input").keyup(function() {
+      if (!me.has_edited_notes && $("#notes_input").val() !== "") {
+        me.has_edited_notes= true;
+        Asana.ServerModel.logEvent({
+          name: "ChromeExtension-ChangedTaskNotes"
+        });
+      }
+      me.checkToDisablePageDetailsButton();
+    });
 
     $("#use_page_details").click(function() {
-      if(!($("#use_page_details").hasClass('disabled'))) {
+      if (!($("#use_page_details").hasClass('disabled'))) {
         $("#name_input").val(me.page_title);
         var notes = $("#notes_input");
         notes.val(notes.val() + me.page_url + me.page_selection);
+        if (!me.has_used_page_details) {
+          me.has_used_page_details = true;
+          Asana.ServerModel.logEvent({
+            name: "ChromeExtension-UsedPageDetails"
+          });
+        }
       }
     });
 
@@ -108,9 +149,11 @@ Popup = {
   },
 
   checkToDisablePageDetailsButton: function() {
-    console.log($("#name_input").val(),$("#notes_input").val());
-    if($("#name_input").val() != "" || $("#notes_input").val() != "") { $("#use_page_details").addClass('disabled'); }
-    else { $("#use_page_details").removeClass('disabled'); }  
+    if ($("#name_input").val() !== "" || $("#notes_input").val() !== "") {
+      $("#use_page_details").addClass('disabled');
+    } else {
+      $("#use_page_details").removeClass('disabled');
+    }
   },
 
   showView: function(name) {
@@ -134,15 +177,14 @@ Popup = {
     name_input.focus();
     name_input.select();
 
-    // TODO: handle when no favicon
-    if(favicon_url) {
+    if (favicon_url) {
       $(".icon-use-link").css("background-image", "url(" + favicon_url + ")");
     } else {
       $(".icon-use-link").addClass("no-favicon sprite");
     }
 
     Asana.ServerModel.me(function(user) {
-      // Just to cache result.
+      me.user_id = user.id;
       Asana.ServerModel.workspaces(function(workspaces) {
         me.workspaces = workspaces;
         var select = $("#workspace_select");
@@ -158,7 +200,9 @@ Popup = {
         }
         select.val(me.options.default_workspace_id);
         me.onWorkspaceChanged();
-        select.change(function() { me.onWorkspaceChanged(); });
+        select.change(function() {
+          me.onWorkspaceChanged();
+        });
       });
     });
   },
@@ -224,9 +268,9 @@ Popup = {
     me.setAddEnabled(false);
     Asana.ServerModel.users(workspace_id, function(users) {
       me.typeahead.updateUsers(users);
-//      Asana.ServerModel.me(function(user) {
-//        me.typeahead.setSelectedUserId(user.id);
-//      });
+      Asana.ServerModel.me(function(user) {
+        me.typeahead.setSelectedUserId(user.id);
+      });
       me.setAddEnabled(true);
     });
   },
@@ -258,10 +302,16 @@ Popup = {
           assignee: me.typeahead.selected_user_id
         },
         function(task) {
+          Asana.ServerModel.logEvent({
+            name: "ChromeExtension-CreateTask-Success"
+          });
           me.setAddWorking(false);
           me.showSuccess(task);
         },
         function(response) {
+          Asana.ServerModel.logEvent({
+            name: "ChromeExtension-CreateTask-Failure"
+          });
           me.setAddWorking(false);
           me.showError(response.errors[0].message);
         });
@@ -323,6 +373,12 @@ UserTypeahead = function(id) {
   me.input.blur(function() {
     me.selected_user_id = me.user_id_to_select;
     me.has_focus = false;
+    if (!Popup.has_reassigned && me.selected_user_id !== Popup.user_id) {
+      Popup.has_reassigned = true;
+      Asana.ServerModel.logEvent({
+        name: "ChromeExtension-Reassigned"
+      });
+    }
     me.render();
   });
   me.input.keydown(function(e) {
@@ -423,8 +479,8 @@ Asana.update(UserTypeahead.prototype, {
       node.addClass("selected");
     }
     node.mousedown(function() {
-      me.user_id_to_select = user.id;
       me.setSelectedUserId(user.id);
+      me._confirmSelection();
     });
     return node;
   },
diff --git a/server_model.js b/server_model.js
index 8458e41..c2d8372 100644
--- a/server_model.js
+++ b/server_model.js
@@ -131,6 +131,14 @@ Asana.ServerModel = {
         });
   },
 
+  logEvent: function(event) {
+    Asana.ApiBridge.request(
+        "POST",
+        "/logs",
+        event,
+        function(response) {});
+  },
+
   _makeCallback: function(response, callback, errback) {
     if (response.errors) {
       (errback || this.onError).call(null, response);

From 55d1b87851fc88bfab5a6007819845e21121dff8 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Sat, 1 Jun 2013 00:11:45 -0700
Subject: [PATCH 20/63] fix client name

---
 api_bridge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api_bridge.js b/api_bridge.js
index 46f9d3f..0f70ca0 100644
--- a/api_bridge.js
+++ b/api_bridge.js
@@ -96,7 +96,7 @@ Asana.ApiBridge = {
       chrome.i18n.getMessage("@@extension_id"),
       manifest.version,
       manifest.name
-    ];
+    ].join(":");
 
     var url = me.baseApiUrl() + path;
     var body_data;

From 79abe6cca33bb0d59b8100bd2f7616c3063dc2e1 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Sat, 1 Jun 2013 00:40:02 -0700
Subject: [PATCH 21/63] fixed initial rendering of assignee

---
 popup.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/popup.js b/popup.js
index 5c8d717..45c8145 100644
--- a/popup.js
+++ b/popup.js
@@ -14,6 +14,7 @@ Popup = {
   has_edited_notes: false,
   has_reassigned: false,
   has_used_page_details: false,
+  is_first_add: true,
 
   workspaces: null,
   users: null,
@@ -268,9 +269,7 @@ Popup = {
     me.setAddEnabled(false);
     Asana.ServerModel.users(workspace_id, function(users) {
       me.typeahead.updateUsers(users);
-      Asana.ServerModel.me(function(user) {
-        me.typeahead.setSelectedUserId(user.id);
-      });
+      me.typeahead.setSelectedUserId(me.user_id);
       me.setAddEnabled(true);
     });
   },
@@ -294,6 +293,12 @@ Popup = {
     console.info("Creating task");
     me.hideError();
     me.setAddWorking(true);
+    if (!me.is_first_add) {
+      Asana.ServerModel.logEvent({
+        name: "ChromeExtension-CreateTask-MultipleTasks"
+      });
+    }
+
     Asana.ServerModel.createTask(
         me.readWorkspaceId(),
         {
@@ -333,6 +338,13 @@ Popup = {
         return false;
       });
       me.resetFields();
+
+      // Reset logging for multi-add
+      me.has_edited_name = true;
+      me.has_edited_notes = true;
+      me.has_reassigned = true;
+      me.is_first_add = false;
+
       $("#success").css("display", "inline-block");
     });
   },
@@ -369,6 +381,7 @@ UserTypeahead = function(id) {
     me.input.val("");
     me.has_focus = true;
     me.render();
+    me._ensureSelectedUserVisible();
   });
   me.input.blur(function() {
     me.selected_user_id = me.user_id_to_select;
@@ -562,7 +575,10 @@ Asana.update(UserTypeahead.prototype, {
     if (this.selected_user_id !== null) {
       $("#user_" + this.selected_user_id).addClass("selected");
     }
-    this._ensureSelectedUserVisible();
+    this._renderLabel();
+    if (this.has_focus) {
+      this._ensureSelectedUserVisible();
+    }
   }
 
 });

From c6b218c8df195b3d1d3ac3a98fb0945118904dd9 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Sat, 1 Jun 2013 00:52:11 -0700
Subject: [PATCH 22/63] assignee looks like no one but is self by default

---
 api_bridge.js |  1 +
 popup.js      | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/api_bridge.js b/api_bridge.js
index 0f70ca0..f203d15 100644
--- a/api_bridge.js
+++ b/api_bridge.js
@@ -90,6 +90,7 @@ Asana.ApiBridge = {
       }
     }
 
+    // Be polite to Asana API and tell them who we are.
     var manifest = chrome.runtime.getManifest();
     var client_name = [
       "chrome-extension",
diff --git a/popup.js b/popup.js
index 45c8145..e4f256a 100644
--- a/popup.js
+++ b/popup.js
@@ -132,11 +132,13 @@ Popup = {
       me.checkToDisablePageDetailsButton();
     });
 
-    $("#use_page_details").click(function() {
-      if (!($("#use_page_details").hasClass('disabled'))) {
+    var use_page_details_button = $("#use_page_details");
+    use_page_details_button.click(function() {
+      if (!(use_page_details_button.hasClass('disabled'))) {
         $("#name_input").val(me.page_title);
         var notes = $("#notes_input");
         notes.val(notes.val() + me.page_url + me.page_selection);
+        use_page_details_button.addClass('disabled');
         if (!me.has_used_page_details) {
           me.has_used_page_details = true;
           Asana.ServerModel.logEvent({
@@ -269,7 +271,6 @@ Popup = {
     me.setAddEnabled(false);
     Asana.ServerModel.users(workspace_id, function(users) {
       me.typeahead.updateUsers(users);
-      me.typeahead.setSelectedUserId(me.user_id);
       me.setAddEnabled(true);
     });
   },
@@ -304,7 +305,8 @@ Popup = {
         {
           name: $("#name_input").val(),
           notes: $("#notes_input").val(),
-          assignee: me.typeahead.selected_user_id
+          // Default assignee to self
+          assignee: me.typeahead.selected_user_id || me.user_id
         },
         function(task) {
           Asana.ServerModel.logEvent({
@@ -386,10 +388,12 @@ UserTypeahead = function(id) {
   me.input.blur(function() {
     me.selected_user_id = me.user_id_to_select;
     me.has_focus = false;
-    if (!Popup.has_reassigned && me.selected_user_id !== Popup.user_id) {
+    if (!Popup.has_reassigned) {
       Popup.has_reassigned = true;
       Asana.ServerModel.logEvent({
-        name: "ChromeExtension-Reassigned"
+        name: me.selected_user_id === Popup.user_id ?
+            "ChromeExtension-AssignToSelf" :
+            "ChromeExtension-AssignToOther"
       });
     }
     me.render();

From 5fbabd311855fa8d825ef38d104151d8e9dfd20d Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 00:42:49 -0700
Subject: [PATCH 23/63] cp

---
 extension_server.js |  3 ++-
 manifest.json       |  2 +-
 popup.html          |  3 +++
 popup.js            |  2 ++
 quick_add_client.js | 59 ++++++++++++++++++++++++++++++---------------
 5 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/extension_server.js b/extension_server.js
index 9084cb0..02ef005 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -18,13 +18,14 @@ Asana.ExtensionServer = {
             request.options || {});
         return true;  // will call sendResponse asynchronously
       } else if (request.type === "quick_add") {
+
         // QuickAdd request, made from a content window.
         // Open up a new popup, and set the request information on its window
         // (see popup.html for how it's used)
         var popup = window.open(
             chrome.extension.getURL('popup.html') + '?external=true',
             "asana_quick_add",
-            "dependent=1,resizable=0,location=0,menubar=0,status=0,toolbar=0,width=410,height=310");
+            "dependent=1,resizable=0,location=0,menubar=0,status=0,toolbar=0,width=410,height=310,top=100,left=100");
         popup.quick_add_request = request;
         // Quick Add should only come from a content script, so it must have
         // a `tab`.
diff --git a/manifest.json b/manifest.json
index 5ded010..43607c1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -40,6 +40,6 @@
       "quick_add_client.js"
     ],
     "run_at": "document_start",
-    "all_frames": false
+    "all_frames": true
   }]
 }
diff --git a/popup.html b/popup.html
index 5c5c668..78b4ad4 100644
--- a/popup.html
+++ b/popup.html
@@ -15,6 +15,9 @@
   <script type="text/javascript" src="server_model.js"></script>
   <script type="text/javascript" src="load_typekit.js"></script>
   <link rel="stylesheet" href="popup.css"/>
+  <title>
+    Asana Quick Add
+  </title>
 </head>
 
 <body>
diff --git a/popup.js b/popup.js
index e4f256a..1f18157 100644
--- a/popup.js
+++ b/popup.js
@@ -245,6 +245,7 @@ Popup = {
   resetFields: function() {
     $("#name_input").val("");
     $("#notes_input").val("");
+    this.typeahead.setSelectedUserId(null);
   },
 
   // Set the add button as being "working", waiting for the Asana request
@@ -340,6 +341,7 @@ Popup = {
         return false;
       });
       me.resetFields();
+      $("#name_input").focus();
 
       // Reset logging for multi-add
       me.has_edited_name = true;
diff --git a/quick_add_client.js b/quick_add_client.js
index 70b7a7a..1470621 100644
--- a/quick_add_client.js
+++ b/quick_add_client.js
@@ -16,43 +16,62 @@
  */
 Asana.QuickAddClient = {
 
-  _tab_down_time: 0,
+  KEY: "_asana_heokijphbgfagjocdkdaedfehiokfifg_tab_down_time",
+
+  USE_TAB: false,
+
+  state: function() {
+    return window[Asana.QuickAddClient.KEY];
+  },
 
   keyDown: function(e) {
     var self = Asana.QuickAddClient;
-    if (e.keyCode === 9) {
+    var now = new Date().getTime();
+    var state = self.state();
+
+    console.info("Asana quickadd keydown", e.keyCode, now, state.id, state.tab_down_time);
+    if (self.USE_TAB && e.keyCode === 9) {
       // Mark tab key as pressed at the current time.
       // If the Q key gets pressed soon enough afterward, we've hit our
       // hotkey combo.
-      self._tab_down_time = new Date().getTime();
-    } else if (e.keyCode === 81) {
-      if (new Date().getTime() < self._tab_down_time + 5000) {  // 5s timeout
-        self._tab_down_time = 0;
-        // Tab-Q!
-        // We cannot open the popup programmatically.
-        // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
-        // So we do this roundabout thing.
-        chrome.runtime.sendMessage({
-          type: "quick_add",
-          url: window.location.href,
-          title: document.title,
-          selected_text: "" + window.getSelection(),
-        });
-        e.preventDefault();
-        return false;
-      }
+      state.tab_down_time = now;
+      console.info(state.tab_down_time);
+    } else if (e.keyCode === 81 &&
+        ((self.USE_TAB && now < state.tab_down_time + 5000) || e.altKey)) {
+      state.tab_down_time = 0;
+      console.info("Asana quickadd invoked");
+      // We cannot open the popup programmatically.
+      // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
+      // So we do this roundabout thing.
+      chrome.runtime.sendMessage({
+        type: "quick_add",
+        url: window.location.href,
+        title: document.title,
+        selected_text: "" + window.getSelection()
+      });
+      e.preventDefault();
+      return false;
     }
   },
 
   keyUp: function(e) {
+
+    console.info("Asana quickadd keyup", e.keyCode);
     var self = Asana.QuickAddClient;
     if (e.keyCode === 9) {
       // Mark tab key as released.
-      self._tab_down_time = 0;
+      self.state().tab_down_time = 0;
     }
   },
 
   listen: function() {
+    console.info("listening");
+    if (!window[Asana.QuickAddClient.KEY]) {
+      window[Asana.QuickAddClient.KEY] = {
+        tab_down_time: 0,
+        id: Math.random()
+      };
+    }
     // Don't run against Asana, which already has a QuickAdd feature. ;)
     if (!/^https?:\/\/app[.]asana[.]com/.test(window.location.href) &&
         !/^https?:\/\/localhost/.test(window.location.href)) {

From 2afbf1af7afdeb4120d83a73c38407b9f94629e9 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 01:27:53 -0700
Subject: [PATCH 24/63] Alt and Tab hotkeys are now more robust

---
 background.js       |  1 -
 extension_server.js | 60 ++++++++++++++++++++++++++++++++++++---------
 manifest.json       |  1 -
 popup.js            | 13 +++-------
 quick_add_client.js | 54 +++++++++++++---------------------------
 selection_client.js | 17 -------------
 6 files changed, 70 insertions(+), 76 deletions(-)
 delete mode 100644 selection_client.js

diff --git a/background.js b/background.js
index 5eff847..fb62544 100644
--- a/background.js
+++ b/background.js
@@ -17,7 +17,6 @@ chrome.webRequest.onBeforeSendHeaders.addListener(function(details) {
     // Host must match the domain in our Typekit kit settings
     value: 'https://abkfopjdddhbjkiamjhkmogkcfedcnml'
   });
-  console.info(requestHeaders);
   return {
     requestHeaders: requestHeaders
   };
diff --git a/extension_server.js b/extension_server.js
index 02ef005..8726b80 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -4,11 +4,14 @@
  */
 Asana.ExtensionServer = {
 
+  _quick_add_modifier_keydown_time: 0,
+
   /**
    * Call from the background page: listen to chrome events and
    * requests from page clients, which can't make cross-domain requests.
    */
   listen: function() {
+    var me = this;
     Asana.ApiBridge.is_server = true;
     chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
       if (request.type === "api") {
@@ -18,18 +21,53 @@ Asana.ExtensionServer = {
             request.options || {});
         return true;  // will call sendResponse asynchronously
       } else if (request.type === "quick_add") {
+        if (request.name === "mod_down") {
+          // Mark modifier key as pressed at the current time.
+          // If the Q key gets pressed soon enough afterward, we've hit our
+          // hotkey combo.
+          me._quick_add_modifier_keydown_time = request.time;
+        } else if (request.name === "mod_up") {
+          me._quick_add_modifier_keydown_time = 0;
+        } else if (request.name === "q_down") {
+          if (request.force ||
+              request.time < me._quick_add_modifier_keydown_time + 5000) {
+            // Quick Add should only come from a content script, so it must have
+            // a `tab`.
+            var window_id = sender.tab.windowId;
+            var favicon_url = sender.tab.favIconUrl;
+            chrome.tabs.executeScript(sender.tab.id, {
+              code: "({ url: window.top.location.href, title: window.top.document.title })"
+            }, function(results) {
+              var quick_add_request = {
+                url: results[0].url,
+                title: results[0].title,
+                selected_text: request.selected_text,
+                favicon_url: favicon_url
+              };
+              chrome.windows.get(window_id, function(w) {
+                var width = 410;
+                var height = 310;
+                var top = w.top + 72;
+                var left = w.left + w.width - width;
 
-        // QuickAdd request, made from a content window.
-        // Open up a new popup, and set the request information on its window
-        // (see popup.html for how it's used)
-        var popup = window.open(
-            chrome.extension.getURL('popup.html') + '?external=true',
-            "asana_quick_add",
-            "dependent=1,resizable=0,location=0,menubar=0,status=0,toolbar=0,width=410,height=310,top=100,left=100");
-        popup.quick_add_request = request;
-        // Quick Add should only come from a content script, so it must have
-        // a `tab`.
-        popup.quick_add_request.favicon_url = sender.tab.favIconUrl;
+                // QuickAdd request, made from a content window.
+                // Open up a new popup, and set the request information on its window
+                // (see popup.html for how it's used)
+                // We cannot open the popup menu itself programmatically, so it's
+                // just a regular HTML popup.
+                // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
+                var popup = window.open(
+                    chrome.extension.getURL('popup.html') + '?external=true',
+                    "asana_quick_add",
+                    "dependent=1,resizable=0,location=0,menubar=0,status=0," +
+                        "toolbar=0,width=" + width + ",height=" + height +
+                        ",top=" + top + ",left=" + left);
+                popup.quick_add_request = quick_add_request;
+              });
+            });
+          }
+          me._quick_add_modifier_keydown_time = 0;
+        }
       }
     });
   }
diff --git a/manifest.json b/manifest.json
index 43607c1..72f113a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -36,7 +36,6 @@
     ],
     "js": [
       "asana.js",
-      "selection_client.js",
       "quick_add_client.js"
     ],
     "run_at": "document_start",
diff --git a/popup.js b/popup.js
index 1f18157..a10a878 100644
--- a/popup.js
+++ b/popup.js
@@ -76,14 +76,9 @@ Popup = {
               // send us the selection.
               var tab = tabs[0];
               chrome.tabs.executeScript(tab.id, {
-                code: "(Asana && Asana.SelectionClient) ? Asana.SelectionClient.sendSelection() : 0"
-              }, function() {
-                // The requests appear to be handled synchronously, so the
-                // selection should have been sent by the time we get this
-                // completion callback. If the timing ever changes, however,
-                // that could break and we would never show the add UI.
-                // So this could be made more robust.
-                me.showAddUi(tab.url, tab.title, selection, tab.favIconUrl);
+                code: "'' + window.getSelection()"
+              }, function(results) {
+                me.showAddUi(tab.url, tab.title, results[0], tab.favIconUrl);
               });
             }
           } else {
@@ -137,7 +132,7 @@ Popup = {
       if (!(use_page_details_button.hasClass('disabled'))) {
         $("#name_input").val(me.page_title);
         var notes = $("#notes_input");
-        notes.val(notes.val() + me.page_url + me.page_selection);
+        notes.val(notes.val() + me.page_url + "\n" + me.page_selection);
         use_page_details_button.addClass('disabled');
         if (!me.has_used_page_details) {
           me.has_used_page_details = true;
diff --git a/quick_add_client.js b/quick_add_client.js
index 1470621..9ed70db 100644
--- a/quick_add_client.js
+++ b/quick_add_client.js
@@ -20,58 +20,38 @@ Asana.QuickAddClient = {
 
   USE_TAB: false,
 
-  state: function() {
-    return window[Asana.QuickAddClient.KEY];
-  },
-
   keyDown: function(e) {
-    var self = Asana.QuickAddClient;
+    var me = Asana.QuickAddClient;
     var now = new Date().getTime();
-    var state = self.state();
 
-    console.info("Asana quickadd keydown", e.keyCode, now, state.id, state.tab_down_time);
-    if (self.USE_TAB && e.keyCode === 9) {
-      // Mark tab key as pressed at the current time.
-      // If the Q key gets pressed soon enough afterward, we've hit our
-      // hotkey combo.
-      state.tab_down_time = now;
-      console.info(state.tab_down_time);
-    } else if (e.keyCode === 81 &&
-        ((self.USE_TAB && now < state.tab_down_time + 5000) || e.altKey)) {
-      state.tab_down_time = 0;
-      console.info("Asana quickadd invoked");
-      // We cannot open the popup programmatically.
-      // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
-      // So we do this roundabout thing.
+    if (me.USE_TAB && e.keyCode === 9) {
+      chrome.runtime.sendMessage({
+        type: "quick_add",
+        name: "mod_down",
+        time: now
+      });
+    } else if (e.keyCode === 81) {
       chrome.runtime.sendMessage({
         type: "quick_add",
-        url: window.location.href,
-        title: document.title,
+        name: "q_down",
+        force: !me.USE_TAB && e.altKey,
+        time: now,
         selected_text: "" + window.getSelection()
       });
-      e.preventDefault();
-      return false;
     }
   },
 
   keyUp: function(e) {
-
-    console.info("Asana quickadd keyup", e.keyCode);
-    var self = Asana.QuickAddClient;
-    if (e.keyCode === 9) {
-      // Mark tab key as released.
-      self.state().tab_down_time = 0;
+    var me = Asana.QuickAddClient;
+    if (me.USE_TAB && e.keyCode === 9) {
+      chrome.runtime.sendMessage({
+        type: "quick_add",
+        name: "mod_up"
+      });
     }
   },
 
   listen: function() {
-    console.info("listening");
-    if (!window[Asana.QuickAddClient.KEY]) {
-      window[Asana.QuickAddClient.KEY] = {
-        tab_down_time: 0,
-        id: Math.random()
-      };
-    }
     // Don't run against Asana, which already has a QuickAdd feature. ;)
     if (!/^https?:\/\/app[.]asana[.]com/.test(window.location.href) &&
         !/^https?:\/\/localhost/.test(window.location.href)) {
diff --git a/selection_client.js b/selection_client.js
deleted file mode 100644
index c64913a..0000000
--- a/selection_client.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Module to install on a page that allows sending of the selection over to
- * the popup window when the user pops up the new task window. The popup
- * calls this method on our content window, and we get the selection
- * and send it back.
- */
-Asana.SelectionClient = {
-  // We get called when added to asana.
-  sendSelection: function() {
-    var selected_text = "" + window.getSelection();
-    console.info("Sending selection to Asana popup");
-    chrome.runtime.sendMessage({
-      type: "selection",
-      value: selected_text
-    });
-  }
-};

From 82c8dbfcb6bdcd39fe52c5513fdb0823d0d1041e Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 01:50:01 -0700
Subject: [PATCH 25/63] fill in field with selected user's name

---
 asana.js |  2 +-
 popup.js | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/asana.js b/asana.js
index 4557c39..2735dfb 100644
--- a/asana.js
+++ b/asana.js
@@ -33,7 +33,7 @@ Asana.Node = {
         $(element_from_point).closest(node).size() === 0) {
       node.scrollIntoView(/*alignWithTop=*/ false);
     }
-  },
+  }
 
 };
 
diff --git a/popup.js b/popup.js
index a10a878..5a66aa0 100644
--- a/popup.js
+++ b/popup.js
@@ -78,7 +78,9 @@ Popup = {
               chrome.tabs.executeScript(tab.id, {
                 code: "'' + window.getSelection()"
               }, function(results) {
-                me.showAddUi(tab.url, tab.title, results[0], tab.favIconUrl);
+                me.showAddUi(
+                    tab.url, tab.title, results ? results[0] : '',
+                    tab.favIconUrl);
               });
             }
           } else {
@@ -92,7 +94,7 @@ Popup = {
     // Wire up some events to DOM elements on the page.
 
     // Close the popup if the ESCAPE key is pressed.
-    $(window).keypress(function(e) {
+    $(window).keydown(function(e) {
       if (e.which === 27) {
         Asana.ServerModel.logEvent({
           name: "ChromeExtension-Abort"
@@ -377,7 +379,14 @@ UserTypeahead = function(id) {
 
   me.input.focus(function() {
     me.user_id_to_select = me.selected_user_id;
-    me.input.val("");
+    if (me.selected_user_id !== null) {
+      // If a user was already selected, fill the field with their name
+      // and select it all.
+      var assignee_name = me.user_id_to_user[me.selected_user_id].name;
+      me.input.val(assignee_name);
+    } else {
+      me.input.val("");
+    }
     me.has_focus = true;
     me.render();
     me._ensureSelectedUserVisible();
@@ -415,12 +424,14 @@ UserTypeahead = function(id) {
       } else if (index >= 0 && index < me.filtered_users.length) {
         me.setSelectedUserId(me.filtered_users[index + 1].id);
       }
+      e.preventDefault();
     } else if (e.which === 38) {
       // Up: select prev.
       var index = me._indexOfSelectedUser();
       if (index > 0) {
         me.setSelectedUserId(me.filtered_users[index - 1].id);
       }
+      e.preventDefault();
     }
   });
   me.input.bind("input", function() {
@@ -429,6 +440,7 @@ UserTypeahead = function(id) {
   });
   me.label.focus(function() {
     me.input.focus();
+    me.input.get(0).setSelectionRange(0, me.input.val().length);
   });
   me.render();
 };
@@ -492,6 +504,9 @@ Asana.update(UserTypeahead.prototype, {
     if (is_selected) {
       node.addClass("selected");
     }
+    node.mouseenter(function() {
+      me.setSelectedUserId(user.id);
+    });
     node.mousedown(function() {
       me.setSelectedUserId(user.id);
       me._confirmSelection();

From 9276a4d365e4114ae55c5b91d9955eaf4e82cc1b Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 09:12:17 -0700
Subject: [PATCH 26/63] fix dimensions for popup

---
 asana.js            |  9 ++++++++-
 extension_server.js |  6 ++++--
 popup.css           |  2 ++
 popup.js            | 16 ++++++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/asana.js b/asana.js
index 2735dfb..622d511 100644
--- a/asana.js
+++ b/asana.js
@@ -1,7 +1,14 @@
 /**
  * Define the top-level Asana namespace.
  */
-Asana = {};
+Asana = {
+
+  CHROME_TITLEBAR_HEIGHT: 24,
+  POPUP_UI_HEIGHT: 310,
+  POPUP_EXPANDED_UI_HEIGHT: 310 + 129,
+  POPUP_UI_WIDTH: 410
+
+};
 
 /**
  * Things borrowed from asana library.
diff --git a/extension_server.js b/extension_server.js
index 8726b80..b05fa56 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -45,8 +45,10 @@ Asana.ExtensionServer = {
                 favicon_url: favicon_url
               };
               chrome.windows.get(window_id, function(w) {
-                var width = 410;
-                var height = 310;
+                var width = Asana.POPUP_UI_WIDTH;
+                // Chrome popup window adds this padding on the bottom;
+                // so must we when we pop up our own window.
+                var height = Asana.POPUP_UI_HEIGHT + 10;
                 var top = w.top + 72;
                 var left = w.left + w.width - width;
 
diff --git a/popup.css b/popup.css
index 9f7010b..a9e1f5b 100644
--- a/popup.css
+++ b/popup.css
@@ -125,6 +125,7 @@ textarea::-webkit-scrollbar-thumb:hover {
 
 body {
   overflow: hidden;
+  /* Also affects Asana.POPUP_UI_WIDTH and Asana.POPUP_UI_HEIGHT */
   width: 410px;
   height: 310px;  /* keep this correct for the window-based (non-button) version */
   padding: 0px;
@@ -372,6 +373,7 @@ a, input, textarea {
 }
 
 #assignee_list_container {
+  /* Also affects Asana.POPUP_EXPANDED_UI_HEIGHT */
   height: 121px;
   overflow-x: hidden;
   overflow-y: scroll;
diff --git a/popup.js b/popup.js
index 5a66aa0..a93c588 100644
--- a/popup.js
+++ b/popup.js
@@ -1,5 +1,8 @@
 Popup = {
 
+  // Is this an external popup window? (vs. the one from the menu)
+  is_external: false,
+
   // Options loaded when popup opened.
   options: null,
 
@@ -24,6 +27,8 @@ Popup = {
   onLoad: function() {
     var me = this;
 
+    me.is_external = ('' + window.location.search).indexOf("external=true") !== -1;
+
     // Our default error handler.
     Asana.ServerModel.onError = function(response) {
       me.showError(response.errors[0].message);
@@ -156,6 +161,15 @@ Popup = {
     }
   },
 
+  setExpandedUi: function(is_expanded) {
+    if (this.is_external) {
+      window.resizeTo(
+          Asana.POPUP_UI_WIDTH,
+          (is_expanded ? Asana.POPUP_EXPANDED_UI_HEIGHT : Asana.POPUP_UI_HEIGHT)
+              + 10 + Asana.CHROME_TITLEBAR_HEIGHT);
+    }
+  },
+
   showView: function(name) {
     ["login", "add"].forEach(function(view_name) {
       $("#" + view_name + "_view").css("display", view_name === name ? "" : "none");
@@ -388,6 +402,7 @@ UserTypeahead = function(id) {
       me.input.val("");
     }
     me.has_focus = true;
+    Popup.setExpandedUi(true);
     me.render();
     me._ensureSelectedUserVisible();
   });
@@ -403,6 +418,7 @@ UserTypeahead = function(id) {
       });
     }
     me.render();
+    Popup.setExpandedUi(false);
   });
   me.input.keydown(function(e) {
     if (e.which === 13) {

From ccc52ab60979cb40aaff7071aec7b55f5723fae8 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 12:05:49 -0700
Subject: [PATCH 27/63] select on hover

---
 popup.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popup.css b/popup.css
index a9e1f5b..6594c3d 100644
--- a/popup.css
+++ b/popup.css
@@ -349,7 +349,7 @@ a, input, textarea {
   padding-left: 54px;
 }
 
-.user.selected, .user:hover {
+.user.selected {
   background-color: #1F8DD6;
   color: white;
 }

From af5324f4a340d6f65b3ae173223a7589f007a329 Mon Sep 17 00:00:00 2001
From: Andrew Watterson <andrew@asana.com>
Date: Mon, 3 Jun 2013 15:33:27 -0700
Subject: [PATCH 28/63] Final styling.

---
 popup.css         |  34 +++++++++++++++++++++++++++++++---
 popup.html        |   3 ++-
 sprite-retina.png | Bin 7943 -> 7975 bytes
 sprite.png        | Bin 4301 -> 4300 bytes
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/popup.css b/popup.css
index 6594c3d..5a0d744 100644
--- a/popup.css
+++ b/popup.css
@@ -42,6 +42,28 @@
   display: inline-block;
 }
 
+.default-button {
+  color: #596573;
+  text-shadow: 0px 1px white;
+  border: 1px solid #C0CCD7;
+  background-color: #F2F2F2;
+  background-image: -webkit-gradient(linear,left top,left bottom,from(white), color-stop(10%, #F2F2F2));
+}
+.default-button:hover {
+  background-color: #F2F2F2;
+  background-image: -webkit-gradient(linear,left top,left bottom,from(white), color-stop(100%, #CED7E0));
+  border: 1px solid #C0CCD7;
+}
+.default-button:hover .button-text {
+  color: #596573;
+  text-shadow: 0px 1px white;
+}
+.default-button:focus {
+  box-shadow: 0px 0px 6px 3px rgba(31,141,214,0.3);
+  -webkit-box-shadow: 0px 0px 6px 3px rgba(31,141,214,0.3);
+  outline: none;
+}
+
 .primary-button {
   color: white;
   text-shadow: 0px -1px #114D97;
@@ -308,12 +330,14 @@ a, input, textarea {
 .icon-use-link {
   height: 16px;
   width: 16px;
+  background-size: 16px 16px;
 }
 
 .icon-use-link.no-favicon {
   height: 18px;
   width: 18px;
   background-position: -200px 0px;
+  background-size: auto auto;
 }
 
 #use_page_details:not(.disabled):hover .icon-use-link.no-favicon {
@@ -330,7 +354,7 @@ a, input, textarea {
 }
 
 #assignee {
-  font-weight: bold;
+  font-weight: 600;
 }
 
 #assignee .user-photo-frame {
@@ -345,7 +369,7 @@ a, input, textarea {
 .user {
   line-height: 34px;
   font-size: 12px;
-  font-weight: bold;
+  font-weight: 600;
   padding-left: 54px;
 }
 
@@ -399,7 +423,7 @@ a, input, textarea {
 }
 
 #success a, #error a {
-  font-weight: bold;
+  font-weight: 600;
   text-decoration: none;
   color: #5998c0;
 }
@@ -425,6 +449,10 @@ a, input, textarea {
   margin-top: 24px;
 }
 
+#login_view #signup_button {
+  margin-right: 8px;
+}
+
 .icon-success, .icon-error {
   width: 16px;
   height: 16px;
diff --git a/popup.html b/popup.html
index 78b4ad4..3efe019 100644
--- a/popup.html
+++ b/popup.html
@@ -113,7 +113,8 @@
     </div>
     <div class="content">
       You must log in to Asana before you can add tasks.
-      <span id="login_button" class="primary-button button big-button"><span class="button-text">Log In to Asana</span></span>
+      <span id="signup_button" class="default-button button big-button"><span class="button-text">Sign Up</span></span>
+      <span id="login_button" class="primary-button button big-button"><span class="button-text">Log In</span></span>
     </div>
   </div>
 
diff --git a/sprite-retina.png b/sprite-retina.png
index a9506408d8140a02731cab587e117f16462bcb85..8352fc0c8aa9d3c2c58815b80e414864cd76859b 100644
GIT binary patch
delta 7523
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
Q|4r4^G<s5{@%+vI0nBm}ZU6uP

delta 7509
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
DGNT}>

diff --git a/sprite.png b/sprite.png
index 13da6ede1c428f047566c93da66dd0cee761b053..7a3f0ece43af637a82f0af342b5b69a629b72b10 100644
GIT binary patch
delta 4163
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
N002ovPDHLkV1m<D?Y{s3

delta 4121
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
X0y&`~NPTQ#00000NkvXXu0mjfYRCPF


From 96ac1359d839b6b98e02262e6d83b6f09a157d53 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 17:34:32 -0700
Subject: [PATCH 29/63] Updated comments

---
 api_bridge.js       |   9 +--
 asana.js            |  17 +++-
 extension_server.js |  28 ++++---
 load_typekit.js     |   6 ++
 manifest.json       |   2 +-
 options.js          |   9 +++
 popup.js            | 185 +++++++++++++++++++++++++++++++++++---------
 quick_add_client.js |  23 +++---
 server_model.js     |   5 ++
 9 files changed, 216 insertions(+), 68 deletions(-)

diff --git a/api_bridge.js b/api_bridge.js
index f203d15..a9b6843 100644
--- a/api_bridge.js
+++ b/api_bridge.js
@@ -4,11 +4,10 @@
  * HTTP requests and needs cross-domain privileges.
  *
  * The bridge does not need to use an auth token to connect to
- * the API, because since it is a browser extension it can access
- * the user's cookies, and can use them to authenticate to the API.
- * This capability is specific to browser extensions, and other
- * types of applications would have to obtain an auth token to communicate
- * with the API.
+ * the API. Since it is a browser extension it can access the user's cookies
+ * and can use them to authenticate to the API. This capability is specific
+ * to browser extensions, and other types of applications would have to obtain
+ * an auth token to communicate with the API.
  */
 Asana.ApiBridge = {
 
diff --git a/asana.js b/asana.js
index 622d511..a4d1d41 100644
--- a/asana.js
+++ b/asana.js
@@ -3,10 +3,21 @@
  */
 Asana = {
 
+  // When popping up a window, the size given is for the content.
+  // When resizing the same window, the size must include the chrome. Sigh.
   CHROME_TITLEBAR_HEIGHT: 24,
-  POPUP_UI_HEIGHT: 310,
-  POPUP_EXPANDED_UI_HEIGHT: 310 + 129,
-  POPUP_UI_WIDTH: 410
+  // Natural dimensions of popup window. The Chrome popup window adds 10px
+  // bottom padding, so we must add that as well when considering how tall
+  // our popup window should be.
+  POPUP_UI_HEIGHT: 310 + 10,
+  POPUP_UI_WIDTH: 410,
+  // Size of popup when expanded to include assignee list.
+  POPUP_EXPANDED_UI_HEIGHT: 310 + 10 + 129,
+
+  // If the modifier key is TAB, amount of time user has from pressing it
+  // until they can press Q and still get the popup to show up.
+  QUICK_ADD_WINDOW_MS: 5000
+
 
 };
 
diff --git a/extension_server.js b/extension_server.js
index b05fa56..6f40afe 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -12,7 +12,11 @@ Asana.ExtensionServer = {
    */
   listen: function() {
     var me = this;
+
+    // Mark our Api Bridge as the server side (the one that actually makes
+    // API requests to Asana vs. just forwarding them to the server window).
     Asana.ApiBridge.is_server = true;
+
     chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
       if (request.type === "api") {
         // Request to the API. Pass it on to the bridge.
@@ -30,14 +34,17 @@ Asana.ExtensionServer = {
           me._quick_add_modifier_keydown_time = 0;
         } else if (request.name === "q_down") {
           if (request.force ||
-              request.time < me._quick_add_modifier_keydown_time + 5000) {
+              request.time < me._quick_add_modifier_keydown_time +
+                  Asana.QUICK_ADD_WINDOW_MS) {
             // Quick Add should only come from a content script, so it must have
-            // a `tab`.
+            // a `tab`. Get its URL and title.
             var window_id = sender.tab.windowId;
             var favicon_url = sender.tab.favIconUrl;
             chrome.tabs.executeScript(sender.tab.id, {
-              code: "({ url: window.top.location.href, title: window.top.document.title })"
+              code: "({ url: window.top.location.href, " +
+                  "title: window.top.document.title })"
             }, function(results) {
+              // Form a request object to stick in our popup.
               var quick_add_request = {
                 url: results[0].url,
                 title: results[0].title,
@@ -45,18 +52,17 @@ Asana.ExtensionServer = {
                 favicon_url: favicon_url
               };
               chrome.windows.get(window_id, function(w) {
+                // Popup the window in the upper right, near where it would be
+                // if the user had clicked the Asana button.
                 var width = Asana.POPUP_UI_WIDTH;
-                // Chrome popup window adds this padding on the bottom;
-                // so must we when we pop up our own window.
-                var height = Asana.POPUP_UI_HEIGHT + 10;
+                var height = Asana.POPUP_UI_HEIGHT;
                 var top = w.top + 72;
                 var left = w.left + w.width - width;
 
-                // QuickAdd request, made from a content window.
-                // Open up a new popup, and set the request information on its window
-                // (see popup.html for how it's used)
-                // We cannot open the popup menu itself programmatically, so it's
-                // just a regular HTML popup.
+                // Open up a new popup, and set the request information on its
+                // window (see popup.html for how it's used)
+                // We cannot open the popup menu itself programmatically, so
+                // it's just a regular HTML popup.
                 // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
                 var popup = window.open(
                     chrome.extension.getURL('popup.html') + '?external=true',
diff --git a/load_typekit.js b/load_typekit.js
index 5064ac5..2681b36 100644
--- a/load_typekit.js
+++ b/load_typekit.js
@@ -1,3 +1,7 @@
+/**
+ * Loads the appropriate typekit resource for fonts in the popup.
+ */
+
 (function() {
 
   // From luna_page.js
@@ -47,6 +51,8 @@
     // Couldn't find Inuit
   ];
 
+  // If the page could be in a language which is not covered by our latin1
+  // font, then load the (larger) full font.
   chrome.i18n.getAcceptLanguages(function(language_list) {
     var languages = language_list.join(",");
     var non_latin1 = ISO3316_LANGUAGE_CODES_FOR_NON_LATIN1.filter(function(code) {
diff --git a/manifest.json b/manifest.json
index 72f113a..cbfc8dd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Asana Extension for Chrome",
   "version": "1.0.0",
-  "description": "Allows quick adding of tasks to Asana from any web page in your browser.",
+  "description": "Quickly add tasks to Asana from any web page.",
   "icons": {
     "128": "icon128.png"
   },
diff --git a/options.js b/options.js
index 3ad9b54..2ae295d 100644
--- a/options.js
+++ b/options.js
@@ -23,6 +23,15 @@ Asana.Options = {
     return 'https://' + options.asana_host_port + '/';
   },
 
+  /**
+   * @param opt_options {dict} Options to use; if unspecified will be loaded.
+   * @return {String} The URL for the signup page.
+   */
+  signupUrl: function(opt_options) {
+    var options = opt_options || Asana.Options.loadOptions();
+    return 'https://asana.com/';
+  },
+
   /**
    * @return {dict} Default options.
    */
diff --git a/popup.js b/popup.js
index a93c588..87dea4c 100644
--- a/popup.js
+++ b/popup.js
@@ -1,3 +1,6 @@
+/**
+ * Code for the popup UI.
+ */
 Popup = {
 
   // Is this an external popup window? (vs. the one from the menu)
@@ -19,10 +22,13 @@ Popup = {
   has_used_page_details: false,
   is_first_add: true,
 
+  // Data from API cached for this popup.
   workspaces: null,
   users: null,
-  typeahead: null,
   user_id: null,
+  
+  // Typeahead ui element
+  typeahead: null,
 
   onLoad: function() {
     var me = this;
@@ -90,7 +96,9 @@ Popup = {
             }
           } else {
             // The user is not even logged in. Prompt them to do so!
-            me.showLogin(Asana.Options.loginUrl(options));
+            me.showLogin(
+                Asana.Options.loginUrl(options),
+                Asana.Options.signupUrl(options));
           }
         });
       });
@@ -101,17 +109,22 @@ Popup = {
     // Close the popup if the ESCAPE key is pressed.
     $(window).keydown(function(e) {
       if (e.which === 27) {
-        Asana.ServerModel.logEvent({
-          name: "ChromeExtension-Abort"
-        });
+        if (me.is_first_add) {
+          Asana.ServerModel.logEvent({
+            name: "ChromeExtension-Abort"
+          });
+        }
         window.close();
       }
     });
 
+    // Close if the X is clicked.
     $(".close-x").click(function() {
-      Asana.ServerModel.logEvent({
-        name: "ChromeExtension-Abort"
-      });
+      if (me.is_first_add) {
+        Asana.ServerModel.logEvent({
+          name: "ChromeExtension-Abort"
+        });
+      }
       window.close();
     });
 
@@ -122,7 +135,7 @@ Popup = {
           name: "ChromeExtension-ChangedTaskName"
         });
       }
-      me.checkToDisablePageDetailsButton();
+      me.maybeDisablePageDetailsButton();
     });
     $("#notes_input").keyup(function() {
       if (!me.has_edited_notes && $("#notes_input").val() !== "") {
@@ -131,15 +144,20 @@ Popup = {
           name: "ChromeExtension-ChangedTaskNotes"
         });
       }
-      me.checkToDisablePageDetailsButton();
+      me.maybeDisablePageDetailsButton();
     });
 
+    // The page details button fills in fields with details from the page
+    // in the current tab (cached when the popup opened).
     var use_page_details_button = $("#use_page_details");
     use_page_details_button.click(function() {
       if (!(use_page_details_button.hasClass('disabled'))) {
+        // Page title -> task name
         $("#name_input").val(me.page_title);
+        // Page url + selection -> task notes
         var notes = $("#notes_input");
         notes.val(notes.val() + me.page_url + "\n" + me.page_selection);
+        // Disable the page details button once used.        
         use_page_details_button.addClass('disabled');
         if (!me.has_used_page_details) {
           me.has_used_page_details = true;
@@ -150,10 +168,11 @@ Popup = {
       }
     });
 
+    // Make a typeahead for assignee
     me.typeahead = new UserTypeahead("assignee");
   },
 
-  checkToDisablePageDetailsButton: function() {
+  maybeDisablePageDetailsButton: function() {
     if ($("#name_input").val() !== "" || $("#notes_input").val() !== "") {
       $("#use_page_details").addClass('disabled');
     } else {
@@ -166,7 +185,7 @@ Popup = {
       window.resizeTo(
           Asana.POPUP_UI_WIDTH,
           (is_expanded ? Asana.POPUP_EXPANDED_UI_HEIGHT : Asana.POPUP_UI_HEIGHT)
-              + 10 + Asana.CHROME_TITLEBAR_HEIGHT);
+              + Asana.CHROME_TITLEBAR_HEIGHT);
     }
   },
 
@@ -185,6 +204,7 @@ Popup = {
     me.page_selection = selected_text;
     me.favicon_url = favicon_url;
 
+    // Set initial UI state
     me.resetFields();
     me.showView("add");
     var name_input = $("#name_input");
@@ -197,6 +217,7 @@ Popup = {
       $(".icon-use-link").addClass("no-favicon sprite");
     }
 
+    // Populate workspace selector and select default.
     Asana.ServerModel.me(function(user) {
       me.user_id = user.id;
       Asana.ServerModel.workspaces(function(workspaces) {
@@ -221,10 +242,14 @@ Popup = {
     });
   },
 
+  /**
+   * @param enabled {Boolean} True iff the add button should be clickable.
+   */
   setAddEnabled: function(enabled) {
     var me = this;
     var button = $("#add_button");
     if (enabled) {
+      // Update appearance and add handlers.
       button.removeClass("disabled");
       button.addClass("enabled");
       button.click(function() {
@@ -237,6 +262,7 @@ Popup = {
         }
       });
     } else {
+      // Update appearance and remove handlers.
       button.removeClass("enabled");
       button.addClass("disabled");
       button.unbind('click');
@@ -253,24 +279,31 @@ Popup = {
     $("#error").css("display", "none");
   },
 
+  /**
+   * Clear inputs for new task entry.
+   */
   resetFields: function() {
     $("#name_input").val("");
     $("#notes_input").val("");
     this.typeahead.setSelectedUserId(null);
   },
 
-  // Set the add button as being "working", waiting for the Asana request
-  // to complete.
+  /**
+   * Set the add button as being "working", waiting for the Asana request
+   * to complete.
+   */
   setAddWorking: function(working) {
     this.setAddEnabled(!working);
     $("#add_button").find(".button-text").text(
         working ? "Adding..." : "Add to Asana");
   },
 
-  // When the user changes the workspace, update the list of users.
+  /**
+   * Update the list of users as a result of setting/changing the workspace.
+   */
   onWorkspaceChanged: function() {
     var me = this;
-    var workspace_id = me.readWorkspaceId();
+    var workspace_id = me.selectedWorkspaceId();
 
     // Update selected workspace
     $("#workspace").html($("#workspace_select option:selected").text());
@@ -287,6 +320,10 @@ Popup = {
     });
   },
 
+  /**
+   * @param id {Integer}
+   * @return {dict} Workspace data for the given workspace.
+   */
   workspaceById: function(id) {
     var found = null;
     this.workspaces.forEach(function(w) {
@@ -297,15 +334,24 @@ Popup = {
     return found;
   },
 
-  readWorkspaceId: function() {
+  /**
+   * @return {Integer} ID of the selected workspace.
+   */
+  selectedWorkspaceId: function() {
     return parseInt($("#workspace_select").val(), 10);
   },
 
+  /**
+   * Create a task in asana using the data in the form.
+   */
   createTask: function() {
     var me = this;
+
+    // Update UI to reflect attempt to create task.
     console.info("Creating task");
     me.hideError();
     me.setAddWorking(true);
+
     if (!me.is_first_add) {
       Asana.ServerModel.logEvent({
         name: "ChromeExtension-CreateTask-MultipleTasks"
@@ -313,7 +359,7 @@ Popup = {
     }
 
     Asana.ServerModel.createTask(
-        me.readWorkspaceId(),
+        me.selectedWorkspaceId(),
         {
           name: $("#name_input").val(),
           notes: $("#notes_input").val(),
@@ -321,13 +367,17 @@ Popup = {
           assignee: me.typeahead.selected_user_id || me.user_id
         },
         function(task) {
+          // Success! Show task success, then get ready for another input.
           Asana.ServerModel.logEvent({
             name: "ChromeExtension-CreateTask-Success"
           });
           me.setAddWorking(false);
           me.showSuccess(task);
+          me.resetFields();
+          $("#name_input").focus();
         },
         function(response) {
+          // Failure. :( Show error, but leave form available for retry.
           Asana.ServerModel.logEvent({
             name: "ChromeExtension-CreateTask-Failure"
           });
@@ -336,12 +386,13 @@ Popup = {
         });
   },
 
-  // Helper to show a success message after a task is added.
+  /**
+   * Helper to show a success message after a task is added.
+   */
   showSuccess: function(task) {
     var me = this;
     Asana.ServerModel.taskViewUrl(task, function(url) {
       var name = task.name.replace(/^\s*/, "").replace(/\s*$/, "");
-      //$("#new_task_workspace_name").text(me.workspaceById(me.readWorkspaceId()).name);
       var link = $("#new_task_link");
       link.attr("href", url);
       link.text(name !== "" ? name : "Task");
@@ -351,8 +402,6 @@ Popup = {
         window.close();
         return false;
       });
-      me.resetFields();
-      $("#name_input").focus();
 
       // Reset logging for multi-add
       me.has_edited_name = true;
@@ -364,11 +413,18 @@ Popup = {
     });
   },
 
-  // Helper to show the login page.
-  showLogin: function(url) {
+  /**
+   * Show the login page.
+   */
+  showLogin: function(login_url, signup_url) {
     var me = this;
     $("#login_button").click(function() {
-      chrome.tabs.create({url: url});
+      chrome.tabs.create({url: login_url});
+      window.close();
+      return false;
+    });
+    $("#signup_button").click(function() {
+      chrome.tabs.create({url: signup_url});
       window.close();
       return false;
     });
@@ -376,6 +432,23 @@ Popup = {
   }
 };
 
+/**
+ * A jQuery-based typeahead similar to the Asana application, which allows
+ * the user to select another user in the workspace by typing in a portion
+ * of their name and selecting from a filtered dropdown.
+ *
+ * Expects elements with the following IDs already in the DOM
+ *   ID: the element where the current assignee will be displayed.
+ *   ID_input: an input element where the user can edit the assignee
+ *   ID_list: an empty DOM whose children will be populated from the users
+ *       in the selected workspace, filtered by the input text.
+ *   ID_list_container: a DOM element containing ID_list which will be
+ *       shown or hidden based on whether the user is interacting with the
+ *       typeahead.
+ *
+ * @param id {String} Base ID of the typeahead element.
+ * @constructor
+ */
 UserTypeahead = function(id) {
   var me = this;
   me.id = id;
@@ -386,11 +459,13 @@ UserTypeahead = function(id) {
   me.user_id_to_select = null;
   me.has_focus = false;
 
+  // Store off UI elements.
   me.input = $("#" + id + "_input");
   me.label = $("#" + id);
   me.list = $("#" + id + "_list");
   me.list_container = $("#" + id + "_list_container");
 
+  // Open on focus.
   me.input.focus(function() {
     me.user_id_to_select = me.selected_user_id;
     if (me.selected_user_id !== null) {
@@ -406,13 +481,17 @@ UserTypeahead = function(id) {
     me.render();
     me._ensureSelectedUserVisible();
   });
+
+  // Close on blur. A natural blur does not cause us to accept the current
+  // selection - there had to be a user action taken that causes us to call
+  // `confirmSelection`, which would have updated user_id_to_select.
   me.input.blur(function() {
     me.selected_user_id = me.user_id_to_select;
     me.has_focus = false;
     if (!Popup.has_reassigned) {
       Popup.has_reassigned = true;
       Asana.ServerModel.logEvent({
-        name: me.selected_user_id === Popup.user_id ?
+        name: (me.selected_user_id === Popup.user_id || me.selected_user_id === null) ?
             "ChromeExtension-AssignToSelf" :
             "ChromeExtension-AssignToOther"
       });
@@ -420,15 +499,21 @@ UserTypeahead = function(id) {
     me.render();
     Popup.setExpandedUi(false);
   });
+
+  // Handle keyboard within input
   me.input.keydown(function(e) {
     if (e.which === 13) {
+      // Enter accepts selection, focuses next UI element.
       me._confirmSelection();
       $("#add_button").focus();
       return false;
     } else if (e.which === 9) {
+      // Tab accepts selection. Browser default behavior focuses next element.
       me._confirmSelection();
       return true;
     } else if (e.which === 27) {
+      // Abort selection. Stop propagation to avoid closing the whole
+      // popup window.
       e.stopPropagation();
       me.input.blur();
       return false;
@@ -450,14 +535,20 @@ UserTypeahead = function(id) {
       e.preventDefault();
     }
   });
+
+  // When the input changes value, update and re-render our filtered list.
   me.input.bind("input", function() {
     me._updateFilteredUsers();
     me._renderList();
   });
+
+  // A user clicking or tabbing to the label should open the typeahead
+  // and select what's already there.
   me.label.focus(function() {
     me.input.focus();
     me.input.get(0).setSelectionRange(0, me.input.val().length);
   });
+
   me.render();
 };
 
@@ -465,6 +556,10 @@ Asana.update(UserTypeahead, {
 
   SILHOUETTE_URL: "xcxc",
 
+  /**
+   * @param user {dict}
+   * @returns {jQuery} photo element
+   */
   photoForUser: function(user) {
     var url = user.photo ? user.photo.image_27x27 : UserTypeahead.SILHOUETTE_URL;
     var photo = $('<div class="user-photo"></div>"');
@@ -476,22 +571,43 @@ Asana.update(UserTypeahead, {
 
 Asana.update(UserTypeahead.prototype, {
 
+  /**
+   * Render the typeahead, changing elements and content as needed.
+   */
   render: function() {
     var me = this;
     me._renderLabel();
 
     if (this.has_focus) {
+      // Focused - show the list and input instead of the label.
       me._renderList();
       me.input.show();
       me.label.hide();
       me.list_container.show();
     } else {
+      // Not focused - show the label, not the list or input.
       me.input.hide();
       me.label.show();
       me.list_container.hide();
     }
   },
 
+  /**
+   * Update the set of all (unfiltered) users available in the typeahead.
+   *
+   * @param users {dict[]}
+   */
+  updateUsers: function(users) {
+    var me = this;
+    me.users = users;
+    me.user_id_to_user = {};
+    users.forEach(function(user) {
+      me.user_id_to_user[user.id] = user;
+    });
+    me._updateFilteredUsers();
+    me.render();
+  },
+
   _renderLabel: function() {
     var me = this;
     me.label.empty();
@@ -520,9 +636,15 @@ Asana.update(UserTypeahead.prototype, {
     if (is_selected) {
       node.addClass("selected");
     }
+
+    // Select on mouseover.
     node.mouseenter(function() {
       me.setSelectedUserId(user.id);
     });
+
+    // Select and confirm on click. We listen to `mousedown` because a click
+    // will take focus away from the input, hiding the user list and causing
+    // us not to get the ensuing `click` event.
     node.mousedown(function() {
       me.setSelectedUserId(user.id);
       me._confirmSelection();
@@ -558,17 +680,6 @@ Asana.update(UserTypeahead.prototype, {
     this.user_id_to_select = this.selected_user_id;
   },
 
-  updateUsers: function(users) {
-    var me = this;
-    me.users = users;
-    me.user_id_to_user = {};
-    users.forEach(function(user) {
-      me.user_id_to_user[user.id] = user;
-    });
-    me._updateFilteredUsers();
-    me.render();
-  },
-
   _updateFilteredUsers: function() {
     var regexp = this._regexpFromFilterText(this.input.val());
     this.filtered_users = this.users.filter(function(user) {
diff --git a/quick_add_client.js b/quick_add_client.js
index 9ed70db..c3d859c 100644
--- a/quick_add_client.js
+++ b/quick_add_client.js
@@ -1,23 +1,24 @@
 /**
  * A module to run in a content window to enable QuickAdd from that window.
- * That is, pressing Tab+Q anywhere in the window will open the same popup
- * as is available from the chrome menu.
+ * That is, pressing Alt+Q (or maybe Tab+Q) anywhere in the window will open
+ * the same popup as is available from the chrome menu.
  *
- * This is not a perfect solution (though it might be refined further with
- * a little more effort). For one thing, we don't swallow the TAB key because
+ * There's no way to trigger the chrome extension popup itself, so this
+ * opens a new window with the popup content in it. This looks slightly
+ * different than the real popup.
+ *
+ * Using TAB+Q, while a good mirror of Asana webapp functionality, is not a
+ * perfect solution (though it might be refined further with a little more
+ * effort). For one thing, we don't swallow the TAB key because
  * we don't want to interfere with the underlying page (especially if the user
  * wasn't going to press TAB+Q). So using the hotkey may cause you to focus
- * a new input on the page before opening the popup.
+ * a new input on the page before opening the popup. But that tabbing can also
+ * be an annoyance, and causes you to lose your selection too.
  *
- * Also, there's no way to trigger the chrome extension popup itself, so this
- * opens a new window with the popup content in it. This looks slightly
- * different than the real popup (and appears in a different place), but it
- * does the job.
  */
 Asana.QuickAddClient = {
 
-  KEY: "_asana_heokijphbgfagjocdkdaedfehiokfifg_tab_down_time",
-
+  // True iff we are using Tab+Q instead of Alt+Q.
   USE_TAB: false,
 
   keyDown: function(e) {
diff --git a/server_model.js b/server_model.js
index c2d8372..9b7d601 100644
--- a/server_model.js
+++ b/server_model.js
@@ -7,6 +7,7 @@
  */
 Asana.ServerModel = {
 
+  // Make requests to API to refresh cache at this interval.
   CACHE_REFRESH_INTERVAL_MS: 15 * 60 * 1000,
 
   /**
@@ -147,6 +148,10 @@ Asana.ServerModel = {
     }
   },
 
+  /**
+   * Start fetching all the data needed by the extension so it is available
+   * whenever a popup is opened.
+   */
   startPrimingCache: function() {
     var me = this;
     me._cache_refresh_interval = setInterval(function() {

From 221f12e0253394ead467b12f74f356dd62bfc061 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 17:47:08 -0700
Subject: [PATCH 30/63] Update signup link

---
 options.js |  3 +--
 popup.js   | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/options.js b/options.js
index 2ae295d..e2f10c7 100644
--- a/options.js
+++ b/options.js
@@ -28,8 +28,7 @@ Asana.Options = {
    * @return {String} The URL for the signup page.
    */
   signupUrl: function(opt_options) {
-    var options = opt_options || Asana.Options.loadOptions();
-    return 'https://asana.com/';
+    return 'http://asana.com/?utm_source=chrome&utm_medium=ext&utm_campaign=ext';
   },
 
   /**
diff --git a/popup.js b/popup.js
index 87dea4c..dd5ad2b 100644
--- a/popup.js
+++ b/popup.js
@@ -554,16 +554,18 @@ UserTypeahead = function(id) {
 
 Asana.update(UserTypeahead, {
 
-  SILHOUETTE_URL: "xcxc",
-
   /**
    * @param user {dict}
    * @returns {jQuery} photo element
    */
   photoForUser: function(user) {
-    var url = user.photo ? user.photo.image_27x27 : UserTypeahead.SILHOUETTE_URL;
     var photo = $('<div class="user-photo"></div>"');
-    photo.css("background-image", "url(" + url + ")");
+    if (user.photo) {
+      photo.css("background-image", "url(" + user.photo.image_27x27 + ")");
+    } else {
+//      photo.addClass("sprite");
+//      photo.addClass("icon-assignee");
+    }
     return $('<div class="user-photo-frame"></div>').append(photo);
   }
 

From 383189868bca1aa2f191ba5b20a31c6c31bd681b Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 18:00:19 -0700
Subject: [PATCH 31/63] Log workspace change

---
 popup.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/popup.js b/popup.js
index dd5ad2b..ceb5d2b 100644
--- a/popup.js
+++ b/popup.js
@@ -236,6 +236,11 @@ Popup = {
         select.val(me.options.default_workspace_id);
         me.onWorkspaceChanged();
         select.change(function() {
+          if (select.val() !== me.options.default_workspace_id) {
+            Asana.ServerModel.logEvent({
+              name: "ChromeExtension-ChangedWorkspace"
+            });
+          }
           me.onWorkspaceChanged();
         });
       });

From 0fb9a95b9d997163643eda75419d6c82aad75822 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 18:42:26 -0700
Subject: [PATCH 32/63] Increase photo resolution, better for retina display

---
 popup.css       |  2 ++
 popup.js        | 10 ++++------
 server_model.js | 22 ++++++++++++++++++++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/popup.css b/popup.css
index 5a0d744..431881a 100644
--- a/popup.css
+++ b/popup.css
@@ -388,6 +388,8 @@ a, input, textarea {
 .user-photo {
   height: 27px;
   width: 27px;
+  background-size: 27px 27px;
+  background-repeat: no-repeat;
   border-radius: 2px;
 }
 .user-name {
diff --git a/popup.js b/popup.js
index ceb5d2b..ba83d3a 100644
--- a/popup.js
+++ b/popup.js
@@ -559,18 +559,16 @@ UserTypeahead = function(id) {
 
 Asana.update(UserTypeahead, {
 
+  SILHOUETTE_URL: "./xcxc.png",
+
   /**
    * @param user {dict}
    * @returns {jQuery} photo element
    */
   photoForUser: function(user) {
     var photo = $('<div class="user-photo"></div>"');
-    if (user.photo) {
-      photo.css("background-image", "url(" + user.photo.image_27x27 + ")");
-    } else {
-//      photo.addClass("sprite");
-//      photo.addClass("icon-assignee");
-    }
+    var url = user.photo ? user.photo.image_60x60 : UserTypeahead.SILHOUETTE_URL;
+    photo.css("background-image", "url(" + url + ")");
     return $('<div class="user-photo-frame"></div>').append(photo);
   }
 
diff --git a/server_model.js b/server_model.js
index 9b7d601..52e4ce4 100644
--- a/server_model.js
+++ b/server_model.js
@@ -10,6 +10,8 @@ Asana.ServerModel = {
   // Make requests to API to refresh cache at this interval.
   CACHE_REFRESH_INTERVAL_MS: 15 * 60 * 1000,
 
+  _url_to_cached_image: {},
+
   /**
    * Called by the model whenever a request is made and error occurs.
    * Override to handle in a context-appropriate way. Some requests may
@@ -95,7 +97,7 @@ Asana.ServerModel = {
     var self = this;
     Asana.ApiBridge.request(
         "GET", "/workspaces/" + workspace_id + "/users",
-        { opt_fields: "name,photo.image_27x27" },
+        { opt_fields: "name,photo.image_60x60" },
         function(response) {
           self._makeCallback(response, callback, errback);
         }, options);
@@ -148,6 +150,18 @@ Asana.ServerModel = {
     }
   },
 
+  _cacheUserPhoto: function(user) {
+    var me = this;
+    if (user.photo) {
+      var url = user.photo.image_60x60;
+      if (!(url in me._url_to_cached_image)) {
+        var image = new Image();
+        image.src = url;
+        me._url_to_cached_image[url] = image;
+      }
+    }
+  },
+
   /**
    * Start fetching all the data needed by the extension so it is available
    * whenever a popup is opened.
@@ -171,7 +185,11 @@ Asana.ServerModel = {
             var i = 0;
             // Fetch users in each workspace.
             var fetchUsers = function() {
-              me.users(workspaces[i].id, function(workspace) {
+              me.users(workspaces[i].id, function(users) {
+                // Prefetch images too
+                users.forEach(function(user) {
+                  me._cacheUserPhoto(user);
+                });
                 if (++i < workspaces.length) {
                   fetchUsers();
                 }

From 334e64d114e92af459d3e6ebe56743afa16e98b6 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 18:56:03 -0700
Subject: [PATCH 33/63] Fix breakage on workspace change when assignee already
 selected

---
 popup.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/popup.js b/popup.js
index ba83d3a..5d93e7f 100644
--- a/popup.js
+++ b/popup.js
@@ -609,6 +609,11 @@ Asana.update(UserTypeahead.prototype, {
     users.forEach(function(user) {
       me.user_id_to_user[user.id] = user;
     });
+    // If selected user is not in this workspace, unselect them.
+    if (!(me.selected_user_id in me.user_id_to_user)) {
+      me.selected_user_id = null;
+      me.input.val("");
+    }
     me._updateFilteredUsers();
     me.render();
   },
@@ -618,7 +623,9 @@ Asana.update(UserTypeahead.prototype, {
     me.label.empty();
     var selected_user = me.user_id_to_user[me.selected_user_id];
     if (selected_user) {
-      me.label.append(UserTypeahead.photoForUser(selected_user));
+      if (selected_user.photo) {
+        me.label.append(UserTypeahead.photoForUser(selected_user));
+      }
       me.label.append($('<div class="user-name">').text(selected_user.name));
     } else {
       me.label.append($('<span class="unassigned">').text("Assignee"));

From 7e3f79eb2b69bbd1b281721e9e1397850487cd4a Mon Sep 17 00:00:00 2001
From: Andrew Watterson <andrew@asana.com>
Date: Mon, 3 Jun 2013 19:04:01 -0700
Subject: [PATCH 34/63] anonymous man

---
 nopicture.png | Bin 0 -> 619 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 nopicture.png

diff --git a/nopicture.png b/nopicture.png
new file mode 100644
index 0000000000000000000000000000000000000000..be98f2a075e3980aa92202b6be74d2e1ef2b9f24
GIT binary patch
literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq001@s001@!0ssI211J5800009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0r*Ko
zK~#9!?3g`|f<O?4^@1^)XrqZ1T4<q#g%<eV{RLDMSlAGwg_zjb&{$~9Jvq&tdVa72
zEEGHS!amH*zOygI?RHzpcYGCc9|qAN8bpI=5bwi^`TX&C-0gNj5bXE+yZ2gFv)OF5
zTHS6p<`%^`0}wdR^G>JJn>Ce6WjdYK>-7u@z1eJB*L}}N91aJ^al$avjYwJN^LfO@
zd<K-XgjU4GVxhDiO4UbVA%;I8Xk2}Wvdu{3!>La<i{cK}geY!&GXM=@l8DHgtm}#8
za_Reix`@E7*K2V;&gXOLh^7|}qCt!trBW%b5wWav5xL*@dcAVFEaR)yYNOFelXscT
zW*;rVL$up%+qU)fqQKYT2DKg+%B|E@_&~8+6(Uxv)!}d$ef?xI$v|{SWT(@KvT{5g
zHyVv>bdlTu`d(t-i}^!Bj)*<L?W2_Bl2&`FP{3jJ#okXYI@qh#YQ@IUb%$^0_xpT|
zK>XDZ!Q#FszS2^6K<N!7&`5}v-(TEDsahgqmvjyW17slqMBqppWmTOe34*>vOchQE
z^f@9m)c|)JP`>KXM?`uKkC#->sU9XK)_<Y>L!`2<>xxfnQh_`%5pJi^6%na(97ktm
zKTg-*o8@)7<cg2rq<WrrhnOqAO9Vk+9H2ooh>GzozyNg-5MB`%2#x>%002ovPDHLk
FV1gK78N2`h

literal 0
HcmV?d00001


From 4a22c905e00224be905be2ba798ff11d9c102e9e Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 19:04:14 -0700
Subject: [PATCH 35/63] Fix scrollwheel scrolling of assignee list

---
 popup.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/popup.js b/popup.js
index 5d93e7f..3f600e3 100644
--- a/popup.js
+++ b/popup.js
@@ -530,6 +530,7 @@ UserTypeahead = function(id) {
       } else if (index >= 0 && index < me.filtered_users.length) {
         me.setSelectedUserId(me.filtered_users[index + 1].id);
       }
+      me._ensureSelectedUserVisible();
       e.preventDefault();
     } else if (e.which === 38) {
       // Up: select prev.
@@ -537,6 +538,7 @@ UserTypeahead = function(id) {
       if (index > 0) {
         me.setSelectedUserId(me.filtered_users[index - 1].id);
       }
+      me._ensureSelectedUserVisible();
       e.preventDefault();
     }
   });
@@ -714,6 +716,11 @@ Asana.update(UserTypeahead.prototype, {
     }
   },
 
+  /**
+   * Helper to call this when the selection was changed by something that
+   * was not the mouse (which is pointing directly at a visible element),
+   * to ensure the selected user is always visible in the list.
+   */
   _ensureSelectedUserVisible: function() {
     var index = this._indexOfSelectedUser();
     if (index !== -1) {
@@ -731,9 +738,6 @@ Asana.update(UserTypeahead.prototype, {
       $("#user_" + this.selected_user_id).addClass("selected");
     }
     this._renderLabel();
-    if (this.has_focus) {
-      this._ensureSelectedUserVisible();
-    }
   }
 
 });

From b3dbb035559cbc7534f4e26cbd5e12beae58d723 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 3 Jun 2013 19:05:44 -0700
Subject: [PATCH 36/63] Added silhouette

---
 popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popup.js b/popup.js
index 3f600e3..e31a7f5 100644
--- a/popup.js
+++ b/popup.js
@@ -561,7 +561,7 @@ UserTypeahead = function(id) {
 
 Asana.update(UserTypeahead, {
 
-  SILHOUETTE_URL: "./xcxc.png",
+  SILHOUETTE_URL: "./nopicture.png",
 
   /**
    * @param user {dict}

From 9c509c1344d05d39f23a05c45b69d3a4a5cfec76 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Wed, 5 Jun 2013 11:41:24 -0700
Subject: [PATCH 37/63] Update 128px icon

---
 icon128.png | Bin 9877 -> 6721 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icon128.png b/icon128.png
index f08c0e3c34ee8f4503332a0af03d26584d14fb4f..acef4ef1e0b663e48a437c540d99ead099b6f300 100644
GIT binary patch
literal 6721
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
Zz%JBgO{g?1`SC{w)ReRpYZNR({}1yvV|V}n

literal 9877
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
E0J@YBg8%>k


From 965e75ef2dad3677a5311e7d3d5cc70a319ce720 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Wed, 5 Jun 2013 11:45:52 -0700
Subject: [PATCH 38/63] Update manifest with more appropriate configuration

---
 manifest.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index cbfc8dd..253a450 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
   "icons": {
     "128": "icon128.png"
   },
-  "minimum_chrome_version": "24",
+  "minimum_chrome_version": "25",
 
   "browser_action": {
     "default_icon": "icon19.png",
@@ -16,6 +16,9 @@
   "background": {
     "page": "background.html"
   },
+  "incognito": "split",
+  "offline_enabled": false,
+
   "permissions": [
     "tabs",
     "cookies",

From 59927563d3015831057f75cce1c9d6921b4c2b01 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Wed, 5 Jun 2013 16:47:07 -0700
Subject: [PATCH 39/63] Always put current user first

---
 popup.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/popup.js b/popup.js
index e31a7f5..a7f4cce 100644
--- a/popup.js
+++ b/popup.js
@@ -606,11 +606,24 @@ Asana.update(UserTypeahead.prototype, {
    */
   updateUsers: function(users) {
     var me = this;
-    me.users = users;
+    // Build a map from user ID to user
+    var this_user = null;
+    var users_without_this_user = [];
     me.user_id_to_user = {};
     users.forEach(function(user) {
+      if (user.id === Popup.user_id) {
+        this_user = user;
+      } else {
+        users_without_this_user.push(user);
+      }
       me.user_id_to_user[user.id] = user;
     });
+
+    // Put current user at the beginning of the list.
+    // We really should have found this user, but if not .. let's not crash.
+    me.users = this_user ?
+        [this_user].concat(users_without_this_user) : users_without_this_user;
+
     // If selected user is not in this workspace, unselect them.
     if (!(me.selected_user_id in me.user_id_to_user)) {
       me.selected_user_id = null;

From fbc435c96a25540bd3967006a94b9cd250159fd3 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Wed, 5 Jun 2013 17:12:48 -0700
Subject: [PATCH 40/63] Moved to use command API instead of a content script

---
 background.html     |  11 -----
 extension_server.js | 102 ++++++++++++++++++++++----------------------
 icon16.png          | Bin 0 -> 3280 bytes
 icon48.png          | Bin 0 -> 4528 bytes
 manifest.json       |  43 ++++++++++---------
 quick_add_client.js |  65 ----------------------------
 6 files changed, 73 insertions(+), 148 deletions(-)
 delete mode 100644 background.html
 create mode 100644 icon16.png
 create mode 100644 icon48.png
 delete mode 100644 quick_add_client.js

diff --git a/background.html b/background.html
deleted file mode 100644
index 7131ce1..0000000
--- a/background.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-    <script type="text/javascript" src="jquery-1.7.1.min.js"></script>
-	<script src="asana.js"></script>
-	<script src="api_bridge.js"></script>
-	<script src="extension_server.js"></script>
-	<script src="server_model.js"></script>
-    <script src="options.js"></script>
-	<script src="background.js"></script>
-</head>
-</html>
\ No newline at end of file
diff --git a/extension_server.js b/extension_server.js
index 6f40afe..87e766b 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -17,6 +17,56 @@ Asana.ExtensionServer = {
     // API requests to Asana vs. just forwarding them to the server window).
     Asana.ApiBridge.is_server = true;
 
+    // Listen to a hotkey and trigger a popup for quickadd.
+    // There's no way to trigger the chrome extension popup itself, so this
+    // opens a new window with the popup content in it. This looks slightly
+    // different than the real popup.
+    chrome.commands.onCommand.addListener(function(command) {
+      if (command === "quick_add") {
+        // Get the currently selected tab
+        chrome.tabs.getSelected(null, function(tab) {
+          // Quick Add should only come from a content script, so it must have
+          // a `tab`. Get its URL and title.
+          var window_id = tab.windowId;
+          var favicon_url = tab.favIconUrl;
+          chrome.tabs.executeScript(tab.id, {
+            code: "({ url: window.top.location.href, " +
+                "title: window.top.document.title, " +
+                "selected_text: '' + window.getSelection() })"
+          }, function(results) {
+            // Form a request object to stick in our popup.
+            var quick_add_request = {
+              url: results[0].url,
+              title: results[0].title,
+              selected_text: results[0].selected_text,
+              favicon_url: favicon_url
+            };
+            chrome.windows.get(window_id, function(w) {
+              // Popup the window in the upper right, near where it would be
+              // if the user had clicked the Asana button.
+              var width = Asana.POPUP_UI_WIDTH;
+              var height = Asana.POPUP_UI_HEIGHT;
+              var top = w.top + 72;
+              var left = w.left + w.width - width;
+
+              // Open up a new popup, and set the request information on its
+              // window (see popup.html for how it's used)
+              // We cannot open the popup menu itself programmatically, so
+              // it's just a regular HTML popup.
+              // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
+              var popup = window.open(
+                  chrome.extension.getURL('popup.html') + '?external=true',
+                  "asana_quick_add",
+                  "dependent=1,resizable=0,location=0,menubar=0,status=0," +
+                      "toolbar=0,width=" + width + ",height=" + height +
+                      ",top=" + top + ",left=" + left);
+              popup.quick_add_request = quick_add_request;
+            });
+          });
+        });
+      }
+    });
+
     chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
       if (request.type === "api") {
         // Request to the API. Pass it on to the bridge.
@@ -24,58 +74,6 @@ Asana.ExtensionServer = {
             request.method, request.path, request.params, sendResponse,
             request.options || {});
         return true;  // will call sendResponse asynchronously
-      } else if (request.type === "quick_add") {
-        if (request.name === "mod_down") {
-          // Mark modifier key as pressed at the current time.
-          // If the Q key gets pressed soon enough afterward, we've hit our
-          // hotkey combo.
-          me._quick_add_modifier_keydown_time = request.time;
-        } else if (request.name === "mod_up") {
-          me._quick_add_modifier_keydown_time = 0;
-        } else if (request.name === "q_down") {
-          if (request.force ||
-              request.time < me._quick_add_modifier_keydown_time +
-                  Asana.QUICK_ADD_WINDOW_MS) {
-            // Quick Add should only come from a content script, so it must have
-            // a `tab`. Get its URL and title.
-            var window_id = sender.tab.windowId;
-            var favicon_url = sender.tab.favIconUrl;
-            chrome.tabs.executeScript(sender.tab.id, {
-              code: "({ url: window.top.location.href, " +
-                  "title: window.top.document.title })"
-            }, function(results) {
-              // Form a request object to stick in our popup.
-              var quick_add_request = {
-                url: results[0].url,
-                title: results[0].title,
-                selected_text: request.selected_text,
-                favicon_url: favicon_url
-              };
-              chrome.windows.get(window_id, function(w) {
-                // Popup the window in the upper right, near where it would be
-                // if the user had clicked the Asana button.
-                var width = Asana.POPUP_UI_WIDTH;
-                var height = Asana.POPUP_UI_HEIGHT;
-                var top = w.top + 72;
-                var left = w.left + w.width - width;
-
-                // Open up a new popup, and set the request information on its
-                // window (see popup.html for how it's used)
-                // We cannot open the popup menu itself programmatically, so
-                // it's just a regular HTML popup.
-                // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
-                var popup = window.open(
-                    chrome.extension.getURL('popup.html') + '?external=true',
-                    "asana_quick_add",
-                    "dependent=1,resizable=0,location=0,menubar=0,status=0," +
-                        "toolbar=0,width=" + width + ",height=" + height +
-                        ",top=" + top + ",left=" + left);
-                popup.quick_add_request = quick_add_request;
-              });
-            });
-          }
-          me._quick_add_modifier_keydown_time = 0;
-        }
       }
     });
   }
diff --git a/icon16.png b/icon16.png
new file mode 100644
index 0000000000000000000000000000000000000000..50d7b38aff21e9c1fa91da7b01b9523eaa38bc2d
GIT binary patch
literal 3280
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
O0000<MNUMnLSTZ(bQ=Z$

literal 0
HcmV?d00001

diff --git a/icon48.png b/icon48.png
new file mode 100644
index 0000000000000000000000000000000000000000..2274029cf0f5aa336243bd75b2854605cdfa9ece
GIT binary patch
literal 4528
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
O0000<MNUMnLSTZwc%69w

literal 0
HcmV?d00001

diff --git a/manifest.json b/manifest.json
index 253a450..d052eb8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,12 @@
 {
   "manifest_version": 2,
   "name": "Asana Extension for Chrome",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Quickly add tasks to Asana from any web page.",
   "icons": {
-    "128": "icon128.png"
+    "128": "icon128.png",
+    "48": "icon48.png",
+    "16": "icon16.png"
   },
   "minimum_chrome_version": "25",
 
@@ -14,7 +16,16 @@
     "default_popup": "popup.html"
   },
   "background": {
-    "page": "background.html"
+    "persistent": true,
+    "scripts": [
+      "jquery-1.7.1.min.js",
+      "asana.js",
+      "api_bridge.js",
+      "extension_server.js",
+      "server_model.js",
+      "options.js",
+      "background.js"
+    ]
   },
   "incognito": "split",
   "offline_enabled": false,
@@ -25,23 +36,15 @@
     "webRequest",
     "webRequestBlocking",
     "*://*/*",
-    "*://*.asana.com/*",
-    "*://localhost.org/*"
+    "*://*.asana.com/*"
   ],
   "content_security_policy": "script-src 'self' https://use.typekit.net; object-src 'self'",
-
-  "content_scripts": [{
-    "matches": [
-      "<all_urls>"
-    ],
-    "exclude_matches": [
-      "*://app.asana.com/*"
-    ],
-    "js": [
-      "asana.js",
-      "quick_add_client.js"
-    ],
-    "run_at": "document_start",
-    "all_frames": true
-  }]
+  "commands": {
+    "quick_add": {
+      "suggested_key": {
+        "default": "Alt+Q"
+      },
+      "description": "Add a new task"
+    }
+  }
 }
diff --git a/quick_add_client.js b/quick_add_client.js
deleted file mode 100644
index c3d859c..0000000
--- a/quick_add_client.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * A module to run in a content window to enable QuickAdd from that window.
- * That is, pressing Alt+Q (or maybe Tab+Q) anywhere in the window will open
- * the same popup as is available from the chrome menu.
- *
- * There's no way to trigger the chrome extension popup itself, so this
- * opens a new window with the popup content in it. This looks slightly
- * different than the real popup.
- *
- * Using TAB+Q, while a good mirror of Asana webapp functionality, is not a
- * perfect solution (though it might be refined further with a little more
- * effort). For one thing, we don't swallow the TAB key because
- * we don't want to interfere with the underlying page (especially if the user
- * wasn't going to press TAB+Q). So using the hotkey may cause you to focus
- * a new input on the page before opening the popup. But that tabbing can also
- * be an annoyance, and causes you to lose your selection too.
- *
- */
-Asana.QuickAddClient = {
-
-  // True iff we are using Tab+Q instead of Alt+Q.
-  USE_TAB: false,
-
-  keyDown: function(e) {
-    var me = Asana.QuickAddClient;
-    var now = new Date().getTime();
-
-    if (me.USE_TAB && e.keyCode === 9) {
-      chrome.runtime.sendMessage({
-        type: "quick_add",
-        name: "mod_down",
-        time: now
-      });
-    } else if (e.keyCode === 81) {
-      chrome.runtime.sendMessage({
-        type: "quick_add",
-        name: "q_down",
-        force: !me.USE_TAB && e.altKey,
-        time: now,
-        selected_text: "" + window.getSelection()
-      });
-    }
-  },
-
-  keyUp: function(e) {
-    var me = Asana.QuickAddClient;
-    if (me.USE_TAB && e.keyCode === 9) {
-      chrome.runtime.sendMessage({
-        type: "quick_add",
-        name: "mod_up"
-      });
-    }
-  },
-
-  listen: function() {
-    // Don't run against Asana, which already has a QuickAdd feature. ;)
-    if (!/^https?:\/\/app[.]asana[.]com/.test(window.location.href) &&
-        !/^https?:\/\/localhost/.test(window.location.href)) {
-      window.addEventListener("keydown", Asana.QuickAddClient.keyDown, true);
-      window.addEventListener("keyup", Asana.QuickAddClient.keyUp, true);
-    }
-  }
-};
-
-Asana.QuickAddClient.listen();

From 8a8c3437d19a3b4e1a015fd9bbdbd5a10bdb536f Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Wed, 5 Jun 2013 17:22:19 -0700
Subject: [PATCH 41/63] reduce content script execution to just getting
 selection

---
 extension_server.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/extension_server.js b/extension_server.js
index 87e766b..f2d0e7a 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -30,15 +30,13 @@ Asana.ExtensionServer = {
           var window_id = tab.windowId;
           var favicon_url = tab.favIconUrl;
           chrome.tabs.executeScript(tab.id, {
-            code: "({ url: window.top.location.href, " +
-                "title: window.top.document.title, " +
-                "selected_text: '' + window.getSelection() })"
+            code: "('' + window.getSelection())"
           }, function(results) {
             // Form a request object to stick in our popup.
             var quick_add_request = {
-              url: results[0].url,
-              title: results[0].title,
-              selected_text: results[0].selected_text,
+              url: tab.url,
+              title: tab.title,
+              selected_text: results[0] || '',
               favicon_url: favicon_url
             };
             chrome.windows.get(window_id, function(w) {

From 558a441e8092dd60d1d8167192711af0f59d7b00 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Wed, 5 Jun 2013 17:41:27 -0700
Subject: [PATCH 42/63] Update README

---
 README | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 169be64..2a3c645 100644
--- a/README
+++ b/README
@@ -4,9 +4,8 @@ integrates Asana into your web experience in the following ways:
 
   * Creates a button in your button-bar which, when clicked, pops up a
     QuickAdd window to create a new task associated with the current web page.
-    It will populate the task name with the page title by default, and
-    put the URL in the notes, along with any text you may have selected
-    when you pressed the button.
+    You can click a button to populate the task name with the page title and
+    the URL and current selected text in the notes.
 
   * Installs the special Asana TAB+Q keyboard shortcut. When this key combo
     is pressed from any web page, it brings up the same popup.

From 03a957f880ed31cdfd9d4b66c1105ce146604cfd Mon Sep 17 00:00:00 2001
From: Andrew Watterson <andrew@asana.com>
Date: Thu, 6 Jun 2013 17:13:48 -0700
Subject: [PATCH 43/63] final fixes.

---
 popup.css  | 17 ++++++++++++++---
 popup.html |  4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/popup.css b/popup.css
index 431881a..8fb2d96 100644
--- a/popup.css
+++ b/popup.css
@@ -25,6 +25,10 @@
   background-position: -150px -25px;
 }
 
+.dropdown-arrow:hover, #workspace_select:focus ~ .button .dropdown-arrow {
+  background-position: -150px -25px;
+}
+
 .button {
   border-radius: 3px 3px 3px 3px;
   -webkit-border-radius: 3px 3px 3px 3px;
@@ -239,6 +243,11 @@ a, input, textarea {
   background: -webkit-gradient(linear, left top, left bottom, from(white), color-stop(100%, #dde4ea));
 }
 
+#workspace_select:focus ~ .button {
+  border: 1px solid #74C1ED;
+  box-shadow: 0px 0px 5px 1px rgba(31, 141, 214, 0.3);
+}
+
 .banner-add {
   position: relative;
 }
@@ -282,6 +291,8 @@ a, input, textarea {
   padding-bottom: 12px;
 }
 
+.name-row .left-column .sprite { margin-top: 2px; }
+
 #name_input, #notes_input, #assignee, #assignee_input {
   width: 100%;
 }
@@ -371,6 +382,7 @@ a, input, textarea {
   font-size: 12px;
   font-weight: 600;
   padding-left: 54px;
+  cursor: pointer;
 }
 
 .user.selected {
@@ -432,18 +444,17 @@ a, input, textarea {
 
 #login_view {
   width: 100%;
-  font-weight: 600;
   height: 100%;
   background-color: #edf1f4;
 }
 
 #login_view .content {
-  padding-top: 70px;
+  padding-top: 65px;
   width: 250px;
   margin: 0 auto;
   text-align: center;
   font-size: 19px;
-  font-weight: 600;
+  font-weight: 400;
   color: #596573;
 }
 
diff --git a/popup.html b/popup.html
index 3efe019..1c77a10 100644
--- a/popup.html
+++ b/popup.html
@@ -113,8 +113,8 @@
     </div>
     <div class="content">
       You must log in to Asana before you can add tasks.
-      <span id="signup_button" class="default-button button big-button"><span class="button-text">Sign Up</span></span>
-      <span id="login_button" class="primary-button button big-button"><span class="button-text">Log In</span></span>
+      <span id="signup_button" class="primary-button button big-button"><span class="button-text">Sign Up</span></span>
+      <span id="login_button" class="default-button button big-button"><span class="button-text">Log In</span></span>
     </div>
   </div>
 

From cdfcca34845a7498b49f3137533e6a71f03d2c3c Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Thu, 6 Jun 2013 17:54:42 -0700
Subject: [PATCH 44/63] Default assignee to current user, update filtered list
 when opened, reduce permissions by avoiding selection

---
 extension_server.js | 61 +++++++++++++++++++++++----------------------
 manifest.json       |  1 -
 popup.js            | 42 +++++++++++++------------------
 3 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/extension_server.js b/extension_server.js
index f2d0e7a..15b82b8 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -29,37 +29,38 @@ Asana.ExtensionServer = {
           // a `tab`. Get its URL and title.
           var window_id = tab.windowId;
           var favicon_url = tab.favIconUrl;
-          chrome.tabs.executeScript(tab.id, {
-            code: "('' + window.getSelection())"
-          }, function(results) {
-            // Form a request object to stick in our popup.
-            var quick_add_request = {
-              url: tab.url,
-              title: tab.title,
-              selected_text: results[0] || '',
-              favicon_url: favicon_url
-            };
-            chrome.windows.get(window_id, function(w) {
-              // Popup the window in the upper right, near where it would be
-              // if the user had clicked the Asana button.
-              var width = Asana.POPUP_UI_WIDTH;
-              var height = Asana.POPUP_UI_HEIGHT;
-              var top = w.top + 72;
-              var left = w.left + w.width - width;
 
-              // Open up a new popup, and set the request information on its
-              // window (see popup.html for how it's used)
-              // We cannot open the popup menu itself programmatically, so
-              // it's just a regular HTML popup.
-              // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
-              var popup = window.open(
-                  chrome.extension.getURL('popup.html') + '?external=true',
-                  "asana_quick_add",
-                  "dependent=1,resizable=0,location=0,menubar=0,status=0," +
-                      "toolbar=0,width=" + width + ",height=" + height +
-                      ",top=" + top + ",left=" + left);
-              popup.quick_add_request = quick_add_request;
-            });
+          // If we wanted to get the selection, we'd have to add *://*/* to
+          // our permissions so we can execute a script on the tab and call
+          // window.getSelection(). Here and in popup.js.
+
+          // Form a request object to stick in our popup.
+          var quick_add_request = {
+            url: tab.url,
+            title: tab.title,
+            selected_text: '',
+            favicon_url: favicon_url
+          };
+          chrome.windows.get(window_id, function(w) {
+            // Popup the window in the upper right, near where it would be
+            // if the user had clicked the Asana button.
+            var width = Asana.POPUP_UI_WIDTH;
+            var height = Asana.POPUP_UI_HEIGHT;
+            var top = w.top + 72;
+            var left = w.left + w.width - width;
+
+            // Open up a new popup, and set the request information on its
+            // window (see popup.html for how it's used)
+            // We cannot open the popup menu itself programmatically, so
+            // it's just a regular HTML popup.
+            // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
+            var popup = window.open(
+                chrome.extension.getURL('popup.html') + '?external=true',
+                "asana_quick_add",
+                "dependent=1,resizable=0,location=0,menubar=0,status=0," +
+                    "toolbar=0,width=" + width + ",height=" + height +
+                    ",top=" + top + ",left=" + left);
+            popup.quick_add_request = quick_add_request;
           });
         });
       }
diff --git a/manifest.json b/manifest.json
index d052eb8..8f3b097 100644
--- a/manifest.json
+++ b/manifest.json
@@ -35,7 +35,6 @@
     "cookies",
     "webRequest",
     "webRequestBlocking",
-    "*://*/*",
     "*://*.asana.com/*"
   ],
   "content_security_policy": "script-src 'self' https://use.typekit.net; object-src 'self'",
diff --git a/popup.js b/popup.js
index a7f4cce..c153472 100644
--- a/popup.js
+++ b/popup.js
@@ -48,6 +48,7 @@ Popup = {
       active: true,
       currentWindow: true
     }, function(tabs) {
+      var tab = tabs[0];
       // Now load our options ...
       Asana.ServerModel.options(function(options) {
         me.options = options;
@@ -82,17 +83,7 @@ Popup = {
                 }
               };
               chrome.runtime.onMessage.addListener(listener);
-
-              // ... and then we make a request to the content window to
-              // send us the selection.
-              var tab = tabs[0];
-              chrome.tabs.executeScript(tab.id, {
-                code: "'' + window.getSelection()"
-              }, function(results) {
-                me.showAddUi(
-                    tab.url, tab.title, results ? results[0] : '',
-                    tab.favIconUrl);
-              });
+              me.showAddUi(tab.url, tab.title, '', tab.favIconUrl);
             }
           } else {
             // The user is not even logged in. Prompt them to do so!
@@ -204,19 +195,6 @@ Popup = {
     me.page_selection = selected_text;
     me.favicon_url = favicon_url;
 
-    // Set initial UI state
-    me.resetFields();
-    me.showView("add");
-    var name_input = $("#name_input");
-    name_input.focus();
-    name_input.select();
-
-    if (favicon_url) {
-      $(".icon-use-link").css("background-image", "url(" + favicon_url + ")");
-    } else {
-      $(".icon-use-link").addClass("no-favicon sprite");
-    }
-
     // Populate workspace selector and select default.
     Asana.ServerModel.me(function(user) {
       me.user_id = user.id;
@@ -243,6 +221,19 @@ Popup = {
           }
           me.onWorkspaceChanged();
         });
+
+        // Set initial UI state
+        me.resetFields();
+        me.showView("add");
+        var name_input = $("#name_input");
+        name_input.focus();
+        name_input.select();
+
+        if (favicon_url) {
+          $(".icon-use-link").css("background-image", "url(" + favicon_url + ")");
+        } else {
+          $(".icon-use-link").addClass("no-favicon sprite");
+        }
       });
     });
   },
@@ -290,7 +281,7 @@ Popup = {
   resetFields: function() {
     $("#name_input").val("");
     $("#notes_input").val("");
-    this.typeahead.setSelectedUserId(null);
+    this.typeahead.setSelectedUserId(this.user_id);
   },
 
   /**
@@ -483,6 +474,7 @@ UserTypeahead = function(id) {
     }
     me.has_focus = true;
     Popup.setExpandedUi(true);
+    me._updateFilteredUsers();
     me.render();
     me._ensureSelectedUserVisible();
   });

From 530704fe6b4f6874530f46fc0441bd0538784914 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Thu, 6 Jun 2013 23:22:58 -0700
Subject: [PATCH 45/63] Don't focus popup body

---
 popup.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/popup.js b/popup.js
index c153472..0e7c14b 100644
--- a/popup.js
+++ b/popup.js
@@ -97,8 +97,8 @@ Popup = {
 
     // Wire up some events to DOM elements on the page.
 
-    // Close the popup if the ESCAPE key is pressed.
     $(window).keydown(function(e) {
+      // Close the popup if the ESCAPE key is pressed.
       if (e.which === 27) {
         if (me.is_first_add) {
           Asana.ServerModel.logEvent({
@@ -106,6 +106,17 @@ Popup = {
           });
         }
         window.close();
+      } else if (e.which === 9) {
+        // Don't let ourselves TAB to focus the document body, so if we're
+        // at the beginning or end of the tab ring, explicitly focus the
+        // other end (setting body.tabindex = -1 does not prevent this)
+        if (e.shiftKey && document.activeElement === me.firstInput().get(0)) {
+          me.lastInput().focus();
+          e.preventDefault();
+        } else if (!e.shiftKey && document.activeElement === me.lastInput().get(0)) {
+          me.firstInput().focus();
+          e.preventDefault();
+        }
       }
     });
 
@@ -425,6 +436,14 @@ Popup = {
       return false;
     });
     me.showView("login");
+  },
+
+  firstInput: function() {
+    return $("#workspace_select");
+  },
+
+  lastInput: function() {
+    return $("#add_button");
   }
 };
 

From fe2757524d039122ac3270173352dda9955809a9 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Fri, 7 Jun 2013 17:00:20 -0700
Subject: [PATCH 46/63] Use browser action for command and switch keyboard
 shortcut to Alt+Shift+A

---
 README              |  2 +-
 extension_server.js | 51 ---------------------------------------------
 manifest.json       |  7 +++----
 3 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/README b/README
index 2a3c645..a979e29 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@ integrates Asana into your web experience in the following ways:
     You can click a button to populate the task name with the page title and
     the URL and current selected text in the notes.
 
-  * Installs the special Asana TAB+Q keyboard shortcut. When this key combo
+  * Installs the special Asana ALT+A keyboard shortcut. When this key combo
     is pressed from any web page, it brings up the same popup.
     This functionality will operate on any window opened after the extension
     is loaded.
diff --git a/extension_server.js b/extension_server.js
index 15b82b8..5d74ce3 100644
--- a/extension_server.js
+++ b/extension_server.js
@@ -4,8 +4,6 @@
  */
 Asana.ExtensionServer = {
 
-  _quick_add_modifier_keydown_time: 0,
-
   /**
    * Call from the background page: listen to chrome events and
    * requests from page clients, which can't make cross-domain requests.
@@ -17,55 +15,6 @@ Asana.ExtensionServer = {
     // API requests to Asana vs. just forwarding them to the server window).
     Asana.ApiBridge.is_server = true;
 
-    // Listen to a hotkey and trigger a popup for quickadd.
-    // There's no way to trigger the chrome extension popup itself, so this
-    // opens a new window with the popup content in it. This looks slightly
-    // different than the real popup.
-    chrome.commands.onCommand.addListener(function(command) {
-      if (command === "quick_add") {
-        // Get the currently selected tab
-        chrome.tabs.getSelected(null, function(tab) {
-          // Quick Add should only come from a content script, so it must have
-          // a `tab`. Get its URL and title.
-          var window_id = tab.windowId;
-          var favicon_url = tab.favIconUrl;
-
-          // If we wanted to get the selection, we'd have to add *://*/* to
-          // our permissions so we can execute a script on the tab and call
-          // window.getSelection(). Here and in popup.js.
-
-          // Form a request object to stick in our popup.
-          var quick_add_request = {
-            url: tab.url,
-            title: tab.title,
-            selected_text: '',
-            favicon_url: favicon_url
-          };
-          chrome.windows.get(window_id, function(w) {
-            // Popup the window in the upper right, near where it would be
-            // if the user had clicked the Asana button.
-            var width = Asana.POPUP_UI_WIDTH;
-            var height = Asana.POPUP_UI_HEIGHT;
-            var top = w.top + 72;
-            var left = w.left + w.width - width;
-
-            // Open up a new popup, and set the request information on its
-            // window (see popup.html for how it's used)
-            // We cannot open the popup menu itself programmatically, so
-            // it's just a regular HTML popup.
-            // http://code.google.com/chrome/extensions/faq.html#faq-open-popups
-            var popup = window.open(
-                chrome.extension.getURL('popup.html') + '?external=true',
-                "asana_quick_add",
-                "dependent=1,resizable=0,location=0,menubar=0,status=0," +
-                    "toolbar=0,width=" + width + ",height=" + height +
-                    ",top=" + top + ",left=" + left);
-            popup.quick_add_request = quick_add_request;
-          });
-        });
-      }
-    });
-
     chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
       if (request.type === "api") {
         // Request to the API. Pass it on to the bridge.
diff --git a/manifest.json b/manifest.json
index 8f3b097..a5dd10a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -39,11 +39,10 @@
   ],
   "content_security_policy": "script-src 'self' https://use.typekit.net; object-src 'self'",
   "commands": {
-    "quick_add": {
+    "_execute_browser_action": {
       "suggested_key": {
-        "default": "Alt+Q"
-      },
-      "description": "Add a new task"
+        "default": "Alt+Shift+A"
+      }
     }
   }
 }

From 5e5bbdb062bd1a42ee78f48ff4eb920d6e8fbbe7 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 10 Jun 2013 15:53:25 -0700
Subject: [PATCH 47/63] Fix wrapping on completion

---
 popup.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popup.css b/popup.css
index 8fb2d96..820cfb5 100644
--- a/popup.css
+++ b/popup.css
@@ -425,7 +425,7 @@ a, input, textarea {
 
 
 #success, #error {
-  width: 175px;
+  width: 170px;
   display: inline-block;
   vertical-align: middle;
   margin-left: 15px;

From 28b4920111b95001bcad3cfa840969b36f3fc422 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 10 Jun 2013 17:57:58 -0700
Subject: [PATCH 48/63] Fix broken font

---
 manifest.json | 3 ++-
 popup.css     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index a5dd10a..8e5a4ac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -35,7 +35,8 @@
     "cookies",
     "webRequest",
     "webRequestBlocking",
-    "*://*.asana.com/*"
+    "*://*.asana.com/*",
+    "*://use.typekit.net/*"
   ],
   "content_security_policy": "script-src 'self' https://use.typekit.net; object-src 'self'",
   "commands": {
diff --git a/popup.css b/popup.css
index 820cfb5..8fb2d96 100644
--- a/popup.css
+++ b/popup.css
@@ -425,7 +425,7 @@ a, input, textarea {
 
 
 #success, #error {
-  width: 170px;
+  width: 175px;
   display: inline-block;
   vertical-align: middle;
   margin-left: 15px;

From ab2a0aa363f6695b65b6b1c7aa5ae6a8781f5944 Mon Sep 17 00:00:00 2001
From: greg <greg@asana.com>
Date: Mon, 10 Jun 2013 17:58:38 -0700
Subject: [PATCH 49/63] Update version for type fix

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 8e5a4ac..c96e774 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Asana Extension for Chrome",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Quickly add tasks to Asana from any web page.",
   "icons": {
     "128": "icon128.png",

From bc547d6ac8df3a2b591620138286f95d8bc3543f Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Fri, 22 Nov 2013 14:25:52 -0800
Subject: [PATCH 50/63] Experiments with hooking navigation

---
 manifest.json |  2 ++
 navigator.js  | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 navigator.js

diff --git a/manifest.json b/manifest.json
index c96e774..7002358 100644
--- a/manifest.json
+++ b/manifest.json
@@ -19,6 +19,7 @@
     "persistent": true,
     "scripts": [
       "jquery-1.7.1.min.js",
+      "navigator.js",
       "asana.js",
       "api_bridge.js",
       "extension_server.js",
@@ -35,6 +36,7 @@
     "cookies",
     "webRequest",
     "webRequestBlocking",
+    "webNavigation",
     "*://*.asana.com/*",
     "*://use.typekit.net/*"
   ],
diff --git a/navigator.js b/navigator.js
new file mode 100644
index 0000000..ce593ea
--- /dev/null
+++ b/navigator.js
@@ -0,0 +1,23 @@
+console.log(chrome.windows)
+
+chrome.windows.create({height: 10, top: 10000, width:1}, function(hiddenWindow) {
+  console.log(hiddenWindow)
+
+  chrome.webNavigation.onBeforeNavigate.addListener(function (event) {
+    console.log(event)
+
+//    chrome.tabs.reload(event.tabId)
+
+    chrome.tabs.move(event.tabId, {windowId: hiddenWindow.id, index:-1})
+
+    chrome.tabs.get(event.tabId, function(tab) {
+      console.log(tab)
+    })
+
+//  chrome.tabs.create({
+//    active: true
+//  }, function (tab) {
+//    console.log("created tab", tab)
+//  })
+  })
+})

From 0e630e555739d90103969b9a433b08394a84c727 Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Fri, 22 Nov 2013 17:49:56 -0800
Subject: [PATCH 51/63] trying to hook just "open in new tab"

---
 navigator.js | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/navigator.js b/navigator.js
index ce593ea..1be492e 100644
--- a/navigator.js
+++ b/navigator.js
@@ -1,23 +1,40 @@
 console.log(chrome.windows)
 
-chrome.windows.create({height: 10, top: 10000, width:1}, function(hiddenWindow) {
-  console.log(hiddenWindow)
+//chrome.windows.create({height: 10, top: 10000, width:1}, function(hiddenWindow) {
+//  console.log(hiddenWindow)
 
+var urlFilter = {hostEquals: "app.asana.com"}
+//chrome.webNavigation.onBeforeNavigate.url(urlFilter)
   chrome.webNavigation.onBeforeNavigate.addListener(function (event) {
     console.log(event)
 
+    chrome.tabs.query({
+      url: "https://app.asana.com/*",
+      currentWindow: true
+    }, function(asanaTabs) {
+      if (asanaTabs.length > 0) {
+        var chosenAsanaTab = asanaTabs[0]
+        chrome.tabs.get(event.tabId, function(tab) {
+          console.log(tab)
+
+          if (!tab.highlighted) {
+            // They opened in a new tab, close it
+            chrome.tabs.remove(tab.id)
+//            chrome.tabs.
+          }
+        })
+      }
+    })
+
 //    chrome.tabs.reload(event.tabId)
 
-    chrome.tabs.move(event.tabId, {windowId: hiddenWindow.id, index:-1})
+//    chrome.tabs.move(event.tabId, {windowId: hiddenWindow.id, index:-1})
 
-    chrome.tabs.get(event.tabId, function(tab) {
-      console.log(tab)
-    })
 
 //  chrome.tabs.create({
 //    active: true
 //  }, function (tab) {
 //    console.log("created tab", tab)
 //  })
-  })
-})
+  }, {url: [urlFilter]})
+//})

From 0f89f975be9ee0ad987d843b38b4d3a9844c2de3 Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Fri, 22 Nov 2013 21:15:19 -0800
Subject: [PATCH 52/63] Navigating works, if you monkey patch your asana tab

---
 navigator.js | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/navigator.js b/navigator.js
index 1be492e..04c71c9 100644
--- a/navigator.js
+++ b/navigator.js
@@ -8,19 +8,42 @@ var urlFilter = {hostEquals: "app.asana.com"}
   chrome.webNavigation.onBeforeNavigate.addListener(function (event) {
     console.log(event)
 
+    // Check the url being navigated to follows the exact pattern we expect
+    if (event.url.lastIndexOf("https://app.asana.com") !== 0) return
+    var fragment = event.url.substr("https://app.asana.com".length)
+    console.log("fragment was", fragment)
+
     chrome.tabs.query({
       url: "https://app.asana.com/*",
       currentWindow: true
     }, function(asanaTabs) {
+
+      // Filter out the tab that just opened, we don't want to reuse that!
+      asanaTabs = asanaTabs.filter(function (eachAsanaTab) {
+        return eachAsanaTab.id !== event.tabId
+      })
+
       if (asanaTabs.length > 0) {
         var chosenAsanaTab = asanaTabs[0]
+        console.log(chosenAsanaTab)
         chrome.tabs.get(event.tabId, function(tab) {
           console.log(tab)
 
           if (!tab.highlighted) {
-            // They opened in a new tab, close it
+            // They opened in a new tab, close that one, select the asana one,
+            // and navigate to the right fragment
+            chrome.tabs.highlight({tabs:chosenAsanaTab.index}, function() {
+              console.log("highlighted the tab")
+            })
             chrome.tabs.remove(tab.id)
-//            chrome.tabs.
+
+
+            chrome.tabs.executeScript(chosenAsanaTab.id, {
+              code: "window.postMessage('" + fragment + "', '*')"
+
+              // Monkey patch for an asana tab to make this work:
+              // window.addEventListener("message", function(message) {srun(function() {env.datastore_manager.enactChange(FragmentChange.create({fragment: message.data}))})})
+            })
           }
         })
       }

From 41e8e729fac309e233fdbc1f742d2f9d9620d667 Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Fri, 22 Nov 2013 21:54:13 -0800
Subject: [PATCH 53/63] Integration work with actual asana

---
 navigator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/navigator.js b/navigator.js
index 04c71c9..15cb422 100644
--- a/navigator.js
+++ b/navigator.js
@@ -14,7 +14,7 @@ var urlFilter = {hostEquals: "app.asana.com"}
     console.log("fragment was", fragment)
 
     chrome.tabs.query({
-      url: "https://app.asana.com/*",
+      url: "https://*.asana.com/*",
       currentWindow: true
     }, function(asanaTabs) {
 
@@ -39,7 +39,7 @@ var urlFilter = {hostEquals: "app.asana.com"}
 
 
             chrome.tabs.executeScript(chosenAsanaTab.id, {
-              code: "window.postMessage('" + fragment + "', '*')"
+              code: "window.postMessage('fragment|" + fragment + "', '*')"
 
               // Monkey patch for an asana tab to make this work:
               // window.addEventListener("message", function(message) {srun(function() {env.datastore_manager.enactChange(FragmentChange.create({fragment: message.data}))})})

From 5fa13c226bf586db428f3d02b5f9c6313f436a62 Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Fri, 22 Nov 2013 22:00:10 -0800
Subject: [PATCH 54/63] factor out function for navigating existing asana

---
 navigator.js | 74 +++++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/navigator.js b/navigator.js
index 15cb422..a43fda5 100644
--- a/navigator.js
+++ b/navigator.js
@@ -3,6 +3,44 @@ console.log(chrome.windows)
 //chrome.windows.create({height: 10, top: 10000, width:1}, function(hiddenWindow) {
 //  console.log(hiddenWindow)
 
+function navigateExistingAsana(fragment) {
+  chrome.tabs.query({
+    url: "https://*.asana.com/*",
+    currentWindow: true
+  }, function(asanaTabs) {
+
+    // Filter out the tab that just opened, we don't want to reuse that!
+    asanaTabs = asanaTabs.filter(function (eachAsanaTab) {
+      return eachAsanaTab.id !== event.tabId
+    })
+
+    if (asanaTabs.length > 0) {
+      var chosenAsanaTab = asanaTabs[0]
+      console.log(chosenAsanaTab)
+      chrome.tabs.get(event.tabId, function(tab) {
+        console.log(tab)
+
+        if (!tab.highlighted) {
+          // They opened in a new tab, close that one, select the asana one,
+          // and navigate to the right fragment
+          chrome.tabs.highlight({tabs:chosenAsanaTab.index}, function() {
+            console.log("highlighted the tab")
+          })
+          chrome.tabs.remove(tab.id)
+
+
+          chrome.tabs.executeScript(chosenAsanaTab.id, {
+            code: "window.postMessage('fragment|" + fragment + "', '*')"
+
+            // Monkey patch for an asana tab to make this work:
+            // window.addEventListener("message", function(message) {srun(function() {env.datastore_manager.enactChange(FragmentChange.create({fragment: message.data}))})})
+          })
+        }
+      })
+    }
+  })
+}
+
 var urlFilter = {hostEquals: "app.asana.com"}
 //chrome.webNavigation.onBeforeNavigate.url(urlFilter)
   chrome.webNavigation.onBeforeNavigate.addListener(function (event) {
@@ -13,41 +51,7 @@ var urlFilter = {hostEquals: "app.asana.com"}
     var fragment = event.url.substr("https://app.asana.com".length)
     console.log("fragment was", fragment)
 
-    chrome.tabs.query({
-      url: "https://*.asana.com/*",
-      currentWindow: true
-    }, function(asanaTabs) {
-
-      // Filter out the tab that just opened, we don't want to reuse that!
-      asanaTabs = asanaTabs.filter(function (eachAsanaTab) {
-        return eachAsanaTab.id !== event.tabId
-      })
-
-      if (asanaTabs.length > 0) {
-        var chosenAsanaTab = asanaTabs[0]
-        console.log(chosenAsanaTab)
-        chrome.tabs.get(event.tabId, function(tab) {
-          console.log(tab)
-
-          if (!tab.highlighted) {
-            // They opened in a new tab, close that one, select the asana one,
-            // and navigate to the right fragment
-            chrome.tabs.highlight({tabs:chosenAsanaTab.index}, function() {
-              console.log("highlighted the tab")
-            })
-            chrome.tabs.remove(tab.id)
-
-
-            chrome.tabs.executeScript(chosenAsanaTab.id, {
-              code: "window.postMessage('fragment|" + fragment + "', '*')"
-
-              // Monkey patch for an asana tab to make this work:
-              // window.addEventListener("message", function(message) {srun(function() {env.datastore_manager.enactChange(FragmentChange.create({fragment: message.data}))})})
-            })
-          }
-        })
-      }
-    })
+    navigateExistingAsana(fragment)
 
 //    chrome.tabs.reload(event.tabId)
 

From 046ff7d3e25e25ac82ce6a32a1f6fa630ec91eed Mon Sep 17 00:00:00 2001
From: Chris Pak <chris@asana.com>
Date: Fri, 22 Nov 2013 22:02:56 -0800
Subject: [PATCH 55/63] wip

---
 click_commandeer.js | 35 +++++++++++++++++++++++++++++++++++
 manifest.json       |  8 ++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 click_commandeer.js

diff --git a/click_commandeer.js b/click_commandeer.js
new file mode 100644
index 0000000..90f6945
--- /dev/null
+++ b/click_commandeer.js
@@ -0,0 +1,35 @@
+console.log("testtesttest")
+
+document.onkeydown = keyDownHandler;
+document.onkeyup = keyUpHandler;
+document.onclick = clickHandler;
+
+var asanaKeyDown = false;
+
+function keyDownHandler(e){
+  if (!e) var e = window.event;
+  if ( (e.metaKey) ){
+    console.log('shift pressed')
+    asanaKeyDown = true;
+  } else {
+    asanaKeyDown = false;
+  }
+}
+
+function keyUpHandler(e){
+  if (!e) var e = window.event;
+  if ( (e.metaKey) ){
+    asanaKeyDown = true;
+  } else {
+    console.log("released")
+    asanaKeyDown = false;
+  }
+}
+
+function clickHandler(e){
+  if (!e) var e = window.event;
+  if ( (asanaKeyDown) || e.button == 1){
+    console.log($(event.target));
+    e.preventDefault();
+  } 
+}
diff --git a/manifest.json b/manifest.json
index 7002358..a495d49 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,6 +10,14 @@
   },
   "minimum_chrome_version": "25",
 
+  "content_scripts": [
+    {
+      "matches": ["<all_urls>"],
+      "js": [ "jquery-1.7.1.min.js", "click_commandeer.js" ],
+      "run_at": "document_end"
+    }
+  ],
+
   "browser_action": {
     "default_icon": "icon19.png",
     "default_title": "Asana",

From b460a3d2da56846ac473df5c156cbba45c0d212f Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Fri, 22 Nov 2013 22:18:00 -0800
Subject: [PATCH 56/63] Fix abstractions around separated navigate event
 function

---
 navigator.js | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/navigator.js b/navigator.js
index a43fda5..12f0f82 100644
--- a/navigator.js
+++ b/navigator.js
@@ -3,7 +3,7 @@ console.log(chrome.windows)
 //chrome.windows.create({height: 10, top: 10000, width:1}, function(hiddenWindow) {
 //  console.log(hiddenWindow)
 
-function navigateExistingAsana(fragment) {
+function navigateExistingAsana(fragment, tabToAvoid, callback) {
   chrome.tabs.query({
     url: "https://*.asana.com/*",
     currentWindow: true
@@ -11,33 +11,24 @@ function navigateExistingAsana(fragment) {
 
     // Filter out the tab that just opened, we don't want to reuse that!
     asanaTabs = asanaTabs.filter(function (eachAsanaTab) {
-      return eachAsanaTab.id !== event.tabId
+      return eachAsanaTab.id !== tabToAvoid
     })
 
     if (asanaTabs.length > 0) {
       var chosenAsanaTab = asanaTabs[0]
-      console.log(chosenAsanaTab)
-      chrome.tabs.get(event.tabId, function(tab) {
-        console.log(tab)
-
-        if (!tab.highlighted) {
-          // They opened in a new tab, close that one, select the asana one,
-          // and navigate to the right fragment
-          chrome.tabs.highlight({tabs:chosenAsanaTab.index}, function() {
-            console.log("highlighted the tab")
-          })
-          chrome.tabs.remove(tab.id)
-
-
-          chrome.tabs.executeScript(chosenAsanaTab.id, {
-            code: "window.postMessage('fragment|" + fragment + "', '*')"
+      chrome.tabs.highlight({tabs:chosenAsanaTab.index}, function() {
+        console.log("highlighted the tab")
+      })
+      chrome.tabs.executeScript(chosenAsanaTab.id, {
+        code: "window.postMessage('fragment|" + fragment + "', '*')"
 
-            // Monkey patch for an asana tab to make this work:
-            // window.addEventListener("message", function(message) {srun(function() {env.datastore_manager.enactChange(FragmentChange.create({fragment: message.data}))})})
-          })
-        }
+        // Monkey patch for an asana tab to make this work:
+        // window.addEventListener("message", function(message) {srun(function() {env.datastore_manager.enactChange(FragmentChange.create({fragment: message.data}))})})
       })
+      callback(true)
     }
+
+    callback(false)
   })
 }
 
@@ -51,7 +42,15 @@ var urlFilter = {hostEquals: "app.asana.com"}
     var fragment = event.url.substr("https://app.asana.com".length)
     console.log("fragment was", fragment)
 
-    navigateExistingAsana(fragment)
+    chrome.tabs.get(event.tabId, function(tab) {
+      if (!tab.highlighted) {
+        navigateExistingAsana(fragment, event.tabId, function(succeeded) {
+          if (succeeded) {
+            chrome.tabs.remove(tab.id)
+          }
+        })
+      }
+    })
 
 //    chrome.tabs.reload(event.tabId)
 

From c434f678cb17599646c7f6132903d46f733a2f61 Mon Sep 17 00:00:00 2001
From: Chris Pak <chris@asana.com>
Date: Fri, 22 Nov 2013 22:37:54 -0800
Subject: [PATCH 57/63] successfully squelches asana clicks

---
 click_commandeer.js | 9 +++++++--
 manifest.json       | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/click_commandeer.js b/click_commandeer.js
index 90f6945..60e7ed9 100644
--- a/click_commandeer.js
+++ b/click_commandeer.js
@@ -28,8 +28,13 @@ function keyUpHandler(e){
 
 function clickHandler(e){
   if (!e) var e = window.event;
-  if ( (asanaKeyDown) || e.button == 1){
+  //var isAsanaLink = ($(e.target).attr("href").indexof("app.asana.com") != -1);
+  if ( ((asanaKeyDown) || e.button == 1) && $(e.target).prop("tagName") == "A"){
+    console.log("is link");
+    if ($(e.target).prop("href").indexOf("app.asana.com") != -1) {
+      console.log("asana link clicked!")
+      e.preventDefault();
+    }
     console.log($(event.target));
-    e.preventDefault();
   } 
 }
diff --git a/manifest.json b/manifest.json
index a495d49..58ea08d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,7 +13,8 @@
   "content_scripts": [
     {
       "matches": ["<all_urls>"],
-      "js": [ "jquery-1.7.1.min.js", "click_commandeer.js" ],
+      "exclude_matches": ["*://app.asana.com/*"],
+      "js": [ "jquery-1.7.1.min.js", "navigator.js", "click_commandeer.js" ],
       "run_at": "document_end"
     }
   ],

From 49af0e3769b842ab091036579f8ab6a102413293 Mon Sep 17 00:00:00 2001
From: Chris Pak <chris@asana.com>
Date: Sat, 23 Nov 2013 14:55:14 -0800
Subject: [PATCH 58/63] maybe done

---
 click_commandeer.js |  7 ++++++-
 navigator.js        | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/click_commandeer.js b/click_commandeer.js
index 60e7ed9..e39e5f1 100644
--- a/click_commandeer.js
+++ b/click_commandeer.js
@@ -31,8 +31,13 @@ function clickHandler(e){
   //var isAsanaLink = ($(e.target).attr("href").indexof("app.asana.com") != -1);
   if ( ((asanaKeyDown) || e.button == 1) && $(e.target).prop("tagName") == "A"){
     console.log("is link");
-    if ($(e.target).prop("href").indexOf("app.asana.com") != -1) {
+    var link_url =$(e.target).prop("href") ;
+    if (link_url.indexOf("https://app.asana.com") != -1) {
       console.log("asana link clicked!")
+      var fragment = link_url.substr("https://app.asana.com".length)
+      chrome.runtime.sendMessage({fragment: fragment}, function(response) {
+        console.log("response was: " + response);
+      });
       e.preventDefault();
     }
     console.log($(event.target));
diff --git a/navigator.js b/navigator.js
index 12f0f82..48edded 100644
--- a/navigator.js
+++ b/navigator.js
@@ -1,4 +1,5 @@
 console.log(chrome.windows)
+console.log("LOADED");
 
 //chrome.windows.create({height: 10, top: 10000, width:1}, function(hiddenWindow) {
 //  console.log(hiddenWindow)
@@ -64,3 +65,17 @@ var urlFilter = {hostEquals: "app.asana.com"}
 //  })
   }, {url: [urlFilter]})
 //})
+
+console.log("registering new listener");
+chrome.runtime.onMessage.addListener(
+  function(request, sender, sendResponse) {
+    if (!sender.tab) { 
+      console.log("not a tab!");
+      return; 
+    }
+    console.log("got a fragment from a tab! woohoo");
+    navigateExistingAsana(request, -1, function(b) {});
+    sendResponse("returned successfully");
+  });
+
+console.log("registered new listener");

From 79ad376d390f3aeb9b6917aa33ba34cf7e26e958 Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Sat, 23 Nov 2013 15:09:37 -0800
Subject: [PATCH 59/63] mini fixes to chris's work

---
 manifest.json | 2 +-
 navigator.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 58ea08d..8eebd3a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,7 @@
     {
       "matches": ["<all_urls>"],
       "exclude_matches": ["*://app.asana.com/*"],
-      "js": [ "jquery-1.7.1.min.js", "navigator.js", "click_commandeer.js" ],
+      "js": [ "jquery-1.7.1.min.js", "click_commandeer.js" ],
       "run_at": "document_end"
     }
   ],
diff --git a/navigator.js b/navigator.js
index 48edded..a6bd894 100644
--- a/navigator.js
+++ b/navigator.js
@@ -74,7 +74,7 @@ chrome.runtime.onMessage.addListener(
       return; 
     }
     console.log("got a fragment from a tab! woohoo");
-    navigateExistingAsana(request, -1, function(b) {});
+    navigateExistingAsana(request.fragment, -1, function(b) {});
     sendResponse("returned successfully");
   });
 

From 1880d6b2695bcd6ad00cf496f150aa95e0573d4e Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Sun, 24 Nov 2013 12:12:42 -0800
Subject: [PATCH 60/63] Lots of tidying up, removing logs we don't need anymore

---
 click_commandeer.js | 46 +++++-------------------
 navigator.js        | 87 ++++++++++++++++++---------------------------
 2 files changed, 43 insertions(+), 90 deletions(-)

diff --git a/click_commandeer.js b/click_commandeer.js
index e39e5f1..bd35007 100644
--- a/click_commandeer.js
+++ b/click_commandeer.js
@@ -1,45 +1,17 @@
-console.log("testtesttest")
-
-document.onkeydown = keyDownHandler;
-document.onkeyup = keyUpHandler;
 document.onclick = clickHandler;
 
-var asanaKeyDown = false;
-
-function keyDownHandler(e){
-  if (!e) var e = window.event;
-  if ( (e.metaKey) ){
-    console.log('shift pressed')
-    asanaKeyDown = true;
-  } else {
-    asanaKeyDown = false;
-  }
-}
-
-function keyUpHandler(e){
-  if (!e) var e = window.event;
-  if ( (e.metaKey) ){
-    asanaKeyDown = true;
-  } else {
-    console.log("released")
-    asanaKeyDown = false;
-  }
-}
-
 function clickHandler(e){
-  if (!e) var e = window.event;
-  //var isAsanaLink = ($(e.target).attr("href").indexof("app.asana.com") != -1);
-  if ( ((asanaKeyDown) || e.button == 1) && $(e.target).prop("tagName") == "A"){
-    console.log("is link");
-    var link_url =$(e.target).prop("href") ;
+  if (!e) e = window.event;
+
+  if ((e.metaKey === true ||
+      e.ctrlKey === true || e.button == 1)
+      && $(e.target).prop("tagName") == "A"){
+    var link_url = $(e.target).prop("href") ;
     if (link_url.indexOf("https://app.asana.com") != -1) {
-      console.log("asana link clicked!")
+      console.log("Asana chrome extension intercepting link ctrl-click")
       var fragment = link_url.substr("https://app.asana.com".length)
-      chrome.runtime.sendMessage({fragment: fragment}, function(response) {
-        console.log("response was: " + response);
-      });
+      chrome.runtime.sendMessage({fragment: fragment});
       e.preventDefault();
     }
-    console.log($(event.target));
-  } 
+  }
 }
diff --git a/navigator.js b/navigator.js
index a6bd894..8bbb8d1 100644
--- a/navigator.js
+++ b/navigator.js
@@ -1,12 +1,15 @@
-console.log(chrome.windows)
 console.log("LOADED");
 
-//chrome.windows.create({height: 10, top: 10000, width:1}, function(hiddenWindow) {
-//  console.log(hiddenWindow)
-
+/**
+ * Finds an existing Asana tab (if there is one) and instructs it to navigate
+ * using the provided fragment.
+ * @param fragment
+ * @param tabToAvoid
+ * @param callback
+ */
 function navigateExistingAsana(fragment, tabToAvoid, callback) {
   chrome.tabs.query({
-    url: "https://*.asana.com/*",
+    url: "https://app.asana.com/*",
     currentWindow: true
   }, function(asanaTabs) {
 
@@ -17,14 +20,9 @@ function navigateExistingAsana(fragment, tabToAvoid, callback) {
 
     if (asanaTabs.length > 0) {
       var chosenAsanaTab = asanaTabs[0]
-      chrome.tabs.highlight({tabs:chosenAsanaTab.index}, function() {
-        console.log("highlighted the tab")
-      })
+      chrome.tabs.highlight({tabs:chosenAsanaTab.index}, function() {})
       chrome.tabs.executeScript(chosenAsanaTab.id, {
         code: "window.postMessage('fragment|" + fragment + "', '*')"
-
-        // Monkey patch for an asana tab to make this work:
-        // window.addEventListener("message", function(message) {srun(function() {env.datastore_manager.enactChange(FragmentChange.create({fragment: message.data}))})})
       })
       callback(true)
     }
@@ -33,49 +31,32 @@ function navigateExistingAsana(fragment, tabToAvoid, callback) {
   })
 }
 
+// Add a handler for naviagtions to app.asana.com, but only if they happened in
+// the background (ie the user right clicked and chose open in new window)
 var urlFilter = {hostEquals: "app.asana.com"}
-//chrome.webNavigation.onBeforeNavigate.url(urlFilter)
-  chrome.webNavigation.onBeforeNavigate.addListener(function (event) {
-    console.log(event)
-
-    // Check the url being navigated to follows the exact pattern we expect
-    if (event.url.lastIndexOf("https://app.asana.com") !== 0) return
-    var fragment = event.url.substr("https://app.asana.com".length)
-    console.log("fragment was", fragment)
-
-    chrome.tabs.get(event.tabId, function(tab) {
-      if (!tab.highlighted) {
-        navigateExistingAsana(fragment, event.tabId, function(succeeded) {
-          if (succeeded) {
-            chrome.tabs.remove(tab.id)
-          }
-        })
-      }
-    })
-
-//    chrome.tabs.reload(event.tabId)
-
-//    chrome.tabs.move(event.tabId, {windowId: hiddenWindow.id, index:-1})
-
+chrome.webNavigation.onBeforeNavigate.addListener(function (event) {
+  // Check the url being navigated to follows the exact pattern we expect
+  if (event.url.lastIndexOf("https://app.asana.com") !== 0) return
+
+  // Get the part of the url that asana needs as a fragment
+  var fragment = event.url.substr("https://app.asana.com".length)
+
+  chrome.tabs.get(event.tabId, function(tab) {
+    if (!tab.highlighted) {
+      navigateExistingAsana(fragment, event.tabId, function(succeeded) {
+        if (succeeded) {
+          chrome.tabs.remove(tab.id)
+        }
+      })
+    }
+  })
 
-//  chrome.tabs.create({
-//    active: true
-//  }, function (tab) {
-//    console.log("created tab", tab)
-//  })
-  }, {url: [urlFilter]})
-//})
+}, {url: [urlFilter]})
 
-console.log("registering new listener");
-chrome.runtime.onMessage.addListener(
-  function(request, sender, sendResponse) {
-    if (!sender.tab) { 
-      console.log("not a tab!");
-      return; 
-    }
-    console.log("got a fragment from a tab! woohoo");
-    navigateExistingAsana(request.fragment, -1, function(b) {});
-    sendResponse("returned successfully");
-  });
+chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
+  if (!sender.tab) {
+    return;
+  }
 
-console.log("registered new listener");
+  navigateExistingAsana(request.fragment, -1, function(b) {});
+});
\ No newline at end of file

From 2a90a8ec60067809d85c0e73fc2b4b03c25cac01 Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Mon, 25 Nov 2013 11:18:52 -0800
Subject: [PATCH 61/63] =?UTF-8?q?Intercept=20all=20clicks,=20and=20interce?=
 =?UTF-8?q?pt=20when=20the=20A=20element=20isn=E2=80=99t=20the=20deepest?=
 =?UTF-8?q?=20element?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 click_commandeer.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/click_commandeer.js b/click_commandeer.js
index bd35007..a8ab855 100644
--- a/click_commandeer.js
+++ b/click_commandeer.js
@@ -3,10 +3,9 @@ document.onclick = clickHandler;
 function clickHandler(e){
   if (!e) e = window.event;
 
-  if ((e.metaKey === true ||
-      e.ctrlKey === true || e.button == 1)
-      && $(e.target).prop("tagName") == "A"){
-    var link_url = $(e.target).prop("href") ;
+  var closestAnchor = $(e.target).closest("A");
+  if (closestAnchor.length === 1){
+    var link_url = closestAnchor.prop("href");
     if (link_url.indexOf("https://app.asana.com") != -1) {
       console.log("Asana chrome extension intercepting link ctrl-click")
       var fragment = link_url.substr("https://app.asana.com".length)

From 8188f76c0f50956c40752fbaf7f18b79d493f708 Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Mon, 25 Nov 2013 11:38:42 -0800
Subject: [PATCH 62/63] Bump version

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 8eebd3a..d9cae26 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Asana Extension for Chrome",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Quickly add tasks to Asana from any web page.",
   "icons": {
     "128": "icon128.png",

From afafe9d05e2c6de845a01211bc857b0ae08889f0 Mon Sep 17 00:00:00 2001
From: Alex Davies <alexd@asana.com>
Date: Tue, 10 Dec 2013 15:27:57 -0800
Subject: [PATCH 63/63] =?UTF-8?q?Don=E2=80=99t=20use=20the=20asana=20tab?=
 =?UTF-8?q?=20you=20just=20clicked=20to=20navigate=20when=20you=20ctrl-cli?=
 =?UTF-8?q?ck=20inside=20asana?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 click_commandeer.js |  2 +-
 navigator.js        | 30 +++++++++++++++++-------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/click_commandeer.js b/click_commandeer.js
index a8ab855..8961675 100644
--- a/click_commandeer.js
+++ b/click_commandeer.js
@@ -6,7 +6,7 @@ function clickHandler(e){
   var closestAnchor = $(e.target).closest("A");
   if (closestAnchor.length === 1){
     var link_url = closestAnchor.prop("href");
-    if (link_url.indexOf("https://app.asana.com") != -1) {
+    if (link_url.indexOf("https://app.asana.com") === 0) {
       console.log("Asana chrome extension intercepting link ctrl-click")
       var fragment = link_url.substr("https://app.asana.com".length)
       chrome.runtime.sendMessage({fragment: fragment});
diff --git a/navigator.js b/navigator.js
index 8bbb8d1..eac74ce 100644
--- a/navigator.js
+++ b/navigator.js
@@ -12,22 +12,26 @@ function navigateExistingAsana(fragment, tabToAvoid, callback) {
     url: "https://app.asana.com/*",
     currentWindow: true
   }, function(asanaTabs) {
+    chrome.tabs.getSelected(function (currentTab) {
 
-    // Filter out the tab that just opened, we don't want to reuse that!
-    asanaTabs = asanaTabs.filter(function (eachAsanaTab) {
-      return eachAsanaTab.id !== tabToAvoid
-    })
-
-    if (asanaTabs.length > 0) {
-      var chosenAsanaTab = asanaTabs[0]
-      chrome.tabs.highlight({tabs:chosenAsanaTab.index}, function() {})
-      chrome.tabs.executeScript(chosenAsanaTab.id, {
-        code: "window.postMessage('fragment|" + fragment + "', '*')"
+      asanaTabs = asanaTabs.filter(function (eachAsanaTab) {
+        // Filter out the tab that just opened, we don't want to reuse that!
+        return eachAsanaTab.id !== tabToAvoid &&
+            // Filter out the tab that's currently focused
+            eachAsanaTab.id !== currentTab.id;
       })
-      callback(true)
-    }
 
-    callback(false)
+      if (asanaTabs.length > 0) {
+        var chosenAsanaTab = asanaTabs[0]
+        chrome.tabs.highlight({tabs:chosenAsanaTab.index}, function() {})
+        chrome.tabs.executeScript(chosenAsanaTab.id, {
+          code: "window.postMessage('fragment|" + fragment + "', '*')"
+        })
+        callback(true)
+      }
+
+      callback(false)
+    })
   })
 }