social_stream-presence 0.13.1 → 0.13.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (28) hide show
  1. data/app/assets/javascripts/jquery.flexselect.sstreampresence.js +2 -2
  2. data/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js +5 -5
  3. data/app/assets/javascripts/presence.js.erb +6 -4
  4. data/app/assets/javascripts/presence_XmppClient.js.erb +1136 -996
  5. data/app/assets/javascripts/presence_audio.js.erb +74 -60
  6. data/app/assets/javascripts/presence_game.js.erb +35 -22
  7. data/app/assets/javascripts/presence_game_comunication.js.erb +22 -5
  8. data/app/assets/javascripts/presence_game_factory.js.erb +1 -1
  9. data/app/assets/javascripts/presence_game_interface.js.erb +33 -13
  10. data/app/assets/javascripts/presence_notifications.js +206 -183
  11. data/app/assets/javascripts/presence_parser.js +265 -247
  12. data/app/assets/javascripts/presence_persistence.js +199 -188
  13. data/app/assets/javascripts/presence_store.js +22 -11
  14. data/app/assets/javascripts/presence_uiManager.js.erb +553 -530
  15. data/app/assets/javascripts/presence_utilities.js +244 -219
  16. data/app/assets/javascripts/presence_videochat.js.erb +436 -409
  17. data/app/assets/javascripts/presence_windowManager.js +586 -532
  18. data/app/views/chat/_index.html.erb +7 -13
  19. data/config/locales/en.yml +2 -1
  20. data/config/locales/es.yml +2 -1
  21. data/ejabberd/ejabberd_files.zip +0 -0
  22. data/ejabberd/ejabberd_scripts/authentication_script +9 -2
  23. data/ejabberd/mod_sspresence/mod_sspresence.beam +0 -0
  24. data/lib/generators/social_stream/presence/templates/initializer.rb +4 -0
  25. data/lib/social_stream/presence/version.rb +1 -1
  26. data/lib/social_stream/presence/xmpp_server_order.rb +1 -0
  27. data/lib/social_stream-presence.rb +3 -0
  28. metadata +68 -63
data/app/assets/javascripts/jquery.flexselect.sstreampresence.js CHANGED
@@ -257,8 +257,8 @@
257
257
  //this.picked = true;
258
258
  this.hidden.val(selected.value);
259
259
  this.input.val("");
260
- if(typeof changeSelectContactValue == "function"){
261
- return changeSelectContactValue(selected.name,selected.value);
260
+ if(typeof PRESENCE.UIMANAGER.changeSelectContactValue == "function"){
261
+ return PRESENCE.UIMANAGER.changeSelectContactValue(selected.name,selected.value);
262
262
  }
263
263
  } else if (this.settings.allowMismatch) {
264
264
  this.hidden.val("");
data/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js CHANGED
@@ -66,7 +66,7 @@
66
66
  self.elem.uiChatboxTitlebar.effect("highlight", options, 300);
67
67
 
68
68
 
69
- if (((typeof mustBounceBoxForChatWindow == 'function')&&(mustBounceBoxForChatWindow(self)))||((typeof mustBounceBoxForChatWindow != 'function'))) {
69
+ if (((typeof PRESENCE.UTILITIES.mustBounceBoxForChatWindow == 'function')&&(PRESENCE.UTILITIES.mustBounceBoxForChatWindow(self)))||((typeof PRESENCE.UTILITIES.mustBounceBoxForChatWindow != 'function'))) {
70
70
  self.elem.uiChatbox.effect("bounce", {times:3}, 300, function(){
71
71
  self.highlightLock = false;
72
72
  self._scrollToBottom();
@@ -185,7 +185,7 @@
185
185
  .hover(function() {uiChatboxTitlebarVideo.addClass('ui-state-hover');},
186
186
  function() {uiChatboxTitlebarVideo.removeClass('ui-state-hover');})
187
187
  .click(function(event) {
188
- toggleVideoBox(self)
188
+ PRESENCE.WINDOW.toggleVideoBox(self)
189
189
  return false;
190
190
  })
191
191
  .appendTo(uiChatboxTitlebar),
@@ -204,7 +204,7 @@
204
204
  .hover(function() {uiChatboxTitlebarVideoChange.addClass('ui-state-hover');},
205
205
  function() {uiChatboxTitlebarVideoChange.removeClass('ui-state-hover');})
206
206
  .click(function(event) {
207
- toggleVideoBoxChange(self)
207
+ PRESENCE.WINDOW.toggleVideoBoxChange(self)
208
208
  return false;
209
209
  })
210
210
  .appendTo(uiChatboxTitlebar),
@@ -247,7 +247,7 @@
247
247
  'ui-chatbox-notify'
248
248
  )
249
249
  .click(function(event) {
250
- onClickChatNotification(self.uiChatboxNotify)
250
+ PRESENCE.NOTIFICATIONS.onClickChatNotification(self.uiChatboxNotify)
251
251
  })
252
252
  .appendTo(uiChatboxContent),
253
253
 
@@ -289,7 +289,7 @@
289
289
  .appendTo(uiChatboxInput)
290
290
  .keydown(function(event) {
291
291
  if(event.keyCode && event.keyCode == $.ui.keyCode.ENTER) {
292
- var userChatDataInputControlBoolean = (((typeof userChatDataInputControl == 'function')&&(userChatDataInputControl()))||((typeof userChatDataInputControl != 'function')));
292
+ var userChatDataInputControlBoolean = (((typeof PRESENCE.UTILITIES.userChatDataInputControl == 'function')&&(PRESENCE.UTILITIES.userChatDataInputControl()))||((typeof PRESENCE.UTILITIES.userChatDataInputControl != 'function')));
293
293
  if (userChatDataInputControlBoolean) {
294
294
  msg = $.trim($(this).val());
295
295
  if (msg.length > 0) {
data/app/assets/javascripts/presence.js.erb CHANGED
@@ -7,10 +7,12 @@ PRESENCE.AUTHORS = 'Aldo Gordillo';
7
7
  PRESENCE.CORE = (function(P,$,undefined){
8
8
 
9
9
  var init = function(){
10
- initFocusListeners();
11
- checkVideocallFeature();
12
- PRESENCE.GAME.init(strophe_connection);
13
- initAudio();
10
+ PRESENCE.UIMANAGER.init();
11
+ PRESENCE.UTILITIES.init();
12
+ PRESENCE.XMPPClient.init();
13
+ PRESENCE.VIDEOCHAT.init();
14
+ PRESENCE.GAME.init();
15
+ PRESENCE.AUDIO.init();
14
16
  };
15
17
 
16
18
  return {