Changeset 3569
- Timestamp:
- 01/26/07 00:53:27 (2 years ago)
- Files:
-
- trunk/Colloquy.xcodeproj/project.pbxproj (modified) (2 diffs)
- trunk/Plug-Ins/Web Interface/Resources/common.js (modified) (6 diffs)
- trunk/Resources/base.html (modified) (3 diffs)
- trunk/Resources/roomTopicBanner.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Colloquy.xcodeproj/project.pbxproj
r3560 r3569 1916 1916 isa = PBXProject; 1917 1917 buildConfigurationList = 1C041A700854E97700A5A5BA /* Build configuration list for PBXProject "Colloquy" */; 1918 compatibilityVersion = "Xcode 2.4"; 1918 1919 hasScannedForEncodings = 1; 1919 1920 knownRegions = ( … … 1965 1966 ); 1966 1967 projectRoot = ""; 1968 shouldCheckCompatibility = 1; 1967 1969 targets = ( 1968 1970 1CB2CCF5052DDC560094AAA4 /* Colloquy (Application) */, trunk/Plug-Ins/Web Interface/Resources/common.js
r3568 r3569 207 207 208 208 var panel = this; 209 this.frame.onload = function( ) {210 panel.contentFrame = $(panel.frame. document.getElementById( "content" ));211 panel.contentFrame.onload = function( ) { panel.scrollToBottom() };209 this.frame.onload = function( event ) { 210 panel.contentFrame = $(panel.frame.contentDocument.getElementById( "content" )); 211 panel.contentFrame.onload = function( event ) { panel.scrollToBottom() }; 212 212 panel.contentFrame.src = "/command/panelContents?panel=" + panel.id; 213 213 }; … … 239 239 240 240 var frame = this.contentFrame; 241 var bodyNode = frame. document.getElementById( "contents" );242 if( ! bodyNode ) bodyNode = frame. document.body;241 var bodyNode = frame.contentDocument.getElementById( "contents" ); 242 if( ! bodyNode ) bodyNode = frame.contentDocument.body; 243 243 244 244 var consecutive = ( html.indexOf( "<?message type=\"consecutive\"?>" ) != -1 ); 245 245 if( ! consecutive ) consecutive = ( html.indexOf( "<?message type=\"subsequent\"?>" ) != -1 ); 246 246 247 var insert = frame. document.getElementById( "consecutiveInsert" );247 var insert = frame.contentDocument.getElementById( "consecutiveInsert" ); 248 248 249 249 if( consecutive && insert ) { 250 var range = frame. document.createRange();250 var range = frame.contentDocument.createRange(); 251 251 range.selectNode( insert.parentNode ); 252 252 var documentFragment = range.createContextualFragment( html ); … … 255 255 if( insert ) insert.parentNode.removeChild( insert ); 256 256 257 var range = frame. document.createRange();257 var range = frame.contentDocument.createRange(); 258 258 range.selectNode( bodyNode ); 259 259 var documentFragment = range.createContextualFragment( html ); … … 267 267 DirectChatPanel.prototype.enforceScrollBackLimit = function() { 268 268 var frame = this.contentFrame; 269 var bodyNode = frame. document.getElementById( "contents" );270 if( ! bodyNode ) bodyNode = frame. document.body;269 var bodyNode = frame.contentDocument.getElementById( "contents" ); 270 if( ! bodyNode ) bodyNode = frame.contentDocument.body; 271 271 if( UserDefaults.scrollBackMessageLimit > 0 && bodyNode.childNodes.length > UserDefaults.scrollBackMessageLimit ) 272 272 for( var i = 0; bodyNode.childNodes.length > UserDefaults.scrollBackMessageLimit && i < ( bodyNode.childNodes.length - UserDefaults.scrollBackMessageLimit ); ++i ) … … 276 276 DirectChatPanel.prototype.scrollToBottom = function() { 277 277 var frame = this.contentFrame; 278 var bodyNode = frame. document.getElementById( "contents" );279 if( ! bodyNode ) bodyNode = frame. document.body;278 var bodyNode = frame.contentDocument.getElementById( "contents" ); 279 if( ! bodyNode ) bodyNode = frame.contentDocument.body; 280 280 bodyNode.scrollTop = bodyNode.scrollHeight; 281 281 } … … 284 284 // var frame = this.contentFrame; 285 285 return true; 286 /* var bodyNode = frame. document.getElementById( "contents" );287 if( ! bodyNode ) bodyNode = frame. document.body;286 /* var bodyNode = frame.contentDocument.getElementById( "contents" ); 287 if( ! bodyNode ) bodyNode = frame.contentDocument.body; 288 288 scrollToBottomIsNeeded = ( bodyNode.scrollTop >= ( bodyNode.offsetHeight - ( window.innerHeight * 1.1 ) ) ); */ 289 289 } trunk/Resources/base.html
r3454 r3569 9 9 height: 100%; 10 10 width: 100%; 11 overflow: hidden; 11 12 } 12 13 13 14 body { 14 15 display: table; 16 border: none; 15 17 border-spacing: 0; 16 18 margin: 0; … … 26 28 .banner > * { 27 29 display: table-cell; 30 border: none; 28 31 } 29 32 30 33 .body { 31 34 display: table-row; 35 border: none; 32 36 } 33 37 34 38 .body > * { 35 39 display: table-cell; 40 border: none; 41 height: 100%; 42 width: 100%; 43 } 44 45 .body > * > iframe { 46 border: none; 36 47 height: 100%; 37 48 width: 100%; … … 40 51 </head> 41 52 <body> 42 <div class="body">< iframe id="content"></iframe></div>53 <div class="body"><div><iframe id="content"></iframe></div></div> 43 54 </body> 44 55 </html> trunk/Resources/roomTopicBanner.js
r3474 r3569 34 34 } 35 35 36 function refreshTopicSize( ) {36 function refreshTopicSize( event ) { 37 37 topicMessage = document.getElementById( 'topicMessage' ); 38 38 if( topicMessage.clientHeight > 17 ) … … 47 47 } 48 48 49 window.addEventListener( 'resize', refreshTopicSize );49 window.addEventListener( 'resize', refreshTopicSize, false );
