Merge pull request #778 from captainsafia/safia/jan/refactor-badge

Move badge and path functions out of megafile
jupyterhub · Jan 29, 2019 · c622979 · c622979
2 parents b0c64f7 + 276d090
commit c622979
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 32 deletions.
diff --git a/binderhub/static/js/index.js b/binderhub/static/js/index.js
@@ -17,6 +17,8 @@ import 'bootstrap';
 import 'event-source-polyfill';
 
 import BinderImage from './src/image';
+import { markdownBadge, rstBadge } from './src/badge';
+import { getPathType, updatePathText } from './src/path';
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 import 'bootstrap/dist/css/bootstrap-theme.min.css';
@@ -50,24 +52,6 @@ function v2url(providerPrefix, repository, ref, path, pathType) {
   return url;
 }
 
-function getPathType() {
-  // return path type. 'file' or 'url'
-  return $("#url-or-file-selected").text().trim().toLowerCase();
-}
-
-function updatePathText() {
-  var pathType = getPathType();
-  var text;
-  if (pathType === "file") {
-    text = "Path to a notebook file (optional)";
-  } else {
-    text = "URL to open (optional)";
-  }
-  $("#filepath").attr('placeholder', text);
-  $("label[for=filepath]").text(text);
-}
-
-
 function updateRepoText() {
   var text;
   var provider = $("#provider_prefix").val();
@@ -137,20 +121,6 @@ function updateUrls(formValues) {
   }
 }
 
-
-var BADGE_URL = window.location.origin + BASE_URL + 'badge_logo.svg';
-
-
-function markdownBadge(url) {
-  // return markdown badge snippet
-  return '[![Binder](' + BADGE_URL + ')](' + url + ')'
-}
-
-function rstBadge(url) {
-  // return rst badge snippet
-  return '.. image:: ' + BADGE_URL + ' :target: ' + url
-}
-
 function build(providerSpec, log, path, pathType) {
   update_favicon(BASE_URL + "favicon_building.ico");
   // split provider prefix off of providerSpec

diff --git a/binderhub/static/js/src/badge.js b/binderhub/static/js/src/badge.js
@@ -0,0 +1,12 @@
+var BASE_URL = $("#base-url").data().url;
+var BADGE_URL = window.location.origin + BASE_URL + "badge_logo.svg";
+
+export function markdownBadge(url) {
+  // return markdown badge snippet
+  return "[![Binder](" + BADGE_URL + ")](" + url + ")";
+}
+
+export function rstBadge(url) {
+  // return rst badge snippet
+  return ".. image:: " + BADGE_URL + "\n :target: " + url;
+}
diff --git a/binderhub/static/js/src/path.js b/binderhub/static/js/src/path.js
@@ -0,0 +1,20 @@
+export function getPathType() {
+  // return path type. 'file' or 'url'
+  const element = document.getElementById("url-or-file-selected");
+  return element.innerText.trim().toLowerCase();
+}
+
+export function updatePathText() {
+  var pathType = getPathType();
+  var text;
+  if (pathType === "file") {
+    text = "Path to a notebook file (optional)";
+  } else {
+    text = "URL to open (optional)";
+  }
+  const filePathElement = document.getElementById("filepath");
+  filePathElement.setAttribute("placeholder", text);
+
+  const filePathElementLabel = document.querySelector("label[for=filepath]");
+  filePathElementLabel.innerText = text;
+}