diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 37ff9664b..395020c6d 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -30,7 +30,7 @@ importAll(require.context('../src/javascripts', true, /\.js(\.erb)?$/)); importAll(require.context('../src/styles/common', true, /\.scss(?:\.erb)?$/)); importAll(require.context('../src/styles/specific', true, /\.scss(?:\.erb)?$/)); -// export { default as Autocomplete } from '../src/javascripts/autocomplete.js.erb'; +export { default as Autocomplete } from '../src/javascripts/autocomplete.js.erb'; export { default as Blacklist } from '../src/javascripts/blacklists.js'; export { default as Comment } from '../src/javascripts/comments.js'; export { default as Dtext } from '../src/javascripts/dtext.js'; @@ -38,3 +38,4 @@ export { default as Note } from '../src/javascripts/notes.js'; export { default as PostModeMenu } from '../src/javascripts/post_mode_menu.js'; export { default as Utility } from '../src/javascripts/utility.js'; export { default as Ugoira } from '../src/javascripts/ugoira.js'; +export { default as TagScript } from '../src/javascripts/tag_script.js'; diff --git a/app/javascript/src/javascripts/autocomplete.js.erb b/app/javascript/src/javascripts/autocomplete.js.erb index bd67ac744..807b91b3f 100644 --- a/app/javascript/src/javascripts/autocomplete.js.erb +++ b/app/javascript/src/javascripts/autocomplete.js.erb @@ -246,9 +246,7 @@ 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'); return $.ajax({ url: "/tags/autocomplete.json", @@ -435,10 +433,6 @@ 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); - } - return $.ajax({ url: "/users.json", data: { @@ -473,10 +467,6 @@ 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); - } - return $.ajax({ url: "/pools.json", data: { @@ -500,10 +490,6 @@ 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); - } - return $.ajax({ url: "/favorite_groups.json", data: { @@ -524,10 +510,6 @@ 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 { @@ -541,3 +523,6 @@ Autocomplete.saved_search_source = function(term, resp) { $(document).ready(function() { Autocomplete.initialize_all(); }); + +export default Autocomplete; + diff --git a/app/javascript/src/javascripts/utility.js b/app/javascript/src/javascripts/utility.js index d287ac4d6..aeeca8fdd 100644 --- a/app/javascript/src/javascripts/utility.js +++ b/app/javascript/src/javascripts/utility.js @@ -122,18 +122,6 @@ 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'; -} - $.fn.selectRange = function(start, end) { return this.each(function() { if (this.setSelectionRange) { diff --git a/public/maintenance.html.bak b/public/maintenance.html.bak index c352d3a33..5a82baf5e 100644 --- a/public/maintenance.html.bak +++ b/public/maintenance.html.bak @@ -16,6 +16,6 @@
Check Twitter for updates.
+