Changeset e97f010 in github
- Timestamp:
- Mar 8, 2012 5:00:42 AM (15 months ago)
- Branches:
- master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8
- Children:
- fe83748
- Parents:
- c388257
- Files:
-
- 5 edited
-
CHANGELOG (modified) (1 diff)
-
skins/default/functions.js (modified) (7 diffs)
-
skins/default/templates/addressbook.html (modified) (1 diff)
-
skins/default/templates/folders.html (modified) (1 diff)
-
skins/default/templates/mail.html (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
CHANGELOG
r8b3c68d re97f010 2 2 =========================== 3 3 4 - Scroll long lists on drag&drop (#1485946) 4 5 - Fix handling of % character in IMAP protocol (#1488382) 5 6 - Fix duplicate names handling in addressbook searches (#1488375) -
skins/default/functions.js
r2c193722 re97f010 559 559 }; 560 560 561 /** 562 * Scroller 563 */ 564 565 function rcmail_scroller(list, top, bottom) 566 { 567 var ref = this; 568 569 this.list = $(list); 570 this.top = $(top); 571 this.bottom = $(bottom); 572 this.step_size = 6; 573 this.step_time = 20; 574 this.delay = 500; 575 576 this.top 577 .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); }) 578 .mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); }); 579 580 this.bottom 581 .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); }) 582 .mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); }); 583 584 this.scroll = function(dir) 585 { 586 var ref = this, size = this.step_size; 587 588 if (!rcmail.drag_active) 589 return; 590 591 if (dir == 'down') 592 size *= -1; 593 594 this.list.get(0).scrollTop += size; 595 this.ts = window.setTimeout(function() { ref.scroll(dir); }, this.step_time); 596 }; 597 }; 598 561 599 562 600 // Events handling in iframes (eg. preview pane) … … 566 604 var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null; 567 605 rcube_event.add_listener({ element: doc, object:rcmail_ui, method:'body_mouseup', event:'mouseup' }); 568 } 606 }; 569 607 570 608 // Abbreviate mailbox names to fit width of the container … … 593 631 elem.contents().filter(function(){ return (this.nodeType == 3); }).get(0).data = abbrev; 594 632 }); 595 } 633 }; 596 634 597 635 // inspired by https://gist.github.com/24261/7fdb113f1e26111bd78c0c6fe515f6c0bf418af5 … … 637 675 638 676 return result; 639 } 677 }; 640 678 641 679 function update_quota(data) 642 680 { 643 681 percent_indicator(rcmail.gui_objects.quotadisplay, data); 644 } 682 }; 645 683 646 684 // percent (quota) indicator … … 706 744 // update #quotaimg title 707 745 $('#quotaimg').attr('title', data.title); 708 } 746 }; 709 747 710 748 // Optional parameters used by TinyMCE … … 741 779 rcmail.addEventListener('responseaftercheck-recent', rcube_render_mailboxlist); 742 780 rcmail.addEventListener('aftercollapse-folder', rcube_render_mailboxlist); 781 782 new rcmail_scroller('#mailboxlist-content', '#mailboxlist-title', '#mailboxlist-footer'); 743 783 } 744 784 … … 748 788 else if (rcmail.env.task == 'addressbook') { 749 789 rcmail.addEventListener('afterupload-photo', function(){ rcmail_ui.show_popup('uploadform', false); }); 790 791 if (rcmail.gui_objects.folderlist) 792 new rcmail_scroller('#directorylist-content', '#directorylist-title', '#directorylist-footer'); 793 } 794 else if (rcmail.env.task == 'settings') { 795 if (rcmail.gui_objects.subscriptionlist) 796 new rcmail_scroller('#folderlist-content', '#folderlist-title', '#folderlist-footer'); 750 797 } 751 798 } -
skins/default/templates/addressbook.html
r1de8f4e re97f010 53 53 <div id="directorylistbox"> 54 54 <div id="directorylist-title" class="boxtitle"><roundcube:label name="groups" /></div> 55 <div class="boxlistcontent">55 <div id="directorylist-content" class="boxlistcontent"> 56 56 <roundcube:object name="directorylist" id="directorylist" /> 57 57 <roundcube:object name="groupslist" id="contactgroupslist" /> 58 58 </div> 59 <div class="boxfooter">59 <div id="directorylist-footer" class="boxfooter"> 60 60 <roundcube:button command="group-create" type="link" title="newcontactgroup" class="buttonPas addgroup" classAct="button addgroup" content=" " /> 61 61 <roundcube:button name="groupmenulink" id="groupmenulink" type="link" title="moreactions" class="button groupactions" onclick="rcmail_ui.show_popup('groupmenu');return false" content=" " /> -
skins/default/templates/folders.html
r1de8f4e re97f010 22 22 23 23 <div id="folder-manager"> 24 <div id="folder -title" class="boxtitle"><span class="rightalign"><roundcube:label name="subscribed" /></span><roundcube:label name="folders" /></div>25 <div class="boxlistcontent">24 <div id="folderlist-title" class="boxtitle"><span class="rightalign"><roundcube:label name="subscribed" /></span><roundcube:label name="folders" /></div> 25 <div id="folderlist-content" class="boxlistcontent"> 26 26 <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" noheader="true" 27 27 cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table" /> 28 28 </div> 29 <div class="boxfooter">29 <div id="folderlist-footer" class="boxfooter"> 30 30 <roundcube:button command="create-folder" type="link" title="createfolder" class="buttonPas addgroup" classAct="button addgroup" content=" " /> 31 31 <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " /> -
skins/default/templates/mail.html
r1de8f4e re97f010 28 28 <div id="mailboxlist-container"> 29 29 <div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div> 30 <div class="boxlistcontent">30 <div id="mailboxlist-content" class="boxlistcontent"> 31 31 <roundcube:object name="mailboxlist" id="mailboxlist" folder_filter="mail" /> 32 32 </div> 33 <div class="boxfooter">33 <div id="mailboxlist-footer" class="boxfooter"> 34 34 <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " /> 35 35
Note: See TracChangeset
for help on using the changeset viewer.
