Skip to content

Commit a8e8d06

Browse files
committed
Moving back base JS is safer
1 parent a5f355f commit a8e8d06

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

app/assets/javascripts/application.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,23 @@
1313
//= require rails-timeago
1414
//= require locales/jquery.timeago.de.js
1515
//
16+
// lib/assets
17+
//= require flash
18+
//= require color_mode_picker
19+
//
1620
// app/assets
1721
// --> Include some assets first, as they are used by other assets.
1822
// --> Hence, the order specified here is important.
1923
//
20-
// 1. Programming groups are required by "channels/synchronized_editor_channel.js"
24+
// 1. Some common base functions and monkey patches
25+
//= require base
26+
// 2. Programming groups are required by "channels/synchronized_editor_channel.js"
2127
//= require programming_groups
22-
// 2. The turtle library is required by "editor/turtle.js"
28+
// 3. The turtle library is required by "editor/turtle.js"
2329
//= require turtle
24-
// 3. Some channels are required by "editor/editor.js.erb"
25-
// 4. Require the editor components, as needed by "./editor.js" and "./community_solution.js"
30+
// 4. Some channels are required by "editor/editor.js.erb"
31+
//= require_tree ./channels
32+
// 5. Require the editor components, as needed by "./editor.js" and "./community_solution.js"
2633
//= require_tree ./editor
2734
//
2835
// All remaining assets are loaded in alphabetical order
File renamed without changes.
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import './flash'
22
import './color_mode_picker'
33

4-
import './base'
5-
64
import './request_for_comments'

0 commit comments

Comments
 (0)