jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add global hooks for autocomplete functions #3795

Browse Source
This commit is contained in:
Albert Yi
2018-08-03 16:02:09 -07:00
parent 477a5a8ac3
commit cffb08a4b6
3 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/javascript/src/javascripts/autocomplete.js.erb
View File

@@ -246,6 +246,10 @@ Autocomplete.initialize_wiki_autocomplete = function($fields) {
};
Autocomplete.normal_source = function(term, resp) {
if (Utility.is_global_hook_defined("Danbooru.Autocomplete.normal_source")) {
return window.Danbooru.Autocomplete.normal_source(term, resp);
}
var key = "ac-" + term.replace(/\./g,'\uFFFF');
$.ajax({
@@ -432,6 +436,10 @@ Autocomplete.static_metatag_source = function(term, resp, metatag) {
}
Autocomplete.user_source = function(term, resp, metatag) {
if (Utility.is_global_hook_defined("Danbooru.Autocomplete.user_source")) {
return window.Danbooru.Autocomplete.user_source(term, resp, metatag);
}
$.ajax({
url: "/users.json",
data: {
@@ -466,6 +474,10 @@ Autocomplete.user_source = function(term, resp, metatag) {
}
Autocomplete.pool_source = function(term, resp, metatag) {
if (Utility.is_global_hook_defined("Danbooru.Autocomplete.pool_source")) {
return window.Danbooru.Autocomplete.pool_source(term, resp, metatag);
}
$.ajax({
url: "/pools.json",
data: {
@@ -489,6 +501,10 @@ Autocomplete.pool_source = function(term, resp, metatag) {
}
Autocomplete.favorite_group_source = function(term, resp, metatag) {
if (Utility.is_global_hook_defined("Danbooru.Autocomplete.favorite_group_source")) {
return window.Danbooru.Autocomplete.favorite_group_source(term, resp, metatag);
}
$.ajax({
url: "/favorite_groups.json",
data: {
@@ -509,6 +525,10 @@ Autocomplete.favorite_group_source = function(term, resp, metatag) {
}
Autocomplete.saved_search_source = function(term, resp) {
if (Utility.is_global_hook_defined("Danbooru.Autocomplete.saved_search_source")) {
return window.Danbooru.Autocomplete.saved_search_source(term, resp);
}
return SavedSearch.labels(term).then(function(labels) {
resp(labels.map(function(label) {
return {

12
app/javascript/src/javascripts/utility.js
View File

@@ -138,6 +138,18 @@ Utility.sorttable = function(table) {
});
};
Utility.is_global_hook_defined = function(path) {
let objs = path.split(/\./g);
let obj = window;
objs.forEach(x => {
if (obj) {
obj = obj[x]
}
});
return typeof obj === 'function';
}
String.prototype.hash = function() {
var hash = 5381, i = this.length;

19
app/views/layouts/default.html.erb
View File

@@ -72,15 +72,16 @@
</script>
<script defer src="https://use.fontawesome.com/releases/v5.0.10/js/all.js" integrity="sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+" crossorigin="anonymous"></script>
<script>
window.Danbooru = {
notice: function(msg) {
console.warn("Danbooru.notice will be deprecated. Use $(window).trigger('danbooru:notice', msg) instead.")
$(window).trigger("danbooru:notice", msg);
},
error: function(msg) {
console.warn("Danbooru.error will be deprecated. Use $(window).trigger('danbooru:error', msg) instead.")
$(window).trigger("danbooru:error", msg);
}
if (typeof window.Danbooru !== "object") {
window.Danbooru = {};
}
window.Danbooru.notice = function(msg) {
console.warn("Danbooru.notice will be deprecated. Use $(window).trigger('danbooru:notice', msg) instead.")
$(window).trigger("danbooru:notice", msg);
}
window.Danbooru.error = function(msg) {
console.warn("Danbooru.error will be deprecated. Use $(window).trigger('danbooru:error', msg) instead.")
$(window).trigger("danbooru:error", msg);
}
</script>