Merge branch 'master' of github.com:pebble/cloudpebble

pebble · Jul 15, 2015 · 6414294 · 6414294
2 parents 3618627 + 52b0d60
commit 6414294
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/ide/static/ide/js/editor.js b/ide/static/ide/js/editor.js
@@ -341,6 +341,8 @@ CloudPebble.Editor = (function() {
                         }
                     });
                     code_mirror.force_fold_lines(data.folded_lines);
+                    // This is needed to force focus on the editor
+                    setTimeout(function() { code_mirror.focus();}, 1);
                 }
 
                 function update_patch_list(instance, changes) {

diff --git a/ide/utils/mailinglist.py b/ide/utils/mailinglist.py
@@ -3,18 +3,20 @@
 
 from django.conf import settings
 
-
-mailchimp_api = mailchimp.Mailchimp(apikey=settings.MAILCHIMP_API_KEY)
 mailchimp_default_list_id = settings.MAILCHIMP_LIST_ID
 
 
 def add_user(user, mailing_list_id=None):
-    if mailchimp_api is None:
-        logging.error("Missing MAILCHIMP_API_KEY environment variable")
+    try:
+        mailchimp_api = mailchimp.Mailchimp(apikey=settings.MAILCHIMP_API_KEY)
+    except mailchimp.Error:
+        logging.error("Missing or invalid MAILCHIMP_API_KEY")
+        return
 
     list_id = mailing_list_id or mailchimp_default_list_id
     if list_id is None:
-        logging.error("Missing MAILCHIMP_LIST_ID environment variable")
+        logging.error("Missing MAILCHIMP_LIST_ID")
+        return
 
     try:
         response = mailchimp_api.lists.subscribe(list_id,