From 3672eedd36c417cb2224d50d352c0d8ebf366401 Mon Sep 17 00:00:00 2001 From: Albert Yi Date: Mon, 6 Aug 2018 10:13:01 -0700 Subject: [PATCH] expose additional js modules (#3795) --- app/javascript/packs/application.js | 5 ++-- .../src/javascripts/autocomplete.js.erb | 23 +++---------------- app/javascript/src/javascripts/utility.js | 12 ---------- 3 files changed, 6 insertions(+), 34 deletions(-) diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 24201afe5..c8d3de05d 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -29,11 +29,12 @@ 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'; 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'; \ No newline at end of file +export { default as Ugoira } from '../src/javascripts/ugoira.js'; +export { default as TagScript } from '../src/javascripts/tag_script.js'; \ No newline at end of file diff --git a/app/javascript/src/javascripts/autocomplete.js.erb b/app/javascript/src/javascripts/autocomplete.js.erb index 11a0fcb33..e546fdc84 100644 --- a/app/javascript/src/javascripts/autocomplete.js.erb +++ b/app/javascript/src/javascripts/autocomplete.js.erb @@ -246,10 +246,6 @@ 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({ @@ -436,10 +432,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); - } - $.ajax({ url: "/users.json", data: { @@ -474,10 +466,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); - } - $.ajax({ url: "/pools.json", data: { @@ -501,10 +489,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); - } - $.ajax({ url: "/favorite_groups.json", data: { @@ -525,10 +509,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 { @@ -542,3 +522,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 b5c041877..18ec49ba9 100644 --- a/app/javascript/src/javascripts/utility.js +++ b/app/javascript/src/javascripts/utility.js @@ -123,18 +123,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) {