deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2009-10-11 10:22:15 -05:00
parent de44b81020 a483b4e71e
commit 008824c1ad
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/node.rb
View file

@ -308,7 +308,7 @@ module XHTML #:nodoc:
# Returns non-+nil+ if this tag can contain child nodes. # Returns non-+nil+ if this tag can contain child nodes.
def childless?(xml = false) def childless?(xml = false)
return false if xml && @closing.nil? return false if xml && @closing.nil?
# !@closing.nil? || # !@closing.nil? ||
@name =~ /^(img|br|hr|link|meta|area|base|basefont| @name =~ /^(img|br|hr|link|meta|area|base|basefont|
col|frame|input|isindex|param)$/ox col|frame|input|isindex|param)$/ox

10
public/s5/ui/core/slides.js
View file

@ -539,9 +539,9 @@ function notOperaFix() {
slides.setAttribute('href',slideCSS); // Gecko fix slides.setAttribute('href',slideCSS); // Gecko fix
} }
if (isIE && document.styleSheets && document.styleSheets[0]) { if (isIE && document.styleSheets && document.styleSheets[0]) {
document.styleSheets[0].addRule('img', 'behavior: url(/s5/ui/default/iepngfix.htc)'); document.styleSheets[0].addRule('img', 'behavior: url(../../ui/default/iepngfix.htc)');
document.styleSheets[0].addRule('div', 'behavior: url(/s5/ui/default/iepngfix.htc)'); document.styleSheets[0].addRule('div', 'behavior: url(../../ui/default/iepngfix.htc)');
document.styleSheets[0].addRule('.slide', 'behavior: url(/s5/ui/default/iepngfix.htc)'); document.styleSheets[0].addRule('.slide', 'behavior: url(../../ui/default/iepngfix.htc)');
} }
} }
@ -632,9 +632,9 @@ function createNotesWindow() { // creates a window for our notes
s5NotesWindowLoaded = false; s5NotesWindowLoaded = false;
// Note: Safari has a tendency to ignore window options preferring to default to the settings of the parent window, grr. // Note: Safari has a tendency to ignore window options preferring to default to the settings of the parent window, grr.
if (isIE) { if (isIE) {
s5NotesWindow = window.open('/s5/ui/s5-notes.html', 's5NotesWindow', 'top=0,left=0,resizable=yes,scrollbars=auto'); s5NotesWindow = window.open('../../ui/s5-notes.html', 's5NotesWindow', 'top=0,left=0,resizable=yes,scrollbars=auto');
} else { } else {
s5NotesWindow = window.open('/s5/ui/s5-notes.xhtml', 's5NotesWindow', 'top=0,left=0,resizable=yes,scrollbars=auto'); s5NotesWindow = window.open('../../ui/s5-notes.xhtml', 's5NotesWindow', 'top=0,left=0,resizable=yes,scrollbars=auto');
} }
} }
if (s5NotesWindowLoaded) { // Load the current note if the Note HTML has loaded if (s5NotesWindowLoaded) { // Load the current note if the Note HTML has loaded