Parcourir la source

Merge branch 'release/v0.0.6'

Jérôme BUISINE il y a 4 ans
Parent
commit
f2d86a5c6c
2 fichiers modifiés avec 23 ajouts et 10 suppressions
  1. 1 1
      links/templates/links/links.html
  2. 22 9
      static/js/links.js

+ 1 - 1
links/templates/links/links.html

@@ -32,7 +32,7 @@
     <ul class="list-group">
         <li class="list-group-item">                
             <div class="row">
-                <div class="col-md-11"><a id="calibration-link" href="">Calibration link</a></div>
+                <div class="col-md-11"><a id="calibration-link" href="#">Calibration link</a></div>
                 <div class="col-md-1"></div>
             </div>
         </li>

+ 22 - 9
static/js/links.js

@@ -1,5 +1,6 @@
 const links_data = JSON.parse(links.replace(/&quot;/g, '"'))
 const links_nb_elem = Object.keys(links_data).length
+const KEYCODE_ENTER       = 13
 
 const alertDiv = document.getElementsByClassName('alert-danger')[0]
 
@@ -8,6 +9,11 @@ function loadDataList(elem, list){
 
     if (userId){
 
+        // load and generate CalibrationMeasurement experiment link
+        firstLink = links_data[userId][0].split(':::')[1]
+        generateCalibrationLink(firstLink)
+
+
         // check if nomber of links can let access to userId
         if (userId > (links_nb_elem - 1) || userId < 0){
             alertDiv.setAttribute('style', 'display:block')
@@ -98,26 +104,22 @@ function generateCalibrationLink(link){
     b64LinkData = btoa(JSON.stringify(jsonLinkData)).replace(/[=]/g, '')
     calibrationLink = jsonLinkData['hostConfig'] + '/#/?q=' + b64LinkData
 
-    console.log(JSON.stringify(jsonLinkData))
     // add to calibration DOM element the new generated link
     domCalibrationLink = document.getElementById('calibration-link')
     domCalibrationLink.setAttribute('href', calibrationLink)
-
-    // Add click event 
-    domCalibrationLink.closest('li').addEventListener('click', elemClick)
 }
 
 window.addEventListener('DOMContentLoaded', () => {
-    // Display list of files from day folder
-    // need to parse as `Array`
 
     const inputElement = document.getElementsByName('userId')[0]
     const linksList = document.getElementById('links-list')
 
-    // load and generate CalibrationMeasurement experiment link
-    firstLink = links_data[0][0].split(':::')[1]
-    generateCalibrationLink(firstLink)
+    // add to calibration event listener
+    domCalibrationLink = document.getElementById('calibration-link')
+    liDomElement = domCalibrationLink.closest('li')
+    liDomElement.addEventListener('click', elemClick)
 
+    // first load data if userId is choosed
     loadDataList(inputElement, linksList)
     
     inputElement.addEventListener('keyup', event => {
@@ -131,3 +133,14 @@ window.addEventListener('DOMContentLoaded', () => {
         }
     })
 })
+
+// check enter key issue
+const checkKey = e => {
+    
+    if (e.keyCode === KEYCODE_ENTER) {
+       e.preventDefault()
+    }
+ }
+ 
+ // implement `key` events
+ document.addEventListener('keydown', checkKey)