mirror of
https://github.com/ENSL/ensl.org.git
synced 2024-12-27 04:51:14 +00:00
JS fixes
This commit is contained in:
parent
04dc76b632
commit
a66cb599a1
4 changed files with 17 additions and 13 deletions
13
Gemfile.lock
13
Gemfile.lock
|
@ -95,8 +95,7 @@ GEM
|
|||
image_processing (~> 1.1)
|
||||
mimemagic (>= 0.3.0)
|
||||
mini_mime (>= 0.1.3)
|
||||
childprocess (0.9.0)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
childprocess (3.0.0)
|
||||
cliver (0.3.2)
|
||||
coderay (1.1.2)
|
||||
coffee-rails (5.0.0)
|
||||
|
@ -324,7 +323,7 @@ GEM
|
|||
ruby-progressbar (1.10.1)
|
||||
ruby-vips (2.0.17)
|
||||
ffi (~> 1.9)
|
||||
rubyzip (1.3.0)
|
||||
rubyzip (2.3.0)
|
||||
sanitize (5.1.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.8.0)
|
||||
|
@ -340,10 +339,9 @@ GEM
|
|||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (>= 1.1, < 3)
|
||||
selenium-webdriver (2.53.4)
|
||||
childprocess (~> 0.5)
|
||||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0)
|
||||
selenium-webdriver (3.142.7)
|
||||
childprocess (>= 0.5, < 4.0)
|
||||
rubyzip (>= 1.2.2)
|
||||
signet (0.11.0)
|
||||
addressable (~> 2.3)
|
||||
faraday (~> 0.9)
|
||||
|
@ -389,7 +387,6 @@ GEM
|
|||
activemodel (>= 5.0)
|
||||
bindex (>= 0.4.0)
|
||||
railties (>= 5.0)
|
||||
websocket (1.2.8)
|
||||
websocket-driver (0.7.1)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.4)
|
||||
|
|
|
@ -34,23 +34,23 @@ $(function() {
|
|||
|
||||
|
||||
// Forums fast reply
|
||||
$("a#fastReply").live('click', function() {
|
||||
$("a#fastReply").on('click', function() {
|
||||
$('#reply').fadeIn('slow')
|
||||
});
|
||||
|
||||
// Gather stuff
|
||||
|
||||
$("a#gather-info-hide").live('click', function() {
|
||||
$("a#gather-info-hide").on('click', function() {
|
||||
$("div#gather-info").fadeOut('slow', 0);
|
||||
});
|
||||
|
||||
$("a#gatherJoinBtn").live('click', function() {
|
||||
$("a#gatherJoinBtn").on('click', function() {
|
||||
$('form#new_gatherer').submit();
|
||||
});
|
||||
|
||||
// Submit TODO
|
||||
|
||||
$("a.submit").live('click', function() {
|
||||
$("a.submit").on('click', function() {
|
||||
$(this).closest('form').submit()
|
||||
});
|
||||
|
||||
|
@ -83,7 +83,7 @@ $(function() {
|
|||
});
|
||||
|
||||
// Users page
|
||||
$("#users th a, #users .pagination a").live("click", function() {
|
||||
$("#users th a, #users .pagination a").on("click", function() {
|
||||
$.getScript(this.href);
|
||||
return false;
|
||||
});
|
||||
|
|
|
@ -127,6 +127,10 @@ class UsersController < ApplicationController
|
|||
|
||||
private
|
||||
|
||||
def user_params
|
||||
params.require(:user).permit(:password, :firstname, :lastname, :email, :steamid, :country, :birthdate, :timezone, :public_email, :filter)
|
||||
end
|
||||
|
||||
def get_user
|
||||
@user = User.find(params[:id])
|
||||
end
|
||||
|
|
|
@ -4,6 +4,9 @@ require 'rails/all'
|
|||
|
||||
Bundler.require(*Rails.groups(assets: %w(development test)))
|
||||
|
||||
# FIXME
|
||||
ActionController::Parameters.permit_all_parameters = true
|
||||
|
||||
module Ensl
|
||||
class Application < Rails::Application
|
||||
# Custom error pages
|
||||
|
|
Loading…
Reference in a new issue