Merge branch 'master' of https://github.com/rdutra/Chatforce

app/controllers/application_controller.rb

@@ -22,10 +22,12 @@ def save_setting
     options = {
       :history      => ahistory,
       :skin         => params["select_skin"],
-      :buddy_id     => @session["buddy_id"]
+      :buddy_id     => @session["buddy_id"],
+      :show_offline => params["show_offline"],
+      :idle_time => params["idle_time"]
     }
-    Setting.save_settings(options)
-    #redirect_to :controller => 'buddies', :action => 'index'
+    Setting.save_settings(options, params["status"])
+    redirect_to "buddies/list"
   end
 
   private

app/views/settings/_settings.haml

@@ -1,33 +1,33 @@
-=form_tag('/save_settings', :id => 'Settings_form') do
-  .settingsContainer.acordeon
-    .settingsListHeader.acordeonHeader
-      Settings
-      .AcordeonListHeaderBtn{:onclick => "toggleAcordeon(this);"}
-    .acordeonList
-      .settings.acordeonListItem
-        .settingsLeft
-          Set your status mesage
-        .settingsRight
-          %input.settings{:type => 'text', :style => "width: 100%;text-align: left;", "data-role" => "none", :name => "status", :value => @buddy["nickname"]}
-          
-      .settings.acordeonListItem
-        .settingsLeft
-          Lets others know im idle after
-        .settingsRight
-          %input.settings{:type => 'text', :style => "width: 34px;", "data-role" => "none", :name => "idle_time", :value => @settings["idle_time"]}
-          mins of inactivity
-          
-      .settings.acordeonListItem
-        .settingsLeft
-          Show Offline contacts :
-        .settingsRight
-          .CheckboxSwitch.green{:onclick => "toggleSwitch(this);"}
-            %input.CheckboxSwitch{:type => "checkbox", "data-role" => "none", :name => "show_offline", ((!@settings["show_offline"].nil? &&@settings["show_offline"])? 'checked': 'unchecked' ) => ""  }
-              .checkboxSwitchContainer
-                .switchOn ON
-                .switch
-                .switchOff OFF
-  %div{:style => "padding: 12px 42px;background: #e1ecee;"}
-    %button{:class => "settingsSubmitBtn green", "data-role" => "none", :style => "margin-bottom: 20px"}
-      Use default
-    = submit_tag 'Done',  {:class => "submitBtn settingsSubmitBtn green", "data-role" => "none" }
+.settingsContainer.acordeon
+  .settingsListHeader.acordeonHeader
+    Settings
+    .AcordeonListHeaderBtn{:onclick => "toggleAcordeon(this);"}
+  .acordeonList
+    .settings.acordeonListItem
+      .settingsLeft
+        Set your status mesage
+      .settingsRight
+        %input.settings{:type => 'text', :style => "width: 100%;text-align: left;", "data-role" => "none", :name => "status", :id => "status", :value => @buddy["nickname"]}
+
+    .settings.acordeonListItem
+      .settingsLeft
+        Lets others know im idle after
+      .settingsRight
+        %input.settings{:type => 'text', :style => "width: 34px;", "data-role" => "none", :name => "idle_time", :id => "idle_time",:value => @settings["idle_time"]}
+        mins of inactivity
+
+    .settings.acordeonListItem
+      .settingsLeft
+        Show Offline contacts :
+      .settingsRight
+        .CheckboxSwitch.green{:onclick => "toggleSwitch(this);"}
+          %input.CheckboxSwitch{:type => "checkbox", "data-role" => "none", :name => "show_offline", ((!@settings["show_offline"].nil? &&@settings["show_offline"])? 'checked': 'unchecked' ) => ""  }
+            .checkboxSwitchContainer
+              .switchOn ON
+              .switch
+              .switchOff OFF
+%div{:style => "padding: 12px 42px;background: #e1ecee;"}
+  %button{:id => "default_setting_ajax", :class => "settingsSubmitBtn green", "data-role" => "none", :style => "margin-bottom: 20px"}
+    Use default
+  %button{:id => "submit_setting_ajax",:class => "submitBtn settingsSubmitBtn green", "data-role" => "none" }
+    Done

public/javascripts/comm.js

@@ -27,6 +27,36 @@ $(".buddyLink").live('click', function(){
      $("#mesg").html("");
 });
 
+$("#submit_setting_ajax").live('click', function(){
+    var new_status = $("#status").val();
+    var new_idle = $("#idle_time").val();
+    var new_show_offline = $(".CheckboxSwitch").find('input')[0].checked;
+
+     $.ajax({
+        url: '/settings/save_setting',
+        type: 'POST',
+        data: "show_offline=" + new_show_offline + "&idle_time=" + new_idle + "&status=" + new_status,
+        success: function(data){
+          if(data.signed == "false") window.location.replace("/index.html");
+          window.location.replace("buddies");
+        }
+      });  
+
+});
+
+$("#default_setting_ajax").live('click', function(){
+
+     $.ajax({
+        url: '/settings/save_setting',
+        type: 'POST',
+        data: "show_offline=false&idle_time=10&status=",
+        success: function(data){
+          if(data.signed == "false") window.location.replace("/index.html");
+          window.location.replace("buddies");
+        }
+      });  
+
+});
 
 
 function init()
@@ -62,7 +92,7 @@ function init()
 
 function channel_subscribe(channel)
 {
-
+    console.info("Channel de channel suscribe: " + channel)
     if (!(typeof jugger_comm !== undefined && jugger_comm))
     {
         jugger_comm = new Juggernaut(data_session);
@@ -197,7 +227,7 @@ function enableChat(data, buffer)
   console.info("enableChat", data)
   if(data.channel == channel_selected)
   {
-    if(data.sender != data_session.buddy_id && $('.ui-page-active').attr('id') == "buddies" && data.sender != undefined) runEffect(data.message['sender']);
+    if(data.sender != data_session.buddy_id && ( $('.ui-page-active').attr('id') == "buddies" || $('.ui-page-active').attr('id') == "settings" ) && data.sender != undefined) runEffect(data.message['sender']);
 
     var who =  (data.message['sender'] == data_session.buddy_id)? 'left': 'right';
     var ul = '<div class="conversationContainer">';
@@ -237,9 +267,6 @@ function enableChat(data, buffer)
 
   }
 
-
-
-
   setTimeout(function(){window.scroll(0,$(document).height()+200)},300);
 }
 
@@ -305,9 +332,12 @@ function runEffect(buddy_id) {
 
 function init_chat(channel, buffer, id_sender)
 {
-
+  
   $("#chat_window").unbind("submit");
   $("#chat_window").submit(function(event) {
+    console.info("aca2");
+    console.info(buffer);
+  console.info(id_sender);
     event.preventDefault();
     $("#header-main").css("top", "0px")
     var message = $.trim(this.msg_body.value)
@@ -322,6 +352,7 @@ function init_chat(channel, buffer, id_sender)
         type: 'POST',
         data: "channel="+channel_selected+"&message="+message+"&sender="+real_sender,
         success: function(data_buffer){
+          console.info('ffff')
           if(data_buffer.signed == "false") window.location.replace("/index.html");
           jQuery('#msg_body').keyup();
         }
@@ -368,9 +399,8 @@ function init_chat(channel, buffer, id_sender)
     }
   });
 
-  if(buffer && id_sender == undefined)
+  if(buffer && id_sender == undefined )
   {
-
       $.ajax({
         url: "/chat/get_buffer",
         type: 'POST',
@@ -379,6 +409,7 @@ function init_chat(channel, buffer, id_sender)
           if(data.signed == "false") window.location.replace("/index.html");
           for (i=data.length-1;i>=0;i--)
           {
+              console.info(i)
               enableChat(data[i], true)
           }          
         }
@@ -388,9 +419,10 @@ function init_chat(channel, buffer, id_sender)
 
 function init_buffer(channel, receiver)
 {
-
+  
   $("#chat_window").unbind("submit");
   $("#chat_window").submit(function(event) {
+    console.info("aca1");
     event.preventDefault();
     $("#header-main").css("top", "0px")
     var message = $.trim(this.msg_body.value)