Rename action URI handler to jsonrpc

master
Daniel Berteaud 10 years ago
parent 63d2f70bfa
commit 55241c4798
  1. 4
      public/js/vroom.js
  2. 6
      vroom.pl

@ -35,7 +35,7 @@ $.ajax({
// Default ajax setup // Default ajax setup
$.ajaxSetup({ $.ajaxSetup({
url: rootUrl + 'action', url: rootUrl + 'jsonrpc',
type: 'POST', type: 'POST',
dataType: 'json', dataType: 'json',
}); });
@ -307,7 +307,7 @@ function initManage(){
function sendAction(data,sw){ function sendAction(data,sw){
$.ajax({ $.ajax({
url: rootUrl + 'admin/action', url: rootUrl + 'admin/jsonrpc',
data: data, data: data,
error: function(data) { error: function(data) {
$.notify(locale.ERROR_OCCURRED, 'error'); $.notify(locale.ERROR_OCCURRED, 'error');

@ -95,7 +95,7 @@ helper valid_room_name => sub {
my ($name) = @_; my ($name) = @_;
my $ret = {}; my $ret = {};
# A few names are reserved # A few names are reserved
my @reserved = qw(about help feedback feedback_thanks goodbye admin create localize action my @reserved = qw(about help feedback feedback_thanks goodbye admin create localize jsonrpc
missing dies password kicked invitation js css img fonts snd); missing dies password kicked invitation js css img fonts snd);
if ($name !~ m/^[\w\-]{1,49}$/ || grep { $name eq $_ } @reserved){ if ($name !~ m/^[\w\-]{1,49}$/ || grep { $name eq $_ } @reserved){
return 0; return 0;
@ -1093,10 +1093,10 @@ get '/:room' => sub {
}; };
# Route for various room actions # Route for various room actions
post '/*action' => [action => [qw/action admin\/action/]] => sub { post '/*jsonrpc' => [jsonrpc => [qw(jsonrpc admin/jsonrpc)] => sub {
my $self = shift; my $self = shift;
my $action = $self->param('action'); my $action = $self->param('action');
my $prefix = ($self->stash('action') eq 'admin/action') ? 'admin':'room'; my $prefix = ($self->stash('jsonrpc') eq 'admin/jsonrpc') ? 'admin' : 'room';
my $room = $self->param('room') || ''; my $room = $self->param('room') || '';
if ($action eq 'langSwitch'){ if ($action eq 'langSwitch'){
my $new_lang = $self->param('lang') || 'en'; my $new_lang = $self->param('lang') || 'en';

Loading…
Cancel
Save