edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

export blacklist, comment, dtext, postmodemenu, and note javascripts (#3795)

Browse Source
This commit is contained in:
r888888888 2018-08-04 17:12:37 -07:00
parent 9c5df3206d
commit 660cd6ce62
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/* eslint no-console:0 */
function importAll (r) {
function importAll(r) {
r.keys().forEach(r);
}
@ -28,3 +28,10 @@ require("jquery-ui/themes/base/theme.css");
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 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';

3
app/logical/upload_service/preprocessor.rb
View File

@ -105,7 +105,8 @@ class UploadService
def finish!(upload = nil)
pred = upload || self.predecessor()
# regardless of who initialized the upload, credit should goto whoever submitted the form
# regardless of who initialized the upload, credit should
# goto whoever submitted the form
pred.initialize_attributes
# we went through a lot of trouble normalizing the source,

2
config/webpack/environment.js
View File

@ -16,6 +16,8 @@ environment.loaders.append('scss.erb', {
environment.loaders.append('erb', erb);
environment.config.output.library = ["Danbooru"];
environment.config.externals = {
jquery: "jQuery"
}