jegolize 0.1.6 → 0.1.8
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/controllers/jegol_controller.rb +11 -0
- data/app/views/{_jegol.html.erb → jegol/_jegol.html.erb} +1 -1
- data/app/views/jegol/demo.html.erb +3 -0
- data/config/initializers/jegol.rb +1 -3
- data/config/jegol.yml +1 -3
- data/jegolize.gemspec +3 -3
- data/lib/generators/jegolize/scaffold/USAGE +3 -3
- data/lib/generators/jegolize/scaffold/scaffold_generator.rb +3 -2
- data/public/javascripts/jegol.js +10 -1
- metadata +4 -4
- data/app/views/jebol_demo.html.erb +0 -3
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.1.
|
1
|
+
0.1.8
|
@@ -40,4 +40,15 @@ class JegolController < ApplicationController
|
|
40
40
|
client.close
|
41
41
|
return username
|
42
42
|
end
|
43
|
+
|
44
|
+
def demo
|
45
|
+
@room = 'demo_room'
|
46
|
+
@active = true
|
47
|
+
@room = session[:room] if !session[:room].nil? && !session[:room].empty?
|
48
|
+
@active = !session[:active].nil? && session[:active].downcase == 'true'
|
49
|
+
|
50
|
+
respond_to do |format|
|
51
|
+
format.html #demo.html.erb
|
52
|
+
end
|
53
|
+
end
|
43
54
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
|
2
2
|
<%= stylesheet_link_tag "jegol", "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" %>
|
3
|
-
<%= javascript_include_tag 'jegol', 'strophe', 'jegol.tag', 'jegol
|
3
|
+
<%= javascript_include_tag 'https://ajax.googleapis.com/ajax/libs/jquery/1.5.0/jquery.min.js', 'jegol', 'strophe', 'jegol.tag', 'jegol.plugin/viewer.default', 'jegol.plugin/update.tag', 'jegol.plugin/viewer.image', 'jegol.plugin/viewer.youtube', 'jegol.plugin/viewer.poll', 'jegol.plugin/update.subject', 'jegol.plugin/update.notify', 'http://platform.twitter.com/widgets.js', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js'%>
|
4
4
|
<div id="jegol_box">
|
5
5
|
<input type='hidden' id='jegol_service_url' value='<%= service %>' />
|
6
6
|
<div>
|
data/config/jegol.yml
CHANGED
data/jegolize.gemspec
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{jegolize}
|
8
|
-
s.version = "0.1.
|
8
|
+
s.version = "0.1.8"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Alemeshet Alemu"]
|
@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
|
|
25
25
|
"Rakefile",
|
26
26
|
"VERSION",
|
27
27
|
"app/controllers/jegol_controller.rb",
|
28
|
-
"app/views/_jegol.html.erb",
|
29
|
-
"app/views/
|
28
|
+
"app/views/jegol/_jegol.html.erb",
|
29
|
+
"app/views/jegol/demo.html.erb",
|
30
30
|
"config/initializers/jegol.rb",
|
31
31
|
"config/jegol.yml",
|
32
32
|
"jegolize.gemspec",
|
@@ -10,9 +10,9 @@ module Jegolize
|
|
10
10
|
puts '-----------------------------------------------------'
|
11
11
|
|
12
12
|
# Copy views
|
13
|
-
filename_pattern = File.join self.class.source_root, "app/views/*.html.erb"
|
13
|
+
filename_pattern = File.join self.class.source_root, "app/views/jegol/*.html.erb"
|
14
14
|
Dir.glob(filename_pattern).map {|f| File.basename f}.each do |f|
|
15
|
-
copy_file "#{self.class.source_root}/app/views/#{f}", "app/views/jegol/#{f}"
|
15
|
+
copy_file "#{self.class.source_root}/app/views/jegol/#{f}", "app/views/jegol/#{f}"
|
16
16
|
end
|
17
17
|
|
18
18
|
# Copy server side components - controller, config, init,
|
@@ -37,6 +37,7 @@ module Jegolize
|
|
37
37
|
|
38
38
|
def create_route
|
39
39
|
route "match 'jegol/boshsession/:room_jid' => 'jegol#new_boshsession', :conditions => {:method => :get }"
|
40
|
+
route "match 'jegol/demo/:room/:active' => 'jegol#demo', :conditions => {:method => :get }"
|
40
41
|
end
|
41
42
|
end
|
42
43
|
end
|
data/public/javascripts/jegol.js
CHANGED
@@ -8,6 +8,9 @@ var JeGol = {
|
|
8
8
|
participants: null,
|
9
9
|
lastmessagefrom: null,
|
10
10
|
autoReconnect: true,
|
11
|
+
reconnectionDelay: 1000, //delay this many msec before trying to reconnect
|
12
|
+
reconnectionAttempt: 0,
|
13
|
+
reconnectionAttemptLimit: 10,
|
11
14
|
viewerPlugins: {},
|
12
15
|
updatePlugins: {},
|
13
16
|
/**
|
@@ -518,7 +521,13 @@ $(document).bind('disconnected', function(){
|
|
518
521
|
|
519
522
|
if(JeGol.autoReconnect == true)
|
520
523
|
{
|
521
|
-
|
524
|
+
JeGol.reconnectionAttempt += 1;
|
525
|
+
//incrementally delay connection attempt
|
526
|
+
if (JeGol.reconnectionAttempt < JeGol.reconnectionAttemptLimit) {
|
527
|
+
setTimeout(function(){
|
528
|
+
$(document).trigger('connect');
|
529
|
+
}, JeGol.reconnectionAttempt * JeGol.reconnectionDelay);
|
530
|
+
}
|
522
531
|
}
|
523
532
|
});
|
524
533
|
|
metadata
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
name: jegolize
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 0.1.
|
5
|
+
version: 0.1.8
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Alemeshet Alemu
|
@@ -108,8 +108,8 @@ files:
|
|
108
108
|
- Rakefile
|
109
109
|
- VERSION
|
110
110
|
- app/controllers/jegol_controller.rb
|
111
|
-
- app/views/_jegol.html.erb
|
112
|
-
- app/views/
|
111
|
+
- app/views/jegol/_jegol.html.erb
|
112
|
+
- app/views/jegol/demo.html.erb
|
113
113
|
- config/initializers/jegol.rb
|
114
114
|
- config/jegol.yml
|
115
115
|
- jegolize.gemspec
|
@@ -157,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
157
157
|
requirements:
|
158
158
|
- - ">="
|
159
159
|
- !ruby/object:Gem::Version
|
160
|
-
hash: -
|
160
|
+
hash: -748024717
|
161
161
|
segments:
|
162
162
|
- 0
|
163
163
|
version: "0"
|