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

Merge branch 'master' into feat-eslint

Browse Source
This commit is contained in:
Albert Yi
2018-08-06 10:27:32 -07:00
committed by GitHub
parent f72b32b27b 773bbabac7
commit fd8568c726
4 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/packs/application.js
View File

@@ -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/common', true, /\.scss(?:\.erb)?$/));
importAll(require.context('../src/styles/specific', 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 Blacklist } from '../src/javascripts/blacklists.js';
export { default as Comment } from '../src/javascripts/comments.js'; export { default as Comment } from '../src/javascripts/comments.js';
export { default as Dtext } from '../src/javascripts/dtext.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 PostModeMenu } from '../src/javascripts/post_mode_menu.js';
export { default as Utility } from '../src/javascripts/utility.js'; export { default as Utility } from '../src/javascripts/utility.js';
export { default as Ugoira } from '../src/javascripts/ugoira.js'; export { default as Ugoira } from '../src/javascripts/ugoira.js';
export { default as TagScript } from '../src/javascripts/tag_script.js';

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

@@ -246,9 +246,7 @@ Autocomplete.initialize_wiki_autocomplete = function($fields) {
}; };
Autocomplete.normal_source = function(term, resp) { Autocomplete.normal_source = function(term, resp) {
if (Utility.is_global_hook_defined("Danbooru.Autocomplete.normal_source")) { var key = "ac-" + term.replace(/\./g,'\uFFFF');
return window.Danbooru.Autocomplete.normal_source(term, resp);
}
return $.ajax({ return $.ajax({
url: "/tags/autocomplete.json", url: "/tags/autocomplete.json",
@@ -435,10 +433,6 @@ Autocomplete.static_metatag_source = function(term, resp, metatag) {
} }
Autocomplete.user_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({ return $.ajax({
url: "/users.json", url: "/users.json",
data: { data: {
@@ -473,10 +467,6 @@ Autocomplete.user_source = function(term, resp, metatag) {
} }
Autocomplete.pool_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({ return $.ajax({
url: "/pools.json", url: "/pools.json",
data: { data: {
@@ -500,10 +490,6 @@ Autocomplete.pool_source = function(term, resp, metatag) {
} }
Autocomplete.favorite_group_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({ return $.ajax({
url: "/favorite_groups.json", url: "/favorite_groups.json",
data: { data: {
@@ -524,10 +510,6 @@ Autocomplete.favorite_group_source = function(term, resp, metatag) {
} }
Autocomplete.saved_search_source = function(term, resp) { 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) { return SavedSearch.labels(term).then(function(labels) {
resp(labels.map(function(label) { resp(labels.map(function(label) {
return { return {
@@ -541,3 +523,6 @@ Autocomplete.saved_search_source = function(term, resp) {
$(document).ready(function() { $(document).ready(function() {
Autocomplete.initialize_all(); Autocomplete.initialize_all();
}); });
export default Autocomplete;

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

@@ -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) { $.fn.selectRange = function(start, end) {
return this.each(function() { return this.each(function() {
if (this.setSelectionRange) { if (this.setSelectionRange) {

2
public/maintenance.html.bak
View File

@@ -16,6 +16,6 @@
</head> </head>
<body> <body>
<h1>The site is down for maintenance.</h1> <h1>The site is down for maintenance.</h1>
<p>Check <a href="https://twitter.com/danboorubot">Twitter</a> for updates.</p> <p><a class="twitter-timeline" data-width="500" data-tweet-limit="3" data-dnt="true" href="https://twitter.com/danboorubot">Check Twitter for updates.</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script></p>
</body> </body>
</html> </html>