Decode clickable URLs before displaying, implemented /demo/.

biothings · Feb 28, 2016 · 25a4cb8 · 25a4cb8
1 parent 3987842
commit 25a4cb8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/docs/demo/index.html b/docs/demo/index.html
@@ -5,12 +5,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
-    <link href="https://cdn.rawgit.com/SuLab/myvariant.info/vDemo/docs/demo/css/myvariant.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/SuLab/myvariant.info/Demo/docs/demo/css/myvariant.css" rel="stylesheet">
     <link href="https://cdn.rawgit.com/yesmeck/jquery-jsonview/master/dist/jquery.jsonview.min.css" rel="stylesheet">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
     <script src="https://cdn.rawgit.com/yesmeck/jquery-jsonview/master/dist/jquery.jsonview.min.js"></script>
-    <script src="https://cdn.rawgit.com/SuLab/myvariant.info/vDemo/docs/demo/js/myvariant_front.js"></script>
+    <script src="https://cdn.rawgit.com/SuLab/myvariant.info/Demo/docs/demo/js/myvariant_front.js"></script>
 </head>
 <body>
     <div class='top-navbar'>

diff --git a/docs/demo/js/myvariant_front.js b/docs/demo/js/myvariant_front.js
@@ -141,13 +141,15 @@ jQuery(document).ready(function() {
         if(endsWith(fieldsText, ', ')) {fieldsText = fieldsText.substring(0, fieldsText.length - 2);}
         if(endsWith(fieldsText, ',')) {fieldsText = fieldsText.substring(0, fieldsText.length - 1);}
         var searchURL = '';
+        var getURL = '';
         if(searchType == 1) {
             // HGVS ID query
             errorHandler("Query executing . . .", "executing");
             if(queryText.indexOf(",") == -1) {
                 // get to variant endpoint
-                searchURL = endpointBase + '/v1/variant/' + encodeURIComponent(queryText) + '?fields=' + encodeURIComponent(fieldsText);
-                jQuery.get(searchURL).done(function(data, textStatus, jqXHR) {successHandler(data, textStatus, jqXHR, searchURL);}).fail(function(jqXHR, statusText, errorThrown) {errorHandler("Couldn't retrieve annotation " + jQuery('#main-input').val() + ".  ", "error");});
+                getURL = endpointBase + '/v1/variant/' + encodeURIComponent(queryText) + '?fields=' + encodeURIComponent(fieldsText);
+                searchURL = decodeURIComponent(getURL);
+                jQuery.get(getURL).done(function(data, textStatus, jqXHR) {successHandler(data, textStatus, jqXHR, searchURL);}).fail(function(jqXHR, statusText, errorThrown) {errorHandler("Couldn't retrieve annotation " + jQuery('#main-input').val() + ".  ", "error");});
             }
             else {
                 // post to variant endpoint
@@ -158,20 +160,23 @@ jQuery(document).ready(function() {
             // Full text query
             errorHandler("Query executing . . .", "executing");
             var querySize = jQuery('#size-input').val();
-            searchURL = endpointBase + '/v1/query?q=' + encodeURIComponent(queryText) + '&fields=' + encodeURIComponent(fieldsText) + '&size=' + querySize;
-            jQuery.get(searchURL).done(function(data, textStatus, jqXHR) {successHandler(data, textStatus, jqXHR, searchURL);}).fail(function(jqXHR, statusText, errorThrown) {errorHandler("Couldn't retrieve results for query " + jQuery('#main-input').val() + ".", "error");});
+            getURL = endpointBase + '/v1/query?q=' + encodeURIComponent(queryText) + '&fields=' + encodeURIComponent(fieldsText) + '&size=' + querySize;
+            searchURL = decodeURIComponent(getURL);
+            jQuery.get(getURL).done(function(data, textStatus, jqXHR) {successHandler(data, textStatus, jqXHR, searchURL);}).fail(function(jqXHR, statusText, errorThrown) {errorHandler("Couldn't retrieve results for query " + jQuery('#main-input').val() + ".", "error");});
         }
         else if(searchType == 3) {
             // metadata query
             errorHandler("Query executing . . .", "executing");
-            searchURL = endpointBase + '/metadata';
-            jQuery.get(searchURL).done(function(data, textStatus, jqXHR) {successHandler(data, textStatus, jqXHR, searchURL);}).fail(function(jqXHR, statusText, errorThrown) {errorHandler("Couldn't retrieve MyVariant database metadata.  API error.", "error");});
+            getURL = endpointBase + '/metadata';
+            searchURL = decodeURIComponent(getURL);
+            jQuery.get(getURL).done(function(data, textStatus, jqXHR) {successHandler(data, textStatus, jqXHR, searchURL);}).fail(function(jqXHR, statusText, errorThrown) {errorHandler("Couldn't retrieve MyVariant database metadata.  API error.", "error");});
         }
         else if(searchType == 4) {
             // available fields query
             errorHandler("Query executing . . .", "executing");
-            searchURL = endpointBase + '/metadata/fields';
-            jQuery.get(searchURL).done(function(data, textStatus, jqXHR) {successHandler(data, textStatus, jqXHR, searchURL);}).fail(function(jqXHR, statusText, errorThrown) {errorHandler("Couldn't retrieve available fields.  API error.", "error");});
+            getURL = endpointBase + '/metadata/fields';
+            searchURL = decodeURIComponent(getURL);
+            jQuery.get(getURL).done(function(data, textStatus, jqXHR) {successHandler(data, textStatus, jqXHR, searchURL);}).fail(function(jqXHR, statusText, errorThrown) {errorHandler("Couldn't retrieve available fields.  API error.", "error");});
         }
     });
     // Select menu is a widget

diff --git a/src/www/index.py b/src/www/index.py
@@ -76,7 +76,7 @@ def get(self):
     (r"/status", StatusCheckHandler),
     (r"/metadata", MetaDataHandler),
     (r"/metadata/fields", FieldsHandler),
-    (r"/demo", DemoHandler),
+    (r"/demo/?$", DemoHandler),
 ]
 
 APP_LIST += add_apps('api', api_app_list)