From a483b4e71efa43dd6f1194dadd4476657243fe1e Mon Sep 17 00:00:00 2001 From: Jacques Distler Date: Sun, 11 Oct 2009 10:20:43 -0500 Subject: [PATCH] Also fix S5 slides.js It needs to use relative URLs, too. --- lib/node.rb | 2 +- public/s5/ui/core/slides.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/node.rb b/lib/node.rb index 66ed0575..c2da7bc0 100644 --- a/lib/node.rb +++ b/lib/node.rb @@ -308,7 +308,7 @@ module XHTML #:nodoc: # Returns non-+nil+ if this tag can contain child nodes. def childless?(xml = false) - return false if xml && @closing.nil? + return false if xml && @closing.nil? # !@closing.nil? || @name =~ /^(img|br|hr|link|meta|area|base|basefont| col|frame|input|isindex|param)$/ox diff --git a/public/s5/ui/core/slides.js b/public/s5/ui/core/slides.js index d2d5d013..d897b158 100644 --- a/public/s5/ui/core/slides.js +++ b/public/s5/ui/core/slides.js @@ -539,9 +539,9 @@ function notOperaFix() { slides.setAttribute('href',slideCSS); // Gecko fix } if (isIE && document.styleSheets && document.styleSheets[0]) { - document.styleSheets[0].addRule('img', 'behavior: url(/s5/ui/default/iepngfix.htc)'); - document.styleSheets[0].addRule('div', 'behavior: url(/s5/ui/default/iepngfix.htc)'); - document.styleSheets[0].addRule('.slide', '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(../../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; // Note: Safari has a tendency to ignore window options preferring to default to the settings of the parent window, grr. 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 { - 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