From fd4a6f8401bcc30e4156de7d854d27d96d05747c Mon Sep 17 00:00:00 2001
From: Fred Sauer <fredsa@google.com>
Date: Fri, 17 Apr 2026 16:39:46 -0700
Subject: [PATCH 1/2] Fix GitHub failed import message

---
 index.html                  |  2 +-
 presets/markdown/hello.md   |  2 +-
 src/ide/services.ts         | 64 ++++++++++++++++++-------------------
 src/ide/sync.ts             | 10 +++---
 test/services/testgithub.js | 24 +++++++-------
 test/web/testimport.js      |  2 +-
 6 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/index.html b/index.html
index fd751263d..60db3939b 100644
--- a/index.html
+++ b/index.html
@@ -60,7 +60,7 @@
       <li class="dropdown dropdown-submenu">
         <a tabindex="-1" href="javascript:void(0)">Sync</a>
         <ul class="dropdown-menu">
-          <li><a class="dropdown-item" href="javascript:void(0)" id="item_github_login">Sign in to Github...</a></li>
+          <li><a class="dropdown-item" href="javascript:void(0)" id="item_github_login">Sign in to GitHub...</a></li>
           <li><a class="dropdown-item" href="javascript:void(0)" id="item_github_logout">Log out</a></li>
           <hr>
           <li><a class="dropdown-item" href="javascript:void(0)" id="item_github_import">Import Project from GitHub...</a></li>
diff --git a/presets/markdown/hello.md b/presets/markdown/hello.md
index 6a39a8c6a..8a1589bd6 100644
--- a/presets/markdown/hello.md
+++ b/presets/markdown/hello.md
@@ -79,7 +79,7 @@ of text
 If you DO want to add soft line breaks (which translate to `<br>` in HTML) to a paragraph, 
 you can do so by adding 3 space characters to the end of the line (`  `).
 
-You can also force every line break in paragraphs to translate to `<br>` (as Github does) by
+You can also force every line break in paragraphs to translate to `<br>` (as GitHub does) by
 enabling the option **`simpleLineBreaks`**.
 
 ## Headings
diff --git a/src/ide/services.ts b/src/ide/services.ts
index 236bada85..e4d483305 100644
--- a/src/ide/services.ts
+++ b/src/ide/services.ts
@@ -200,39 +200,39 @@ export class GithubService {
       // load README
       return sess.repo.contents('README.md').read();
     })
-    .catch( (e) => {
-      console.log(e);
-      console.log('no README.md found')
-      // make user repo exists
-      return sess.repo.fetch().then( (_repo) => {
-        return ''; // empty README
+      .catch((e) => {
+        console.log(e);
+        console.log('no README.md found')
+        // make user repo exists
+        return sess.repo.fetch().then((_repo) => {
+          return ''; // empty README
+        })
       })
-    })
-    .then( (readme) => {
-      var m;
-      // check README for main file
-      const re8main = /8bitworkshop.com[^)]+file=([^)&]+)/;
-      m = re8main.exec(readme);
-      if (m && m[1]) {
-        console.log("main path: '" + m[1] + "'");
-        sess.mainPath = m[1];
-      }
-      // check README for proper platform
-      // unless we use githubURL=
-      // TODO: cannot handle multiple URLs in README
-      const re8plat = /8bitworkshop.com[^)]+platform=([A-Za-z0-9._\-]+)/;
-      m = re8plat.exec(readme);
-      if (m) {
-        console.log("platform id: '" + m[1] + "'");
-        if (sess.platform_id && !sess.platform_id.startsWith(m[1]))
-          throw Error("Platform mismatch: Repository is " + m[1] + ", you have " + sess.platform_id + " selected.");
-        sess.platform_id = m[1];
-      }
-      // bind to repository
-      this.bind(sess, true);
-      // get head commit
-      return sess;
-    });
+      .then((readme) => {
+        var m;
+        // check README for main file
+        const re8main = /8bitworkshop.com[^)]+file=([^)&]+)/;
+        m = re8main.exec(readme);
+        if (m && m[1]) {
+          console.log("main path: '" + m[1] + "'");
+          sess.mainPath = m[1];
+        }
+        // check README for proper platform
+        // unless we use githubURL=
+        // TODO: cannot handle multiple URLs in README
+        const re8plat = /8bitworkshop.com[^)]+platform=([A-Za-z0-9._\-]+)/;
+        m = re8plat.exec(readme);
+        if (m) {
+          console.log("platform id: '" + m[1] + "'");
+          if (sess.platform_id && !sess.platform_id.startsWith(m[1]))
+            throw Error("Platform mismatch: Repository is '" + m[1] + "', you have '" + sess.platform_id + "' selected.");
+          sess.platform_id = m[1];
+        }
+        // bind to repository
+        this.bind(sess, true);
+        // get head commit
+        return sess;
+      });
   }
   
   pull(ghurl:string, deststore?) : Promise<GHSession> {
diff --git a/src/ide/sync.ts b/src/ide/sync.ts
index 136467c61..0aed69af0 100644
--- a/src/ide/sync.ts
+++ b/src/ide/sync.ts
@@ -43,7 +43,7 @@ export async function importProjectFromGithub(githuburl: string, replaceURL: boo
     var sess: GHSession;
     var urlparse = parseGithubURL(githuburl);
     if (!urlparse) {
-        alertError('Could not parse Github URL.');
+        alertError('Could not parse GitHub URL.');
         return;
     }
     // redirect to repo if exists
@@ -70,14 +70,14 @@ export async function importProjectFromGithub(githuburl: string, replaceURL: boo
     }).catch((e) => {
         setWaitDialog(false);
         console.log(e);
-        alertError("Could not import " + githuburl + "." + e);
+        alertError("Could not import " + githuburl + ". " + e);
     });
 }
 
 export async function _loginToGithub(e) {
     var gh = await getGithubService();
     gh.login().then(() => {
-        alertInfo("You are signed in to Github.");
+        alertInfo("You are signed in to GitHub.");
     }).catch((e) => {
         alertError("Could not sign in." + e);
     });
@@ -86,7 +86,7 @@ export async function _loginToGithub(e) {
 export async function _logoutOfGithub(e) {
     var gh = await getGithubService();
     gh.logout().then(() => {
-        alertInfo("You are logged out of Github.");
+        alertInfo("You are logged out of GitHub.");
     });
 }
 
@@ -103,7 +103,7 @@ export function _importProjectFromGithub(e) {
 
 export function _publishProjectToGithub(e) {
     if (repo_id) {
-        if (!confirm("This project (" + getCurrentProject().mainPath + ") is already bound to a Github repository. Do you want to re-publish to a new repository? (You can instead choose 'Push Changes' to update files in the existing repository.)"))
+        if (!confirm("This project (" + getCurrentProject().mainPath + ") is already bound to a GitHub repository. Do you want to re-publish to a new repository? (You can instead choose 'Push Changes' to update files in the existing repository.)"))
             return;
     }
     var modal = $("#publishGithubModal");
diff --git a/test/services/testgithub.js b/test/services/testgithub.js
index aec44db3f..c59d907d5 100644
--- a/test/services/testgithub.js
+++ b/test/services/testgithub.js
@@ -34,7 +34,7 @@ const t0 = new Date().getTime();
 
 describe('Github', function() {
 
-  it('Should import from Github (check README)', function(done) {
+  it('Should import from GitHub (check README)', function(done) {
     var store = createNewPersistentStore('vcs', function(store) {
       var gh = newGH(store, 'vcs');
       gh.importAndPull('https://github.com/pzpinfo/test123123/').then( (sess) => {
@@ -52,7 +52,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should import from Github (default branch)', function(done) {
+  it('Should import from GitHub (default branch)', function(done) {
     var store = createNewPersistentStore('nes', function(store) {
       var gh = newGH(store, 'nes');
       gh.importAndPull('https://github.com/sehugg/mdf2020-nes').then( (sess) => {
@@ -62,7 +62,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should import from Github (explicit branch)', function(done) {
+  it('Should import from GitHub (explicit branch)', function(done) {
     var store = createNewPersistentStore('nes', function(store) {
       var gh = newGH(store, 'nes');
       gh.importAndPull('https://github.com/sehugg/mdf2020-nes/tree/main').then( (sess) => {
@@ -72,7 +72,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should import from Github (binary files)', function(done) {
+  it('Should import from GitHub (binary files)', function(done) {
     var store = createNewPersistentStore('vcs', function(store) {
       var gh = newGH(store, 'vcs');
       gh.importAndPull('https://github.com/pzpinfo/testrepo3').then( (sess) => {
@@ -88,7 +88,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should import from Github (wrong platform)', function(done) {
+  it('Should import from GitHub (wrong platform)', function(done) {
     var store = createNewPersistentStore('_FOO', function(store) {
       var gh = newGH(store, '_FOO');
       gh.importAndPull('https://github.com/pzpinfo/testrepo1557326056720').catch( (e) => {
@@ -98,7 +98,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should import from Github (invalid URL)', function(done) {
+  it('Should import from GitHub (invalid URL)', function(done) {
     var store = createNewPersistentStore('_FOO', function(store) {
       var gh = newGH(store, '_FOO');
       gh.importAndPull('https://github.com/pzpinfo/NOEXISTSREPO').catch( (e) => {
@@ -109,7 +109,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should import from Github (subdirectory tree)', function(done) {
+  it('Should import from GitHub (subdirectory tree)', function(done) {
     var store = createNewPersistentStore('nes', function(store) {
       var gh = newGH(store, 'nes');
       gh.importAndPull('https://github.com/brovador/NESnake/tree/master/src').then( (sess) => {
@@ -120,7 +120,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should publish (fail) on Github', function(done) {
+  it('Should publish (fail) on GitHub', function(done) {
     var store = createNewPersistentStore(test_platform_id, function(store) {
       var gh = newGH(store);
       // should fail
@@ -130,7 +130,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should publish new repository on Github', function(done) {
+  it('Should publish new repository on GitHub', function(done) {
     var store = createNewPersistentStore(test_platform_id, function(store) {
       var gh = newGH(store);
       var reponame = 'testrepo'+t0;
@@ -144,7 +144,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should commit/push to Github', function(done) {
+  it('Should commit/push to GitHub', function(done) {
     var store = createNewPersistentStore(test_platform_id, function(store) {
       var gh = newGH(store);
       var binfile = new Uint8Array(256);
@@ -164,7 +164,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should commit/push to Github (subdirectory tree)', function(done) {
+  it('Should commit/push to GitHub (subdirectory tree)', function(done) {
     var store = createNewPersistentStore(test_platform_id, function(store) {
       var gh = newGH(store);
       var files = [
@@ -182,7 +182,7 @@ describe('Github', function() {
     });
   });
 
-  it('Should bind paths to Github', function(done) {
+  it('Should bind paths to GitHub', function(done) {
     var store = createNewPersistentStore(test_platform_id, function(store) {
       var gh = newGH(store);
       var sess = {repopath:'foo/bar', url:'_', platform_id:'vcs',mainPath:'test.c'};
diff --git a/test/web/testimport.js b/test/web/testimport.js
index 0da056028..dd91a7bde 100644
--- a/test/web/testimport.js
+++ b/test/web/testimport.js
@@ -22,7 +22,7 @@ try {
     console.log('warning: need ./github.json with {token:"..."}')
 }
 
-exports['test import Github'] = async function (browser) {
+exports['test import GitHub'] = async function (browser) {
 
     await browser.url(`${IDEURL}?${QS_GITHUBURL}`)
         .waitForElementNotPresent('#step-0')

From 137de06e54bf01ee04bb95f0c853639749e37209 Mon Sep 17 00:00:00 2001
From: Fred Sauer <fredsa@google.com>
Date: Fri, 17 Apr 2026 16:46:19 -0700
Subject: [PATCH 2/2] Autofocus GitHub import URL, submit with Enter

---
 src/ide/sync.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ide/sync.ts b/src/ide/sync.ts
index 0aed69af0..399054406 100644
--- a/src/ide/sync.ts
+++ b/src/ide/sync.ts
@@ -94,6 +94,10 @@ export function _importProjectFromGithub(e) {
     var modal = $("#importGithubModal");
     var btn = $("#importGithubButton");
     modal.modal('show');
+    modal.off('shown.bs.modal').on('shown.bs.modal', () => $("#importGithubURL").trigger('focus'));
+    $("#importGithubURL").off('keydown').on('keydown', (e) => {
+        if (e.key === 'Enter') { e.preventDefault(); btn.trigger('click'); }
+    });
     btn.off('click').on('click', () => {
         var githuburl = $("#importGithubURL").val() + "";
         modal.modal('hide');