Skip to content

Commit 96ef320

Browse files
committed
Split register into register and messages.js.
1 parent fd1cee2 commit 96ef320

File tree

4 files changed

+35
-32
lines changed

4 files changed

+35
-32
lines changed

public/index.html.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<title>Slack Ruby Bot Server</title>
44
<script src="/scripts/jquery-1.7.1.min.js"></script>
55
<script src="/scripts/url.min.js"></script>
6+
<script src="/scripts/messages.js"></script>
67
<script src="/scripts/register.js"></script>
78
<script src="/scripts/stats.js"></script>
89
</head>

public/scripts/messages.js

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
var SlackRubyBotServer = {};
2+
3+
$(document).ready(function() {
4+
5+
SlackRubyBotServer.message = function(text) {
6+
$('#messages').fadeOut('slow', function() {
7+
$('#messages').fadeIn('slow').html(text)
8+
});
9+
};
10+
11+
SlackRubyBotServer.error = function(xhr) {
12+
try {
13+
var message;
14+
if (xhr.responseText) {
15+
var rc = JSON.parse(xhr.responseText);
16+
if (rc && rc.message) {
17+
message = rc.message;
18+
if (message == 'invalid_code') {
19+
message = 'The code returned from the OAuth workflow was invalid.'
20+
} else if (message == 'code_already_used') {
21+
message = 'The code returned from the OAuth workflow has already been used.'
22+
}
23+
}
24+
}
25+
26+
SlackRubyBotServer.message(message || xhr.statusText || xhr.responseText || 'Unexpected Error');
27+
28+
} catch(err) {
29+
SlackRubyBotServer.message(err.message);
30+
}
31+
};
32+
33+
});

public/scripts/register.js

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,4 @@
1-
var SlackRubyBotServer = {};
2-
31
$(document).ready(function() {
4-
5-
SlackRubyBotServer.message = function(text) {
6-
$('#messages').fadeOut('slow', function() {
7-
$('#messages').fadeIn('slow').html(text)
8-
});
9-
};
10-
11-
SlackRubyBotServer.error = function(xhr) {
12-
try {
13-
var message;
14-
if (xhr.responseText) {
15-
var rc = JSON.parse(xhr.responseText);
16-
if (rc && rc.message) {
17-
message = rc.message;
18-
if (message == 'invalid_code') {
19-
message = 'The code returned from the OAuth workflow was invalid.'
20-
} else if (message == 'code_already_used') {
21-
message = 'The code returned from the OAuth workflow has already been used.'
22-
}
23-
}
24-
}
25-
26-
SlackRubyBotServer.message(message || xhr.statusText || xhr.responseText || 'Unexpected Error');
27-
28-
} catch(err) {
29-
SlackRubyBotServer.message(err.message);
30-
}
31-
};
32-
332
// Slack OAuth
343
var code = $.url('?code')
354
var state = $.url('?state')

spec/api/middleware_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def middleware_classes(app)
1919
SlackRubyBotServer.configure do |config|
2020
config.view_paths << 'custom'
2121
end
22-
server_pages = middleware_classes(SlackRubyBotServer::Api::Middleware.instance)[2]
22+
server_pages = middleware_classes(SlackRubyBotServer::Api::Middleware.instance)[-2]
2323
expect(server_pages).to be_a Rack::ServerPages
2424
config = server_pages.instance_variable_get(:@config)
2525
expect(config[:view_path].count).to eq 4

0 commit comments

Comments
 (0)