-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #71 from jameslamb/release/v0.3.0
release v0.3.0
- Loading branch information
Showing
26 changed files
with
442 additions
and
251 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| Package: uptasticsearch | ||
| Type: Package | ||
| Title: Get Data Frame Representations of 'Elasticsearch' Results | ||
| Version: 0.2.0.9999 | ||
| Version: 0.3.0 | ||
| Authors@R: c( | ||
| person("James", "Lamb", email = "[email protected]", role = c("aut", "cre")), | ||
| person("Nick", "Paras", email = "[email protected]", role = c("aut")), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| $(function() { | ||
|
|
||
| // register a handler to move the focus to the search bar | ||
| // upon pressing shift + "/" (i.e. "?") | ||
| $(document).on('keydown', function(e) { | ||
| if (e.shiftKey && e.keyCode == 191) { | ||
| e.preventDefault(); | ||
| $("#search-input").focus(); | ||
| } | ||
| }); | ||
|
|
||
| $(document).ready(function() { | ||
| // do keyword highlighting | ||
| /* modified from https://jsfiddle.net/julmot/bL6bb5oo/ */ | ||
| var mark = function() { | ||
|
|
||
| var referrer = document.URL ; | ||
| var paramKey = "q" ; | ||
|
|
||
| if (referrer.indexOf("?") !== -1) { | ||
| var qs = referrer.substr(referrer.indexOf('?') + 1); | ||
| var qs_noanchor = qs.split('#')[0]; | ||
| var qsa = qs_noanchor.split('&'); | ||
| var keyword = ""; | ||
|
|
||
| for (var i = 0; i < qsa.length; i++) { | ||
| var currentParam = qsa[i].split('='); | ||
|
|
||
| if (currentParam.length !== 2) { | ||
| continue; | ||
| } | ||
|
|
||
| if (currentParam[0] == paramKey) { | ||
| keyword = decodeURIComponent(currentParam[1].replace(/\+/g, "%20")); | ||
| } | ||
| } | ||
|
|
||
| if (keyword !== "") { | ||
| $(".contents").unmark({ | ||
| done: function() { | ||
| $(".contents").mark(keyword); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| mark(); | ||
| }); | ||
| }); | ||
|
|
||
| /* Search term highlighting ------------------------------*/ | ||
|
|
||
| function matchedWords(hit) { | ||
| var words = []; | ||
|
|
||
| var hierarchy = hit._highlightResult.hierarchy; | ||
| // loop to fetch from lvl0, lvl1, etc. | ||
| for (var idx in hierarchy) { | ||
| words = words.concat(hierarchy[idx].matchedWords); | ||
| } | ||
|
|
||
| var content = hit._highlightResult.content; | ||
| if (content) { | ||
| words = words.concat(content.matchedWords); | ||
| } | ||
|
|
||
| // return unique words | ||
| var words_uniq = [...new Set(words)]; | ||
| return words_uniq; | ||
| } | ||
|
|
||
| function updateHitURL(hit) { | ||
|
|
||
| var words = matchedWords(hit); | ||
| var url = ""; | ||
|
|
||
| if (hit.anchor) { | ||
| url = hit.url_without_anchor + '?q=' + escape(words.join(" ")) + '#' + hit.anchor; | ||
| } else { | ||
| url = hit.url + '?q=' + escape(words.join(" ")); | ||
| } | ||
|
|
||
| return url; | ||
| } |
Oops, something went wrong.