muck-invites 3.3.3 → 3.4.0

data/VERSION

@@ -1 +1 @@
-3.3.3
+3.4.0

data/app/helpers/muck_invites_helper.rb

@@ -27,16 +27,15 @@ module MuckInvitesHelper
     user.authentications.find_by_provider('google')
   end
    
- def yahoo_oauth_for(user)
-   user.authentications.find_by_provider('yahoo')
- end
+  def yahoo_oauth_for(user)
+    user.authentications.find_by_provider('yahoo')
+  end
  
   # Generates a javascript array of emails from gmail.  Values will be
   # put into a variable named 'gmail_contacts'
-  def gmail_contacts_for_auto_complete(user, ignore_cache = false)
-    return unless google_oauth_for(user)
-    contacts = gmail_contacts(user, ignore_cache).collect{|contact| "'#{contact[:email]} (#{contact[:name]})'" }
-    "var gmail_contacts = [#{contacts.join(',')}];"
+  def contacts_for_auto_complete(contacts, ignore_cache = false)
+    contacts = contacts.collect{|contact| "'#{contact[:email]}'" }
+    "var auto_complete_contacts = [#{contacts.join(',')}];"
   end
   
   def service_contacts(user, ignore_cache = false)

data/app/views/invites/_invite_compose.erb

@@ -1,5 +1,5 @@
 <div id="compose-invite">
-  <h2>Email invites to friends</h2>
+  <h2><%=translate('muck.invites.invite_via_email_title') %></h2>
   <!--
   <div class="tabs">
     <ul>
@@ -22,12 +22,12 @@
   <div id="invite">
     <%= muck_form_for(:invite_contacts, :url => {:action => 'create'}, :html => {:id => "invite-contacts-form", :name => 'invite-contacts-form'} ) do |f| -%>
       <div class="form-row">
-        <label class="invite-email" for="emails">Emails</label>
+        <label class="invite-email" for="emails"><%=translate('muck.invites.emails') %></label>
         <p class="invite-email"><%=translate('muck.invites.email_friends_prompt') %></p>
         <%= text_area_tag :emails, emails || params[:emails] %>
       </div>
       <div class="form-row">
-        <label class="invite-message" for="message">Message</label>
+        <label class="invite-message" for="message"><%=translate('muck.invites.message') %></label>
         <%= text_area_tag :message, message || params[:message] %>
       </div>
       <div class="form-row">
@@ -50,18 +50,6 @@ jQuery(document).ready(function() {
   });
   jQuery('.tabs').show();
   
-  apply_ajax_forms();
-  
-  <% if google_oauth_for(current_user) -%>
-  <%= gmail_contacts_for_auto_complete(current_user) %>
-  jQuery("#emails").autocomplete(gmail_contacts, {
-               minChars: 1,
-               delay: 200,
-               autoFill: true,
-               mustMatch: false,
-               multiple: true
-  });
-  <% end -%>
 });  
 </script>
 <% end -%>

data/app/views/invites/_invite_scripts.erb

@@ -27,12 +27,51 @@ jQuery(document).ready(function() {
   });
   
   jQuery('#emails').change(function(){
-    var emails = split_list(jQuery('#emails').val());
-    excluded_checkbox_by_email(emails, false);
-    included_checkbox_by_email(emails, true);
+    set_email_ui();
   });
+  
+  <%= contacts_for_auto_complete(service_contacts(current_user)) %>
+  jQuery("#emails")
+  // don't navigate away from the field on tab when selecting an item
+  .bind("keydown", function(event){
+    if(event.keyCode === $.ui.keyCode.TAB && jQuery(this).data("autocomplete" ).menu.active){
+      event.preventDefault();
+    }
+    set_email_ui();
+  })
+  .autocomplete({
+    minLength: 0,
+    source: function( request, response ) {
+      // delegate back to autocomplete, but extract the last term
+      response( jQuery.ui.autocomplete.filter(
+        auto_complete_contacts, extractLast(request.term)));
+      },
+      focus: function() {
+        // prevent value inserted on focus
+        return false;
+      },
+      select: function(event, ui) {
+        var terms = split(this.value);
+        // remove the current input
+        terms.pop();
+        // add the selected item
+        terms.push(ui.item.value);
+        // add placeholder to get the comma-and-space at the end
+        terms.push("");
+        this.value = terms.join(", ");
+        return false;
+      }
+  });
+	
 });
 
+function split( val ) {
+	return val.split( /,\s*/ );
+}
+function extractLast( term ) {
+	return split( term ).pop();
+}
+
 function checked_emails(){
    return get_emails(jQuery('.contacts-list .cb input:checkbox:checked'));
 }
@@ -42,6 +81,12 @@ function get_emails(cbs){
     return jQuery(this).val();
   }).get();
 }
+
+function set_email_ui(){
+  var emails = split_list(jQuery('#emails').val());
+  excluded_checkbox_by_email(emails, false);
+  included_checkbox_by_email(emails, true);
+}
 // Sets checkboxes that are in 'emails'
 function included_checkbox_by_email(emails, checked){
   jQuery('.contacts-list .cb input:checkbox').each(function(index) {

data/config/locales/en.yml

@@ -12,14 +12,17 @@ en:
       create_success: Invites were sent to %{emails}. You will be notified if they join %{app_name}
       we_wont_email: We won't email these addresses without your permission.
       invited_joined: "%{user}} joined %{app_name}"
+      invite_via_email_title: Email invites to friends
       retrieving_contacts: Retrieving contacts
       we_dont_store: We don't store your login and your password is submitted securely.
+      emails: Emails
       emails_empty: You didn't specify any emails
       invalid_email_error: does not look like a valid email address.
       your_email: Your Email
       your_email_help: The email address of an account with contacts that you want to invite
       select_emails: "Select emails:"
       select_all: Select All
+      message: Message
       no_contacts_found: No contacts were found
       compose_invites: Compose Invite
       email_friends_prompt: "Enter emails of friends to invite:"

data/muck-invites.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-invites}
-  s.version = "3.3.3"
+  s.version = "3.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball, Joel Duffin"]
-  s.date = %q{2011-04-28}
+  s.date = %q{2011-05-04}
   s.description = %q{The invite engine for the muck system.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-invites
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 23
   prerelease: 
   segments: 
   - 3
-  - 3
-  - 3
-  version: 3.3.3
+  - 4
+  - 0
+  version: 3.4.0
 platform: ruby
 authors: 
 - Justin Ball, Joel Duffin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 -06:00
+date: 2011-05-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency