about summary refs log tree commit diff stats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/application.js2
-rw-r--r--app/assets/javascripts/custom_mechanics.js (renamed from app/assets/javascripts/wittle/custom_mechanics.js)0
-rw-r--r--app/assets/javascripts/display2.js (renamed from app/assets/javascripts/wittle/display2.js)0
-rw-r--r--app/assets/javascripts/polyominos.js (renamed from app/assets/javascripts/wittle/polyominos.js)0
-rw-r--r--app/assets/javascripts/puzzle.js (renamed from app/assets/javascripts/wittle/puzzle.js)2
-rw-r--r--app/assets/javascripts/serializer.js (renamed from app/assets/javascripts/wittle/serializer.js)0
-rw-r--r--app/assets/javascripts/solve.js (renamed from app/assets/javascripts/wittle/solve.js)0
-rw-r--r--app/assets/javascripts/svg.js (renamed from app/assets/javascripts/wittle/svg.js)0
-rw-r--r--app/assets/javascripts/trace2.js (renamed from app/assets/javascripts/wittle/trace2.js)0
-rw-r--r--app/assets/javascripts/utilities.js.erb (renamed from app/assets/javascripts/wittle/utilities.js.erb)8
-rw-r--r--app/assets/javascripts/validate.js (renamed from app/assets/javascripts/wittle/validate.js)0
-rw-r--r--app/assets/javascripts/wittle.js (renamed from app/assets/javascripts/wittle/wittle.js)0
-rw-r--r--app/assets/javascripts/wittle/application.js14
13 files changed, 7 insertions, 19 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000..e614ed0 --- /dev/null +++ b/app/assets/javascripts/application.js
@@ -0,0 +1,2 @@
1//= require jquery3
2//= require_tree .
diff --git a/app/assets/javascripts/wittle/custom_mechanics.js b/app/assets/javascripts/custom_mechanics.js index d4733db..d4733db 100644 --- a/app/assets/javascripts/wittle/custom_mechanics.js +++ b/app/assets/javascripts/custom_mechanics.js
diff --git a/app/assets/javascripts/wittle/display2.js b/app/assets/javascripts/display2.js index ddf3968..ddf3968 100644 --- a/app/assets/javascripts/wittle/display2.js +++ b/app/assets/javascripts/display2.js
diff --git a/app/assets/javascripts/wittle/polyominos.js b/app/assets/javascripts/polyominos.js index 4d8be6e..4d8be6e 100644 --- a/app/assets/javascripts/wittle/polyominos.js +++ b/app/assets/javascripts/polyominos.js
diff --git a/app/assets/javascripts/wittle/puzzle.js b/app/assets/javascripts/puzzle.js index cb0b20a..4889e96 100644 --- a/app/assets/javascripts/wittle/puzzle.js +++ b/app/assets/javascripts/puzzle.js
@@ -148,7 +148,7 @@ window.Puzzle = class {
148 this.grid[x] = [] 148 this.grid[x] = []
149 for (var y=0; y<height; y++) { 149 for (var y=0; y<height; y++) {
150 if (x%2 === 1 && y%2 === 1) this.grid[x][y] = null 150 if (x%2 === 1 && y%2 === 1) this.grid[x][y] = null
151 else this.grid[x][y] = {'type':'line', 'line':LINE_NONE} 151 else this.grid[x][y] = {'type':'line', 'line':window.LINE_NONE}
152 } 152 }
153 } 153 }
154 // Performance: A large value which is === 0 to be used for pillar wrapping. 154 // Performance: A large value which is === 0 to be used for pillar wrapping.
diff --git a/app/assets/javascripts/wittle/serializer.js b/app/assets/javascripts/serializer.js index 70c7f0f..70c7f0f 100644 --- a/app/assets/javascripts/wittle/serializer.js +++ b/app/assets/javascripts/serializer.js
diff --git a/app/assets/javascripts/wittle/solve.js b/app/assets/javascripts/solve.js index 8695291..8695291 100644 --- a/app/assets/javascripts/wittle/solve.js +++ b/app/assets/javascripts/solve.js
diff --git a/app/assets/javascripts/wittle/svg.js b/app/assets/javascripts/svg.js index c103b94..c103b94 100644 --- a/app/assets/javascripts/wittle/svg.js +++ b/app/assets/javascripts/svg.js
diff --git a/app/assets/javascripts/wittle/trace2.js b/app/assets/javascripts/trace2.js index 000e60b..000e60b 100644 --- a/app/assets/javascripts/wittle/trace2.js +++ b/app/assets/javascripts/trace2.js
diff --git a/app/assets/javascripts/wittle/utilities.js.erb b/app/assets/javascripts/utilities.js.erb index b621003..0414ce8 100644 --- a/app/assets/javascripts/wittle/utilities.js.erb +++ b/app/assets/javascripts/utilities.js.erb
@@ -75,10 +75,10 @@ var proxy = {
75window.settings = new Proxy({}, proxy.init()) 75window.settings = new Proxy({}, proxy.init())
76 76
77var tracks = { 77var tracks = {
78 'start': new Audio(src = '<%= asset_url("wittle/panel_start_tracing.aac") %>'), 78 'start': new Audio(src = '<%= asset_url("panel_start_tracing.aac") %>'),
79 'success': new Audio(src = '<%= asset_url("wittle/panel_success.aac") %>'), 79 'success': new Audio(src = '<%= asset_url("panel_success.aac") %>'),
80 'fail': new Audio(src = '<%= asset_url("wittle/panel_failure.aac") %>'), 80 'fail': new Audio(src = '<%= asset_url("panel_failure.aac") %>'),
81 'abort': new Audio(src = '<%= asset_url("wittle/panel_abort_tracing.aac") %>'), 81 'abort': new Audio(src = '<%= asset_url("panel_abort_tracing.aac") %>'),
82} 82}
83 83
84var currentAudio = null 84var currentAudio = null
diff --git a/app/assets/javascripts/wittle/validate.js b/app/assets/javascripts/validate.js index d6e6484..d6e6484 100644 --- a/app/assets/javascripts/wittle/validate.js +++ b/app/assets/javascripts/validate.js
diff --git a/app/assets/javascripts/wittle/wittle.js b/app/assets/javascripts/wittle.js index 883a4b8..883a4b8 100644 --- a/app/assets/javascripts/wittle/wittle.js +++ b/app/assets/javascripts/wittle.js
diff --git a/app/assets/javascripts/wittle/application.js b/app/assets/javascripts/wittle/application.js deleted file mode 100644 index 52d2214..0000000 --- a/app/assets/javascripts/wittle/application.js +++ /dev/null
@@ -1,14 +0,0 @@
1// This is a manifest file that'll be compiled into application.js, which will include all the files
2// listed below.
3//
4// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
5// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
6//
7// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
8// compiled file. JavaScript code in this file should be added after the last require_* statement.
9//
10// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
11// about supported directives.
12//
13//= require jquery3
14//= require_tree .