[smarcet]

smarcet · smarcet · commit 448c7971be2b · 2018-09-25T16:32:21.000-03:00
* used meta title and description as a first choice on search results
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Search Bar embedded widget using [RequireJS](http://requirejs.org) and [Ractive.
 
 ## Building the widget
 
-Assuming RequireJS and bower are already installed:
+Assuming RequireJS is already installed:
 
 ```console
 $ make init
diff --git a/app/app.js b/app/app.js
@@ -3,7 +3,7 @@ define(['jquery', 'ractive', 'rv!templates/template', 'text!css/widget-styles.cs
     'use strict';
 
     $.noConflict();
-
+    var MAX_DETAIL_LEN = 100;
     var xhr_suggestions = null;
     var timeout_suggestions = null;
     var search_widget = {
@@ -19,7 +19,7 @@ define(['jquery', 'ractive', 'rv!templates/template', 'text!css/widget-styles.cs
             $('.openstack-search-bar').each(function() {
 
                 var el = $(this);
-                var baseUrl = el.data('baseurl') ? el.data('baseurl') : 'devbranch.search.openstack.org';
+                var baseUrl = el.data('baseurl') ? el.data('baseurl') : 'search.openstack.org';
                 var context = el.data('context') ? el.data('context') : 'www-openstack';
                 // render our main view
                 this.ractive = new Ractive({
@@ -111,10 +111,10 @@ define(['jquery', 'ractive', 'rv!templates/template', 'text!css/widget-styles.cs
             dataType: "json"
         }).done(function(resp) {
             var results = resp.results.map(function(r) {
-                var term_idx = r.content.toLowerCase().indexOf(term.toLowerCase());
-                var detail = '...' + r.content.slice(term_idx - 40, term_idx + 40) + '...';
-
-                return {link: r.url, title: r.title, detail: detail};
+                var detail = r.hasOwnProperty('meta_description') ? r.meta_description : r.content;
+                detail = detail.length > MAX_DETAIL_LEN  ? detail.substring(0, MAX_DETAIL_LEN) + '...' : detail;
+                var title = r.hasOwnProperty('meta_title') ? r.meta_title : r.title;
+                return {link: r.url, title: title, detail: detail};
             });
 
             that.set('total', resp.qty);
diff --git a/embed.min.js b/embed.min.js
diff --git a/example/index.html b/example/index.html
@@ -9,7 +9,7 @@
 </head>
 <body>
 <h1>Embedded widget test</h1>
-<div class="openstack-search-bar" data-baseUrl="search.openstack.org" data-context="www-openstack"></div>
+<div class="openstack-search-bar" data-baseUrl="localhost:8081" data-context="www-openstack"></div>
 <script>
 (function (window, document) {
 	var loader = function () {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,8 +9,8 @@
   "dependencies": {
     "almond": "^0.3.3",
     "jquery": "^3.3.1",
-    "ractive": "^0.10.3",
-    "requirejs": "^2.3.5",
+    "ractive": "^0.10.9",
+    "requirejs": "^2.3.6",
     "requirejs-text": "^2.0.15",
     "rv": "^0.1.8",
     "rvc": "^0.5.0"
