Changeset 5360

Timestamp:

01/11/12 15:12:10 (12 years ago)

Author:

adriano

Message:

Ticket #2434 - correcao de problemas nos tootips de adicao de participantes

Location:

trunk/prototype/modules/calendar

Files:

• js/helpers.js (modified) (9 diffs)
• templates/participants_add_itemlist.ejs (modified) (1 diff)
• templates/participants_search_itemlist.ejs (modified) (1 diff)

trunk/prototype/modules/calendar/js/helpers.js

@@ -443 +443 @@
                         */
                         var hasNewAttendee = false;
-                        UI.dialogs.addEvent.find('.attendee-list-add .add-attendee-input input').keydown(function(event) {
+                        blkAddAtendee.find('.attendee-list-add .add-attendee-input input').keydown(function(event) {
                                 
                                 if (event.keyCode == '13' && $(this).val() != '') {
@@ -497 +497 @@
                                                 DataLayer.put('user', {id:newAttendeeId, name:newAttendeeName, mail:newAttendeeEmail, isExternal:isExternal});
 
-                                                $('dd.attendee-list ul.attendee-list li:last label')
+                                                lastEditAttendeeToolTip.find('label')
                                                 .filter('.name').html(Encoder.htmlEncode(newAttendeeName)).attr('title', Encoder.htmlEncode(newAttendeeName)).end()
                                                 .filter('.mail').html(Encoder.htmlEncode(newAttendeeEmail)).attr('title', Encoder.htmlEncode(newAttendeeEmail));
 
+                                                blkAddAtendee.find('.attendee-list-add .add-attendee-input input').val('');
                                                 return true;
                                         }
@@ -548 +549 @@
                                          */
                                         if(blkAddAtendee.find('label.mail[title="' + newAttendeeEmail + '"]').length) {
+                                                hasNewAttendee  = false;
                                                 newAttendeeName = blkAddAtendee.find('label.mail[title="' + newAttendeeEmail + '"]').parents('li').find('label.name').attr('title');
 
@@ -561 +563 @@
                                                          * Remove tooltip possivelmente existente
                                                          */
-                                                        if (hasNewAttendee && lastEditAttendeeToolTip.length && lastEditAttendeeToolTip.data('qtip'))
+                                                        if (lastEditAttendeeToolTip.length && lastEditAttendeeToolTip.data('qtip'))
                                                                 lastEditAttendeeToolTip.qtip('destroy');
                                         
@@ -587 +589 @@
                                                 });
                                                 skipAddNewLine = true;
+                                        } else {
+                                                hasNewAttendee  = true;
+                                                blkAddAtendee.find('.email-validation').addClass('hidden');
                                         }
                                         
@@ -595 +600 @@
                                          * Remove tooltip possivelmente existente
                                          */
-                                        if (hasNewAttendee && lastEditAttendeeToolTip.length && lastEditAttendeeToolTip.data('qtip'))
+                                        if (lastEditAttendeeToolTip.length && lastEditAttendeeToolTip.data('qtip'))
                                                 lastEditAttendeeToolTip.qtip('destroy');
 
@@ -632 +637 @@
                                                 }).end()
                                                 .scrollTo('max');
-                                                hasNewAttendee = true;
 
 
@@ -662 +666 @@
                                                 lastEditAttendeeToolTip.qtip("api").onShow = onShowToolTip;
 
-
-
-
-
-
-
-
                                                 $(this).val('');
 
@@ -692 +689 @@
                                         * TODO: trocar por template
                                         */
-                                        $('ul.search-result-list').empty().css('overflow', 'hidden');
+                                        blkAddAtendee.find('ul.search-result-list').empty().css('overflow', 'hidden');
                                         if (!result) {
-                                                $('ul.search-result-list').append('<li><label class="empty">Nenhum resultado encontrado.</label></li>');
+                                                blkAddAtendee.find('ul.search-result-list').append('<li><label class="empty">Nenhum resultado encontrado.</label></li>');
                                         }
 
-                                        $('ul.search-result-list').append(DataLayer.render( 'templates/participants_search_itemlist.ejs', result));
-
-                                        $('ul.search-result-list li').click(function(event, ui){
+                                        blkAddAtendee.find('ul.search-result-list').append(DataLayer.render( 'templates/participants_search_itemlist.ejs', result));
+
+                                        blkAddAtendee.find('ul.search-result-list li').click(function(event, ui){
                                                 if ($(event.target).is('input')) {
                                                         old_item = $(event.target).parents('li');

trunk/prototype/modules/calendar/templates/participants_add_itemlist.ejs

@@ -6 +6 @@
                 <label title="<%= data[0].name ? data[0].name : '' %>" class="name"><%= data[0].name ? data[0].name : '' %></label>
                 <label title="<%= data[0].mail ? data[0].mail : '' %>" class="mail"><%= data[0].mail ? data[0].mail : '' %></label>
-                <span class="ui-icon ui-icon-close ui-corner-all ui-icon-float-right"></span>
         </div> 
-        <a class="button close">X</a>
+        <a class="button close">Close</a>
 </li>

trunk/prototype/modules/calendar/templates/participants_search_itemlist.ejs

@@ -6 +6 @@
         <label class="email hidden"><%=data[i]['mail']%></label>
         <label class="id hidden"><%=data[i]['id']%></label>
-        <span class="ui-icon ui-icon-plus ui-corner-all ui-icon-float-right"></span>
 </li>
 <% } %>