fixed conflicts

Author: sean-morris

_static/link_gen/link.js

@@ -5,11 +5,9 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, conten
     var url = new URL(hubUrl);
 
     url.searchParams.set('repo', repoUrl);
-    
     if(compressed) {
       url.searchParams.set('content_provider', contentProvider);
     }
-    
     if (urlPath) {
         url.searchParams.set('urlpath', urlPath);
     }
@@ -19,7 +17,7 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, conten
     } else if(contentProvider == "git"){
         url.searchParams.set('branch', "main");
     }
-    
+
     if (!url.pathname.endsWith('/')) {
         url.pathname += '/'
     }
@@ -35,11 +33,9 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, content
     var nextUrlParams = new URLSearchParams();
 
     nextUrlParams.append('repo', repoUrl);
-    
     if(compressed) {
       nextUrlParams.append('content_provider', contentProvider);
     }
-    
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
     }
@@ -73,7 +69,6 @@ function generateBinderUrl(hubUrl, userName, envRepoName, envGitBranch, urlPath,
     if(compressed) {
       nextUrlParams.append('content_provider', contentProvider);
     }
-    
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
     }
@@ -127,25 +122,21 @@ function clearLinks(){
     document.getElementById('canvas-link').value = "";
 }
 
-
 function changeTab(div) {
     var hub = document.getElementById("hub");
     var hub_help_text = document.getElementById("hub-help-text");
     var env_repo_group = document.getElementById("env-repo-group");
     var env_repo = document.getElementById("env-repo");
     var id = div.id;
     var form = document.getElementById('linkgenerator');
-    
     clearLinks();
     if (id.includes("binder")) {
         hub.placeholder = "https://mybinder.org";
         hub.value = "https://mybinder.org";
         hub_help_text.hidden = true;
         hub.labels[0].innerHTML = "BinderHub URL";
-        
         env_repo_group.style.display = '';
         env_repo.disabled = false;
-
     } else {
         hub.placeholder = "https://hub.example.com";
         hub.value = "";
@@ -173,7 +164,7 @@ function changeTab(div) {
  */
 function generateCloneDirectoryName(gitCloneUrl) {
     if(gitCloneUrl.slice(-1) == "/")
-      gitCloneUrl = gitCloneUrl.slice(0,-1);
+        gitCloneUrl = gitCloneUrl.slice(0,-1);
     var lastPart = gitCloneUrl.split('/').slice(-1)[0];
     return lastPart.split(':').slice(-1)[0].replace(/(\.git|\.bundle)?/, '');
 }
@@ -216,7 +207,6 @@ function configureContentProviderAttrs(args){
 
 function displayLink() {
     var form = document.getElementById('linkgenerator');
-    
     form.classList.add('was-validated');
     if (form.checkValidity()) {
         var hubUrl = document.getElementById('hub').value;
@@ -298,13 +288,13 @@ function populateFromQueryString() {
 }
 
 function hideShowByClassName(cls, hideShow){
-  [].forEach.call(document.querySelectorAll(cls), function (el) {
-    el.style.display = hideShow;
-    setDisabled = (hideShow == 'none')
-    $(el).find("input").each(function(){
-        $(this).prop("disabled", setDisabled);
+    [].forEach.call(document.querySelectorAll(cls), function (el) {
+        el.style.display = hideShow;
+        setDisabled = (hideShow == 'none')
+        $(el).find("input").each(function(){
+            $(this).prop("disabled", setDisabled);
+        });
     });
-  });
 }
 /**
  * Depending on the content provider selected this hides and shows the appropriate divs
@@ -338,7 +328,6 @@ function render() {
     var form = document.getElementById('linkgenerator');
     var appName = form.querySelector('input[name="app"]:checked').value;
 
-    
     if (appName == 'custom') {
         document.getElementById('urlpath').disabled = false;
         document.getElementById('filepath').disabled = true;
@@ -352,7 +341,6 @@ function render() {
             document.getElementById('filepath').disabled = false;
         }
     }
-
     displayLink();
 }
 
@@ -371,11 +359,9 @@ function main() {
             element.addEventListener('change', function(){
                 displayContentProvider();
                 render();
-              }
-            );
+            });
         }
     )
-    
     document.querySelectorAll('#linkgenerator input[type="text"], #linkgenerator input[type="url"]').forEach(
         function (element) {
             element.addEventListener('input', render);
@@ -394,7 +380,6 @@ function main() {
       }
     }
 
-    
     // Do an initial render, to make sure our disabled / enabled properties are correctly set
     displayContentProvider();
     render();

link.html

@@ -221,7 +221,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </small>
           </div>
         </div>
-        
+
         <div class="form-group row content-provider-env" id="env-repo-group" style="display:none">
           <label for="env-repo" class="col-sm-2 col-form-label">Git Environment Repository URL</label>
           <div class="col-sm-6">
@@ -230,7 +230,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             <div class="invalid-feedback">
               Must be a valid git URL
             </div>
-            <small class="form-text text-muted" id="env-repo-help-text" >
+            <small class="form-text text-muted" id="env-repo-help-text">
               The environment repository must have
               <a href="https://github.com/jupyterhub/nbgitpuller">nbgitpuller</a> installed.
             </small>
@@ -252,7 +252,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-        
+
         <div class="form-group row" id="app-content-provider">
           <div class="col-sm-2 col-form-label">
             <label for="app-content-provider" class=>Notebook Content Provider</label>
@@ -286,7 +286,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-        
+
 
 
         <div class="form-group row content-provider content-provider-git" id="content-repo-group">
@@ -299,15 +299,14 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
           <div class="col-sm-4">
-            <div class="input-group" id="content-branch-group" >
+            <div class="input-group" id="content-branch-group">
               <div class="input-group-prepend">
                 <span class="input-group-text" id="content-branch-prepend-label">branch</span>
               </div>
               <input name="content-branch" id="content-branch" type="text" placeholder="main" aria-label="Branch Name" aria-describedby="content-branch-prepend-label">
               <small id="default-content-message" class="form-text text-muted">
-                 If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
-                 <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">
-                 new GitHub repositories</a>
+                If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
+                <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">new GitHub repositories</a>
               </small>
             </div>
           </div>
@@ -323,7 +322,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-        
+
         <div class="form-group row content-provider content-provider-dropbox">
           <label for="drop-url" class="col-sm-2 col-form-label">Dropbox Shared Link</label>
           <div class="col-sm-10">
@@ -334,7 +333,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-        
+
         <div class="form-group row content-provider content-provider-generic-web">
           <label for="generic-web-url" class="col-sm-2 col-form-label">Public URL to archive</label>
           <div class="col-sm-10">
@@ -345,7 +344,6 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </div>
           </div>
         </div>
-        
         <div class="form-group row" id="filepath-container">
           <label for="filepath" class="col-sm-2 col-form-label">File to open</label>
           <div class="col-sm-10">
@@ -356,7 +354,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
             </small>
           </div>
         </div>
-        
+
         <div class="form-group row" id="app-container">
           <div class="col-sm-2 col-form-label">
             <label for="app-container" class=>Application to Open</label>