Changeset 3689

Show
Ignore:
Timestamp:
07/03/07 01:36:47 (1 year ago)
Author:
timothy
Message:

Remember if the panel was scrolled to the bottom, and resotre that the next time the panel is shown. Also make emoticons not suck in the preview.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Plug-Ins/Web Interface/Resources/iphone/iphone.css

    r3685 r3689  
    413413} 
    414414 
    415 .message .emoticon samp { 
     415.emoticon samp { 
    416416        font-weight: bold; 
    417417        font-family: inherit; 

  • trunk/Plug-Ins/Web Interface/Resources/iphone/iphone.js

    r3688 r3689  
    104104                Colloquy.membersElement.style.display = null; 
    105105 
    106                 ChatController.activePanel.lastScrollPosition = ChatController.activePanel.panelTranscriptElement.scrollTop; 
     106                ChatController.activePanel.wasScrolledNearBottom = ChatController.activePanel.scrolledNearBottom(); 
     107                if (!ChatController.activePanel.wasScrolledNearBottom) 
     108                        ChatController.activePanel.lastScrollPosition = ChatController.activePanel.panelTranscriptElement.scrollTop; 
    107109                ChatController.activePanel.panelElement.style.display = null; 
    108110                ChatController.activePanel.setKeyboardVisible(false); 
    …… 
    370372        Colloquy.membersElement.style.display = "block"; 
    371373 
    372         this.panelTranscriptElement.scrollTop = this.lastScrollPosition; 
     374        if (this.wasScrolledNearBottom) 
     375                this.scrollToBottom(); 
     376        else this.panelTranscriptElement.scrollTop = this.lastScrollPosition; 
    373377 
    374378        Colloquy.colloquyTitleElement.textContent = this.name;